diff --git a/.eslintrc.js b/.eslintrc.js
index b4d88777f2..54ff0a1268 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 }],
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..8aa82865a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,11 @@ ext/
 Makefile
 *.user
 
+# Android Studio
+*.iml
+local.properties
+android/libraries
+
 # Xcode
 *.xcodeproj
 *.xcworkspace
diff --git a/BUILD.md b/BUILD.md
index 30302d611b..4d321146c3 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -2,7 +2,7 @@
 
 - [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 version of OpenSSL to avoid security vulnerabilities.
+- [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
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_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 3e93656d45..eea1f85e5b 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -3,7 +3,7 @@ This is a stand-alone guide for creating your first High Fidelity build for Wind
 ## 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. 
 
-Note: The prerequisites will require about 10 GB of space on your drive.
+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.
 
 ### Step 1. Visual Studio 2017
 
@@ -27,11 +27,20 @@ Go to `Control Panel > System > Advanced System Settings > Environment Variables
 * Set "Variable name": `QT_CMAKE_PREFIX_PATH`
 * 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.2 Installer[https://slproweb.com/products/Win32OpenSSL.html].  
+ * 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:
 ```
@@ -43,7 +52,7 @@ 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.
 
@@ -51,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`
@@ -65,16 +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.
 
+#### CMake can't find OpenSSL
+
+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.9.1) installed and `QT_CMAKE_PREFIX_PATH` environment variable is set correctly.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9712b2d32e..9d3296a168 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,258 +1,95 @@
-if (WIN32)
+# 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()
 
-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")
-
 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)
-  if (NOT "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    message( FATAL_ERROR "Only 64 bit builds supported." )
-  endif()
+include("cmake/compiler.cmake")
 
-  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 ()
-
-  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++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 (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)
@@ -260,28 +97,36 @@ if (NOT ANDROID)
   add_subdirectory(ice-server)
   set_target_properties(ice-server PROPERTIES FOLDER "Apps")
   add_subdirectory(server-console)
-  if (NOT SERVER_ONLY)
+endif()
+
+if (BUILD_CLIENT)
     add_subdirectory(interface)
     set_target_properties(interface PROPERTIES FOLDER "Apps")
-    add_subdirectory(tests)
-  endif()
-  add_subdirectory(plugins)
+    if (ANDROID)
+        add_subdirectory(gvr-interface)
+        set_target_properties(gvr-interface PROPERTIES FOLDER "Apps")
+    endif()
+endif()
+
+if (BUILD_CLIENT OR BUILD_SERVER)
+    add_subdirectory(plugins)
+endif()
+
+if (BUILD_TOOLS)
   add_subdirectory(tools)
 endif()
 
-if (ANDROID OR DESKTOP_GVR)
-  add_subdirectory(interface)
-  add_subdirectory(gvr-interface)
-  add_subdirectory(plugins)
-endif ()
+if (BUILD_TESTS)
+    add_subdirectory(tests)
+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 ()
-
-generate_installers()
+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/Test Plan 2.docx b/Test Plan 2.docx
deleted file mode 100644
index da60821b53..0000000000
Binary files a/Test Plan 2.docx and /dev/null differ
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 1a27ddd479..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
-  controllers physics plugins midi
+  controllers physics plugins midi baking image
 )
 
 if (WIN32)
diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index c44fdf74ff..4efc3343d1 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -184,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
     });
@@ -259,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);
@@ -344,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
diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h
index da60a07367..168da185b6 100644
--- a/assignment-client/src/Agent.h
+++ b/assignment-client/src/Agent.h
@@ -77,6 +77,7 @@ private slots:
     void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
 
     void nodeActivated(SharedNodePointer activatedNode);
+    void nodeKilled(SharedNodePointer killedNode);
 
     void processAgentAvatar();
     void processAgentAvatarAudio();
@@ -87,7 +88,7 @@ private:
     void encodeFrameOfZeros(QByteArray& encodedZeros);
     void computeLoudness(const QByteArray* decodedBuffer, QSharedPointer<ScriptableAvatar>);
 
-    std::unique_ptr<ScriptEngine> _scriptEngine;
+    ScriptEnginePointer _scriptEngine;
     EntityEditPacketSender _entityEditSender;
     EntityTreeHeadlessViewer _entityViewer;
 
diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 3886ff8d92..c03721d097 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -13,24 +13,32 @@
 #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 <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 +49,151 @@ 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 QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx";
+static const QString BAKED_TEXTURE_SIMPLE_NAME = "texture.ktx";
+
+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 {
+        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 {
+        return false;
+    }
+
+    auto bakedPath = HIDDEN_BAKED_CONTENT_FOLDER + assetHash + "/" + bakedFilename;
+    return _fileMappings.find(bakedPath) == _fileMappings.end();
+}
+
 bool interfaceRunning() {
     bool result = false;
 
@@ -67,20 +220,36 @@ 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)
 {
+    // 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 +272,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 +325,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;
     }
@@ -141,7 +340,7 @@ void AssetServer::completeSetup() {
         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 +349,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 +366,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 +386,19 @@ 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);
     }
-
 }
 
 void AssetServer::cleanupUnmappedFiles() {
@@ -206,21 +406,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 +445,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 +472,75 @@ 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;
+        }
+        
+        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 +549,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 +575,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 +600,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 +625,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 +671,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 +690,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 +707,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);
+        _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 +826,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 +876,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 +901,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 +920,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 +941,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 +970,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 +982,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 +1006,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 +1020,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 +1044,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 +1054,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 +1066,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 +1081,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 +1138,252 @@ 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";
+
+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 (!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 {
+                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..aeb40a416f 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,55 @@ 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 };
 };
 
 #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..94a0739612
--- /dev/null
+++ b/assignment-client/src/assets/BakeAssetTask.cpp
@@ -0,0 +1,102 @@
+//
+//  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>
+
+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 {
+        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/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/avatars/AvatarMixerSlave.cpp b/assignment-client/src/avatars/AvatarMixerSlave.cpp
index 34feafbd4d..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
@@ -334,8 +334,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
 
         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);
 
diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
index c7715d4014..5060891284 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -35,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;
 }
 
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/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index 7febdc67e1..03014bae6a 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
@@ -129,4 +204,288 @@ 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();
+    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
+            if (entity->matchesJSONFilters(jsonFilters)) {
+                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..49901491ff 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.h
+++ b/assignment-client/src/entities/EntityTreeSendThread.h
@@ -12,24 +12,55 @@
 #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/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 868b377ced..89e3d403fc 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();
@@ -301,9 +300,25 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
     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
@@ -311,7 +326,7 @@ 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();
@@ -345,7 +360,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) {
@@ -367,11 +382,6 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
 
         _packetsSentThisInterval += handlePacketSend(node, nodeData, isFullScene);
 
-        // If we're starting a full scene, then definitely we want to empty the elementBag
-        if (isFullScene) {
-            nodeData->elementBag.deleteAll();
-        }
-
         // TODO: add these to stats page
         //::startSceneSleepTime = _usleepTime;
 
@@ -380,19 +390,11 @@ 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()) {
+    if (shouldTraverseAndSend(nodeData)) {
         quint64 start = usecTimestampNow();
 
         traverseTreeAndSendContents(node, nodeData, viewFrustumChanged, isFullScene);
@@ -441,7 +443,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
 
         // 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);
 
@@ -458,84 +460,79 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
     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;
-    bool completedScene = false;
+
+    // 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 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()) {
+        params.stopReason = EncodeBitstreamParams::UNKNOWN; // reset params.stopReason before traversal
 
-            quint64 lockWaitStart = usecTimestampNow();
-            _myServer->getOctree()->withReadLock([&]{
-                quint64 lockWaitEnd = usecTimestampNow();
-                lockWaitElapsedUsec = (float)(lockWaitEnd - lockWaitStart);
-                quint64 encodeStart = usecTimestampNow();
+        somethingToSend = traverseTreeAndBuildNextPacketPayload(params, nodeData->getJSONParameters());
 
-                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](const QUuid& dataID, quint64 dataEdited) {
-                    _myServer->trackSend(dataID, dataEdited, _nodeUuid);
-                };
-
-                // 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();
-
-                // NOTE: this is where the tree "contents" are actaully packed
-                _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 {
-            somethingToSend = false; // this will cause us to drop out of the loop...
+        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?
@@ -562,8 +559,7 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
             if (sendNow) {
                 quint64 packetSendingStart = usecTimestampNow();
                 _packetsSentThisInterval += handlePacketSend(node, nodeData);
-                quint64 packetSendingEnd = usecTimestampNow();
-                packetSendingElapsedUsec = (float)(packetSendingEnd - packetSendingStart);
+                packetSendingElapsedUsec = (float)(usecTimestampNow() - packetSendingStart);
 
                 targetSize = nodeData->getAvailable() - sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE);
                 extraPackingAttempts = 0;
@@ -576,14 +572,9 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
             }
             _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);
+        OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));
     }
 
     if (somethingToSend && _myServer->wantsVerboseDebug()) {
diff --git a/assignment-client/src/octree/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h
index d158539f57..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;
@@ -51,22 +52,27 @@ 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 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:
+    /// 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 _truePacketsSent { 0 }; // available for debug stats
     int _trueBytesSent { 0 }; // available for debug stats
     int _packetsSentThisInterval { 0 }; // used for bandwidth throttle condition
diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index af5f2c904e..4a1aade59d 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -35,7 +35,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 +60,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 +108,8 @@ void OctreeServer::resetSendingStats() {
     _shortTreeWait = 0;
     _noTreeWait = 0;
 
+    _averageTreeTraverseTime.reset();
+
     _averageNodeWaitTime.reset();
 
     _averageCompressAndWriteTime.reset();
@@ -136,18 +140,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 +160,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 +180,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 +209,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 +526,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 +891,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 +913,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 +947,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 +957,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 +1093,7 @@ void OctreeServer::readConfiguration() {
     if (getPayload().size() > 0) {
         parsePayload();
     }
-    
+
     const QJsonObject& settingsObject = DependencyManager::get<NodeList>()->getDomainHandler().getSettingsObject();
 
     QString settingsKey = getMyDomainSettingsKey();
@@ -1178,9 +1220,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 +1233,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 +1244,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 +1359,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 +1388,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 +1399,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 +1445,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 +1571,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 +1579,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 +1598,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 +1623,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 e7433e7c05..2bfcdcdf8c 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -102,7 +102,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) {
@@ -116,7 +116,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));
@@ -415,8 +415,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);
@@ -437,11 +436,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);
 }
 
 
diff --git a/assignment-client/src/scripts/EntityScriptServer.h b/assignment-client/src/scripts/EntityScriptServer.h
index 84454375e5..e6bd12460b 100644
--- a/assignment-client/src/scripts/EntityScriptServer.h
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@@ -72,7 +72,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..44ddd6d3de
--- /dev/null
+++ b/cmake/externals/draco/CMakeLists.txt
@@ -0,0 +1,40 @@
+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> ${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)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${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 ${INSTALL_DIR}/lib/${LIB_PREFIX}draco.${LIB_EXT} CACHE FILEPATH "Path to Draco release library")
+set(${EXTERNAL_NAME_UPPER}_ENCODER_LIBRARY ${INSTALL_DIR}/lib/${LIB_PREFIX}dracoenc.${LIB_EXT} CACHE FILEPATH "Path to Draco encoder release library")
+set(${EXTERNAL_NAME_UPPER}_DECODER_LIBRARY ${INSTALL_DIR}/lib/${LIB_PREFIX}dracodec.${LIB_EXT} CACHE FILEPATH "Path to Draco decoder release library")
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/quazip/CMakeLists.txt b/cmake/externals/quazip/CMakeLists.txt
index 01650a432d..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)
@@ -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/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..c5b35b7e90 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. \
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 6f35b76f1d..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")
@@ -133,7 +133,7 @@ macro(SET_PACKAGING_PARAMETERS)
       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.")
       endif ()
@@ -147,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
@@ -161,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..ece8607b9b
--- /dev/null
+++ b/cmake/macros/SetupQt.cmake
@@ -0,0 +1,84 @@
+# 
+#  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 ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "")
+        set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE)
+    else()
+        set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE)
+    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)
+    set(QT_CMAKE_PREFIX_PATH "$ENV{QT_CMAKE_PREFIX_PATH}")
+    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()
\ No newline at end of file
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/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 9a1d08a010..0000000000
--- a/cmake/modules/FindFBX.cmake
+++ /dev/null
@@ -1,115 +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 (MSVC_VERSION EQUAL 1910)
-    set(VS_PREFIX vs2017)
-  elseif (MSVC_VERSION EQUAL 1900)
-    set(VS_PREFIX vs2015)
-  elseif (MSVC_VERSION EQUAL 1800)
-    set(VS_PREFIX vs2013)
-  elseif (MSVC_VERSION EQUAL 1700)
-    set(VS_PREFIX vs2012)
-  elseif (MSVC_VERSION EQUAL 1600)
-    set(VS_PREFIX vs2010)
-  elseif (MSVC_VERSION EQUAL 1500)
-    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..338dee7bc8 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,47 +52,14 @@ 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})
   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/NSIS.template.in b/cmake/templates/NSIS.template.in
index 5af51ff8c9..8abb202bd4 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -49,7 +49,7 @@
     Var STR_CONTAINS_VAR_3
     Var STR_CONTAINS_VAR_4
     Var STR_RETURN_VAR
-        
+
     Function StrContains
       Exch $STR_NEEDLE
       Exch 1
@@ -343,29 +343,29 @@ SectionEnd
 ;--------------------------------
 ;Pages
   !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
 
   !insertmacro MUI_PAGE_INSTFILES
-  
+
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
 
@@ -453,9 +453,10 @@ 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"
@@ -472,33 +473,39 @@ Var Express
 
 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"  
-  
-  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-    ${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 
+  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}
-  
-  ; Express Install selected by default
-  ${NSD_Check} $ExpressInstallRadioButton
+
   Call ChangeExpressLabel
-  
+
   nsDialogs::Show
 FunctionEnd
 
@@ -518,11 +525,10 @@ FunctionEnd
 
 Function AbortFunction
   ; Check if Express is set, if so, abort the post install options page
-  Call HandleInstallTypes ; Sets Express if ExpressInstallRadioButton is checked and installs with defaults
   StrCmp $Express "1" 0 end
   Abort
   end:
-FunctionEnd  
+FunctionEnd
 
 Function PostInstallOptionsPage
   !insertmacro MUI_HEADER_TEXT "Setup Options" ""
@@ -534,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
 
@@ -541,18 +552,18 @@ Function PostInstallOptionsPage
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @INTERFACE_HF_SHORTCUT_NAME@"
     Pop $DesktopClientCheckbox
     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
     IntOp $CurrentOffset $CurrentOffset + 15
-    
+
     ; set the checkbox state depending on what is present in the registry
-    !insertmacro SetPostInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
+    !insertmacro SetInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
   ${EndIf}
 
   ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@}
@@ -560,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}
@@ -568,29 +579,29 @@ Function PostInstallOptionsPage
 
     IntOp $CurrentOffset $CurrentOffset + 15
   ${EndIf}
-  
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ${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}
+    !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 SetPostInstallOption $ServerStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
+    !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
@@ -616,18 +627,12 @@ Function PostInstallOptionsPage
 
     ${NSD_SetState} $CopyFromProductionCheckbox ${BST_UNCHECKED}
   ${EndIf}
-  
-  ; Check if Express is set, if so, abort the post install options page
-  Call HandleInstallTypes ; Sets Express if ExpressInstallRadioButton is checked and installs with defaults
-  StrCmp $Express "1" 0 end
-  Abort
-  end:
-  
+
   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
 
@@ -638,15 +643,33 @@ Var LaunchServerNowState
 Var LaunchClientNowState
 Var CopyFromProductionState
 Var CleanInstallState
-Var ExpressInstallState 
+Var ExpressInstallState
 Var CustomInstallState
 
 Function ReadInstallTypes
-  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
-    ; check if the user asked for express/custom install
-    ${NSD_GetState} $ExpressInstallRadioButton $ExpressInstallState
-    ${NSD_GetState} $CustomInstallRadioButton $CustomInstallState
+  ; 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
@@ -672,48 +695,26 @@ Function ReadPostInstallOptions
     ; 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
   ${EndIf}
-   
+
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a clean install
     ${NSD_GetState} $CleanInstallCheckbox $CleanInstallState
   ${EndIf}
 FunctionEnd
 
-Function HandleInstallTypes
-  ${If} $ExpressInstallState == ${BST_CHECKED}
-    
-    StrCpy $Express "1"
-    
-    ; over ride custom checkboxes and select defaults 
-    ${NSD_SetState} $DesktopClientCheckbox ${BST_CHECKED} 
-    ${NSD_SetState} $ServerStartupCheckbox ${BST_CHECKED} 
-    ${NSD_SetState} $LaunchServerNowCheckbox ${BST_CHECKED}
-    ${NSD_SetState} $LaunchClientNowCheckbox ${BST_CHECKED}
-    
-    ${If} @PR_BUILD@ == 1
-      ${NSD_SetState} $CopyFromProductionCheckbox ${BST_UNCHECKED}
-    ${EndIf}    
-    
-    ; call ReadPostInstallOptions and HandlePostInstallOptions with defaults selected
-    Call ReadPostInstallOptions 
-    Call HandlePostInstallOptions 
-      
-  ${EndIf}
-FunctionEnd
-
 Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; 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}
@@ -722,12 +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
@@ -741,12 +742,12 @@ 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}
@@ -785,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}
@@ -835,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
@@ -955,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
@@ -974,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/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index c1eff76d78..8d0e949ff3 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,5 +1,5 @@
 {
-  "version": 1.7,
+  "version": 1.8,
   "settings": [
     {
       "name": "metaverse",
@@ -112,7 +112,6 @@
               "label": "Adult (18+)"
             }
           ]
-
         },
         {
           "name": "hosts",
@@ -161,15 +160,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",
@@ -208,21 +207,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>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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -276,9 +273,15 @@
               "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"]
         },
@@ -291,18 +294,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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -381,6 +382,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+             {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -393,18 +401,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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -480,6 +486,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+             {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -488,18 +501,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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -553,6 +564,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+             {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -567,11 +585,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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -625,6 +642,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+             {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -639,11 +663,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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -697,6 +720,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+             {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         },
@@ -711,11 +741,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>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": 8
             }
           ],
-
           "columns": [
             {
               "name": "permissions_id",
@@ -769,6 +798,13 @@
               "type": "checkbox",
               "editable": true,
               "default": false
+            },
+             {
+              "name": "id_can_replace_content",
+              "label": "Replace Content",
+              "type": "checkbox",
+              "editable": true,
+              "default": false
             }
           ]
         }
@@ -784,7 +820,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",
@@ -946,7 +981,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",
@@ -999,7 +1033,6 @@
           "numbered": true,
           "can_order": true,
           "can_add_new_rows": true,
-
           "columns": [
             {
               "name": "source",
@@ -1028,7 +1061,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",
@@ -1063,7 +1095,9 @@
     {
       "name": "audio_buffer",
       "label": "Audio Buffers",
-      "assignment-types": [0],
+      "assignment-types": [
+        0
+      ],
       "settings": [
         {
           "name": "dynamic_jitter_buffer",
@@ -1082,35 +1116,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",
@@ -1167,13 +1203,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",
@@ -1309,7 +1364,9 @@
     {
       "name": "avatar_mixer",
       "label": "Avatar Mixer",
-      "assignment-types": [1],
+      "assignment-types": [
+        1
+      ],
       "settings": [
         {
           "name": "max_node_send_bandwidth",
@@ -1362,7 +1419,10 @@
         {
           "name": "downstream_servers",
           "label": "Receiving Servers",
-          "assignment-types": [0,1],
+          "assignment-types": [
+            0,
+            1
+          ],
           "type": "table",
           "advanced": true,
           "can_add_new_rows": true,
@@ -1402,7 +1462,10 @@
         {
           "name": "upstream_servers",
           "label": "Broadcasting Servers",
-          "assignment-types": [0,1],
+          "assignment-types": [
+            0,
+            1
+          ],
           "type": "table",
           "advanced": true,
           "can_add_new_rows": true,
@@ -1442,4 +1505,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
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/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index fc595be67e..09bebf806a 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;
 }
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 163bd48f1b..436f49c7ca 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -458,7 +458,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);
 
@@ -471,7 +471,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);
 }
 
@@ -570,7 +611,7 @@ 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";
@@ -711,8 +752,28 @@ void DomainServer::setupICEHeartbeatForFullNetworking() {
 }
 
 void DomainServer::updateICEServerAddresses() {
-    if (_iceAddressLookupID == -1) {
+    if (_iceAddressLookupID == INVALID_ICE_LOOKUP_ID) {
         _iceAddressLookupID = QHostInfo::lookupHost(_iceServerAddr, this, SLOT(handleICEHostInfo(QHostInfo)));
+
+        // there seems to be a 5.9 bug where lookupHost never calls our slot
+        // so we add a single shot manual "timeout" to fire it off again if it hasn't called back yet
+        static const int ICE_ADDRESS_LOOKUP_TIMEOUT_MS = 5000;
+        QTimer::singleShot(ICE_ADDRESS_LOOKUP_TIMEOUT_MS, this, &DomainServer::timeoutICEAddressLookup);
+    }
+}
+
+void DomainServer::timeoutICEAddressLookup() {
+    if (_iceAddressLookupID != INVALID_ICE_LOOKUP_ID) {
+        // we waited 5s and didn't hear back for our ICE DNS lookup
+        // so time that one out and kick off another
+
+        qDebug() << "IP address lookup timed out for" << _iceServerAddr << "- retrying";
+
+        QHostInfo::abortHostLookup(_iceAddressLookupID);
+
+        _iceAddressLookupID = INVALID_ICE_LOOKUP_ID;
+
+        updateICEServerAddresses();
     }
 }
 
@@ -853,7 +914,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);
 
@@ -899,7 +959,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;
@@ -908,7 +969,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 {
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 4808297c89..52ac435517 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();
 
@@ -114,6 +116,8 @@ private slots:
     void tokenGrantFinished();
     void profileRequestFinished();
 
+    void timeoutICEAddressLookup();
+
 signals:
     void iceServerChanged();
     void userConnected();
@@ -129,7 +133,7 @@ private:
 
     void getTemporaryName(bool force = false);
 
-    static bool packetVersionMatch(const udt::Packet& packet);
+    static bool isPacketVerified(const udt::Packet& packet);
 
     bool resetAccountManagerAccessToken();
 
@@ -223,7 +227,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 };
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 7a2cfa645a..c801a4a71a 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -112,6 +112,7 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
         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"
@@ -294,6 +295,21 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
             // 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();
+        }
     }
 
     unpackPermissions();
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 81c8a44baf..305a6475f6 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -18,6 +18,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()
@@ -170,8 +171,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 +182,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
@@ -207,10 +212,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})
 
diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index f377e02e5f..54d2467f78 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -131,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/standard.json b/interface/resources/controllers/standard.json
index 0d5c095585..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":
             [
@@ -128,4 +128,4 @@
         { "from": "Standard.TrackedObject14", "to" : "Actions.TrackedObject14" },
         { "from": "Standard.TrackedObject15", "to" : "Actions.TrackedObject15" }
     ]
-}
+}
\ No newline at end of file
diff --git a/interface/resources/fonts/hifi-glyphs.ttf b/interface/resources/fonts/hifi-glyphs.ttf
index 8733349227..3db48602b1 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/img/tablet-help-gamepad.jpg b/interface/resources/html/img/tablet-help-gamepad.jpg
index 5abb38d66b..3f084ecc4d 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..80f19fd372 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..1f493039d3 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..2f87daf835 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..ad1d889556 100644
--- a/interface/resources/html/raiseAndLowerKeyboard.js
+++ b/interface/resources/html/raiseAndLowerKeyboard.js
@@ -14,7 +14,6 @@
     var isWindowFocused = true;
     var isKeyboardRaised = false;
     var isNumericKeyboard = false;
-    var KEYBOARD_HEIGHT = 200;
 
     function shouldRaiseKeyboard() {
         var nodeName = document.activeElement.nodeName;
@@ -38,6 +37,19 @@
         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();
@@ -56,13 +68,8 @@
             }
 
             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;
@@ -70,6 +77,13 @@
         }
     }, 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/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/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/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..c73aab08c3 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,27 @@ 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"
 
             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>"
@@ -143,23 +136,19 @@ Item {
                 onLinkActivated: loginDialog.openUrl(link)
             }
         }
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
 
-            TextField {
-                id: passwordField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
+        TextField {
+            id: passwordField
+            width: parent.width
 
-                label: "Password"
-                echoMode: TextInput.Password
-            }
+            label: "Password"
+            echoMode: showPassword.checked ? TextInput.Normal : TextInput.Password
 
             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>"
@@ -172,25 +161,76 @@ Item {
             }
         }
 
-    }
-
-    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()
+
+            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
+        }
+
+        Row {
+            id: buttons
+            spacing: hifi.dimensions.contentSpacing.y*2
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            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()
+            }
+        }
+
+        Row {
+            id: leftButton
+
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: hifi.dimensions.contentSpacing.y*2
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+            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
+                    }
+                }
+            }
+        }
     }
 
     // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
@@ -200,70 +240,22 @@ Item {
         anchors {
             left: parent.left
             right: parent.right
-            bottom: buttons.top
+            bottom: parent.bottom
             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")
-              bodyLoader.item.width = root.pane.width
-              bodyLoader.item.height = root.pane.height
-          }
-        }
-    }
-
-    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.destroy()
-        }
-    }
-
     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 +303,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..f6cf40db8e 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,31 @@ 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"
         }
 
-        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"
 
             ShortcutText {
                 anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
                 }
 
                 text: qsTr("No spaces / special chars.")
@@ -145,23 +131,17 @@ Item {
             }
         }
 
-        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
 
             ShortcutText {
                 anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
                 }
 
                 text: qsTr("At least 6 characters")
@@ -173,6 +153,53 @@ Item {
             }
         }
 
+        Row {
+            id: leftButton
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            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")
+                    if (!root.isTablet) {
+                        bodyLoader.item.width = root.pane.width
+                        bodyLoader.item.height = root.pane.height
+                    }
+                }
+            }
+        }
+
+        Row {
+            id: buttons
+            anchors.horizontalCenter: parent.horizontalCenter
+            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: root.tryDestroy()
+            }
+        }
     }
 
     // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
@@ -182,69 +209,21 @@ Item {
         anchors {
             left: parent.left
             right: parent.right
-            bottom: buttons.top
+            bottom: parent.bottom
             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
-            }
-        }
-    }
-
-    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: root.destroy()
-        }
-    }
-
     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 +254,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..8737e422cb 100644
--- a/interface/resources/qml/Stats.qml
+++ b/interface/resources/qml/Stats.qml
@@ -55,7 +55,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 +68,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 +206,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 +261,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..5acc31dfd0 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@@ -15,8 +15,11 @@ import QtQuick.Controls.Styles 1.4
 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
@@ -28,6 +31,13 @@ Original.Button {
         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 +70,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/CheckBoxQQC2.qml b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
new file mode 100644
index 0000000000..92bad04d01
--- /dev/null
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@@ -0,0 +1,113 @@
+//
+//  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
+
+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
+
+    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/Key.qml b/interface/resources/qml/controls-uit/Key.qml
index 2218474936..0c888d1a0a 100644
--- a/interface/resources/qml/controls-uit/Key.qml
+++ b/interface/resources/qml/controls-uit/Key.qml
@@ -34,7 +34,10 @@ Item {
 
         onClicked: {
             mouse.accepted = true;
+
             webEntity.synthesizeKeyPress(glyph);
+            webEntity.synthesizeKeyPress(glyph, mirrorText);
+
             if (toggle) {
                 toggled = !toggled;
             }
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controls-uit/Keyboard.qml
index 07488fe3e6..81579d9f71 100644
--- a/interface/resources/qml/controls-uit/Keyboard.qml
+++ b/interface/resources/qml/controls-uit/Keyboard.qml
@@ -9,16 +9,28 @@
 //
 
 import QtQuick 2.0
+import "."
 
-Item {
+Rectangle {
     id: keyboardBase
 
+    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 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
@@ -93,24 +105,43 @@ Item {
     }
 
     Rectangle {
-        id: leftRect
         y: 0
-        height: 200
+        x: 0
+        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
+
+        TextEdit {
+            id: mirrorText
+            visible: showMirrorText
+            size: 13.5
+            horizontalAlignment: Text.AlignHCenter
+            color: "#FFFFFF";
+            anchors.fill: parent
+            wrapMode: Text.WordWrap
+            readOnly: false // we need to leave this property read-only to allow control to accept QKeyEvent
+            selectByMouse: false
+
+            Keys.onPressed: {
+                if (event.key == Qt.Key_Return) {
+                    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
+        x: 0
+        y: showMirrorText ? mirrorTextHeight : 0
+        width: keyboardWidth
+        height: raisedHeight
         color: "#252525"
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
@@ -118,13 +149,13 @@ Item {
 
         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 +173,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 20
 
@@ -160,8 +191,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -185,8 +216,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -205,13 +236,13 @@ Item {
 
         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 +260,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -248,8 +279,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -273,8 +304,8 @@ Item {
             }
 
             Row {
-                width: 480
-                height: 50
+                width: keyboardWidth
+                height: keyboardRowHeight
                 anchors.left: parent.left
                 anchors.leftMargin: 4
 
@@ -291,31 +322,4 @@ Item {
             }
         }
     }
-
-    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/Separator.qml b/interface/resources/qml/controls-uit/Separator.qml
index 5a775221f6..5e2d278454 100644
--- a/interface/resources/qml/controls-uit/Separator.qml
+++ b/interface/resources/qml/controls-uit/Separator.qml
@@ -12,8 +12,13 @@ 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: 2;
+    height: colorScheme === 0 ? 2 : 1;
     Rectangle {
         // Size
         width: parent.width;
@@ -21,18 +26,19 @@ Item {
         // Anchors
         anchors.left: parent.left;
         anchors.bottom: parent.bottom;
-        anchors.bottomMargin: height;
         // Style
-        color: hifi.colors.baseGrayShadow;
+        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: hifi.colors.baseGrayHighlight;
+        color: bottomColor[colorScheme];
     }
 }
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index 65fab00700..1cc4d0ecc1 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,58 @@ 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
 
     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 +97,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..cbc4d19334
--- /dev/null
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -0,0 +1,132 @@
+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 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/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index 68f8226e21..e06ff51569 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,14 +1,13 @@
-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
     property bool punctuationMode: false
@@ -21,84 +20,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 +42,6 @@ Item {
             }
         }
 
-        HiFiControls.WebSpinner { }
     }
 
     HiFiControls.Keyboard {
@@ -120,5 +54,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 0a5a68717e..23143db3ba 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,18 +1,14 @@
-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
@@ -21,9 +17,10 @@ Item {
     property bool keyboardRaised: false
     property bool punctuationMode: 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.
@@ -64,6 +61,7 @@ Item {
                 disabledColor: hifi.colors.lightGrayText
                 enabled: true
                 text: "CLOSE"
+                visible: closeButtonVisible
 
                 MouseArea {
                     anchors.fill: parent
@@ -77,7 +75,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 +100,13 @@ Item {
 
     function closeWebEngine() {
         if (remove) {
-            web.destroy();
+            root.destroy();
             return;
         }
         if (parentStackItem) {
             parentStackItem.pop();
         } else {
-            web.visible = false;
+            root.visible = false;
         }
     }
 
@@ -126,69 +124,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,34 +149,16 @@ 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 {
@@ -244,7 +174,7 @@ Item {
     }
     
     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..c38c5df9cf 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,17 +1,19 @@
-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
     property bool punctuationMode: 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 +23,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,8 +44,6 @@ Item {
                 tabletRoot.openBrowserWindow(request, profile);
             }
         }
-
-        HiFiControls.WebSpinner { }
     }
 
     HiFiControls.Keyboard {
@@ -119,5 +56,4 @@ Item {
             bottom: parent.bottom
         }
     }
-
 }
diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 3dcf747113..000e310a66 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.
@@ -278,6 +298,23 @@ FocusScope {
         pinned = !pinned
     }
 
+    function isPointOnWindow(point) {
+        for (var i = 0; i < desktop.visibleChildren.length; i++) {
+            var child = desktop.visibleChildren[i];
+            if (child.visible) {
+                if (child.hasOwnProperty("modality")) {
+                    var mappedPoint = child.mapFromGlobal(point.x, point.y);
+                    var outLine = child.frame.children[2];
+                    var framePoint = outLine.mapFromGlobal(point.x, point.y);
+                    if (child.contains(mappedPoint) || outLine.contains(framePoint)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     function setPinned(newPinned) {
         pinned = newPinned
     }
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..9722f31144 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -16,48 +16,66 @@ 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
+
+        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 +83,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 +94,81 @@ 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
+        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/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
similarity index 58%
rename from interface/resources/qml/AssetServer.qml
rename to interface/resources/qml/hifi/AssetServer.qml
index ee37dbd8db..5358ad1adc 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -10,13 +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 "dialogs"
+import "../styles-uit"
+import "../controls-uit" as HifiControls
+import "../windows"
+import "../dialogs"
 
 ScrollingWindow {
     id: root
@@ -37,7 +38,7 @@ ScrollingWindow {
     property var assetMappingsModel: Assets.mappingModel;
     property var currentDirectory;
     property var selectedItems: treeView.selection.selectedIndexes.length;
-    
+
     Settings {
         category: "Overlay.AssetServer"
         property alias x: root.x
@@ -48,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);
 
@@ -70,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 + "/";
         }
@@ -144,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() {
@@ -300,7 +320,7 @@ ScrollingWindow {
         object.selected.connect(function(destinationPath) {
             destinationPath = destinationPath.trim();
 
-            if (path == destinationPath) {
+            if (path === destinationPath) {
                 return;
             }
             if (fileExists(destinationPath)) {
@@ -326,7 +346,7 @@ ScrollingWindow {
         if (!path) {
             return;
         }
-        
+
         var modalMessage = "";
         var items = selectedItems.toString();
         var isFolder = assetProxyModel.data(treeView.selection.currentIndex, 0x101);
@@ -361,7 +381,7 @@ ScrollingWindow {
         running: false
     }
 
-    property var uploadOpen: false;
+    property bool uploadOpen: false;
     Timer {
         id: timer
     }
@@ -442,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
@@ -464,37 +481,27 @@ 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
-                    
+
                     enabled: canAddToWorld(assetProxyModel.data(treeView.selection.currentIndex, 0x100))
-                    
+
                     onClicked: root.addToWorld()
                 }
-                
+
                 HifiControls.Button {
                     text: "Rename"
                     color: hifi.buttons.black
                     colorScheme: root.colorScheme
                     width: 80
-                    
+
                     onClicked: root.renameFile()
                     enabled: canRename()
                 }
@@ -511,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"
@@ -541,36 +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
-            selectionMode: SelectionMode.ExtendedSelection
-
-            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"
@@ -606,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
@@ -617,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
@@ -627,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..678245910b 100644
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@@ -46,6 +46,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,6 +233,13 @@ 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;
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 fa9d7aa6f0..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
@@ -59,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
@@ -75,7 +78,7 @@ Item {
                     height: parent.height
                     // Anchors
                     anchors.left: headerGlyph.right
-                    anchors.leftMargin: -5
+                    anchors.leftMargin: headerTextMargin
                     // Text Size
                     font.pixelSize: headerTextPixelSize
                     // Style
@@ -134,48 +137,11 @@ Item {
             }
         }
     }
-    // Left gray MouseArea
     MouseArea {
-        anchors.left: parent.left;
-        anchors.right: textContainer.left;
-        anchors.top: textContainer.top;
-        anchors.bottom: textContainer.bottom;
+        anchors.fill: parent
         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
+            letterbox.visible = false;
         }
     }
 }
diff --git a/interface/resources/qml/hifi/SkyboxChanger.qml b/interface/resources/qml/hifi/SkyboxChanger.qml
new file mode 100644
index 0000000000..a4798ba959
--- /dev/null
+++ b/interface/resources/qml/hifi/SkyboxChanger.qml
@@ -0,0 +1,173 @@
+//
+//  skyboxchanger.qml
+//
+//
+//  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.Layouts 1.3
+
+Rectangle {
+    id: root;
+
+    color: hifi.colors.baseGray;
+
+    Item {
+        id: titleBarContainer;
+        // Size
+        width: parent.width;
+        height: 50;
+        // Anchors
+        anchors.left: parent.left;
+        anchors.top: parent.top;
+
+        RalewaySemiBold {
+            id: titleBarText;
+            text: "Skybox Changer";
+            // Text size
+            size: hifi.fontSizes.overlayTitle;
+            // Anchors
+            anchors.fill: parent;
+            anchors.leftMargin: 16;
+            // Style
+            color: hifi.colors.lightGrayText;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }
+        RalewaySemiBold {
+            id: titleBarDesc;
+            text: "Click an image to choose a new Skybox.";
+            wrapMode: Text.Wrap
+            // Text size
+            size: 14;
+            // Anchors
+            anchors.fill: parent;
+            anchors.top: titleBarText.bottom
+            anchors.leftMargin: 16;
+            anchors.rightMargin: 16;
+            // Style
+            color: hifi.colors.lightGrayText;
+            // Alignment
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+        }        
+    }
+    
+    // This RowLayout could be a GridLayout instead for further expandability.
+    // As this SkyboxChanger task only required 6 images, implementing GridLayout wasn't necessary.
+    // In the future if this is to be expanded to add more Skyboxes, it might be worth changing this.
+    RowLayout {
+        id: row1
+        anchors.top: titleBarContainer.bottom
+        anchors.left: parent.left
+        anchors.leftMargin: 30
+        Layout.fillWidth: true
+        anchors.topMargin: 30
+        spacing: 10
+        Image {
+            width: 200; height: 200
+            fillMode: Image.Stretch
+            source: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/thumbnails/thumb_1.jpg"
+            clip: true
+            id: preview1
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: 'http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxes/1.jpg'});
+                }
+            }
+            Layout.fillWidth: true
+        }
+        Image {
+            width: 200; height: 200
+            fillMode: Image.Stretch
+            source: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/thumbnails/thumb_2.jpg"
+            clip: true
+            id: preview2
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: 'http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxes/2.png'});
+                }
+            }
+        }
+    }
+    RowLayout {
+        id: row2
+        anchors.top: row1.bottom
+        anchors.topMargin: 10
+        anchors.left: parent.left
+        Layout.fillWidth: true
+        anchors.leftMargin: 30
+        spacing: 10
+        Image {
+            width: 200; height: 200
+            fillMode: Image.Stretch
+            source: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/thumbnails/thumb_3.jpg"
+            clip: true
+            id: preview3
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: 'http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxes/3.jpg'});
+                }
+            }
+        }
+        Image {
+            width: 200; height: 200
+            fillMode: Image.Stretch
+            source: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/thumbnails/thumb_4.jpg"
+            clip: true
+            id: preview4
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: 'http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxes/4.jpg'});
+                }
+            }
+        }
+    }
+    RowLayout {
+        id: row3
+        anchors.top: row2.bottom
+        anchors.topMargin: 10
+        anchors.left: parent.left
+        Layout.fillWidth: true
+        anchors.leftMargin: 30
+        spacing: 10
+        Image {
+            width: 200; height: 200
+            fillMode: Image.Stretch
+            source: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/thumbnails/thumb_5.jpg"
+            clip: true
+            id: preview5
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: 'http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxes/5.png'});
+                }
+            }
+        }
+        Image {
+            width: 200; height: 200
+            fillMode: Image.Stretch
+            source: "http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/thumbnails/thumb_6.jpg"
+            clip: true
+            id: preview6
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    sendToScript({method: 'changeSkybox', url: 'http://mpassets.highfidelity.com/05904016-8f7d-4dfc-88e1-2bf9ba3fac20-v1/skyboxes/6.jpg'});
+                }
+            }
+        }
+    }
+    
+    signal sendToScript(var message);
+    
+}
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 93742e39a5..12c2ec1835 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"
@@ -36,30 +36,86 @@ Rectangle {
         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,89 +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
+
                 AudioControls.CheckBox {
-                    id: checkbox
-                    anchors.verticalCenter: parent.verticalCenter
+                    id: checkBoxInput
                     anchors.left: parent.left
-                    text: display;
-                    wrap: false;
-                    checked: selected;
-                    enabled: false;
-                }
-
-                MouseArea {
-                    anchors.fill: checkbox
-                    onClicked: Audio.setInputDevice(info);
-                }
-
-                InputLevel {
-                    id: level;
+                    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);
+                        }
+                    }
+                }
+                InputPeak {
+                    id: inputLevel
                     anchors.right: parent.right
-                    anchors.rightMargin: 30
-                    visible: selected;
+                    peak: model.peak;
+                    anchors.verticalCenter: parent.verticalCenter
+                    visible: (bar.currentIndex === 1 && selectedHMD && isVR) ||
+                             (bar.currentIndex === 0 && selectedDesktop && !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: Math.min(250, contentHeight);
-            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 {
-                    id: checkbox
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.left: parent.left
-                    text: display;
-                    checked: selected;
-                    enabled: false;
-                }
-
-                MouseArea {
-                    anchors.fill: checkbox
-                    onClicked: Audio.setOutputDevice(info);
+                    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/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
new file mode 100644
index 0000000000..09c2f6fa76
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -0,0 +1,904 @@
+//
+//  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;
+    // 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.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.indexOf('.json') !== -1;
+    }
+
+    onItemPriceChanged: {
+        commerce.balance();
+    }
+
+    Timer {
+        id: notSetUpTimer;
+        interval: 200;
+        onTriggered: {
+            sendToScript({method: 'checkout_walletNotSetUp'});
+        }
+    }
+
+    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);
+                }
+            }
+        }
+    }
+
+    //
+    // 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;
+            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: "Rez It"
+            onClicked: {
+                if (urlHandler.canHandleUrl(itemHref)) {
+                    urlHandler.handleUrl(itemHref);
+                }
+                rezzedNotifContainer.visible = true;
+                rezzedNotifContainerTimer.start();
+            }
+        }
+        RalewaySemiBold {
+            id: noPermissionText;
+            visible: !root.canRezCertifiedItems;
+            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: myPurchasesLink;
+            text: '<font color="' + hifi.colors.blueAccent + '"><a href="#">View this item in My Purchases</a></font>';
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: 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..cc316a70e9
--- /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: "https://metaverse.highfidelity.com/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/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/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..19728daa82
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -0,0 +1,332 @@
+//
+//  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 marketplaceId: "";
+    property string itemName: "--";
+    property string itemOwner: "--";
+    property string itemEdition: "--";
+    property string dateOfPurchase: "";
+    property bool isLightbox: false;
+    // Style
+    color: hifi.colors.faintGray;
+    Hifi.QmlCommerce {
+        id: commerce;
+    }
+
+    // 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: 4;
+            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', itemId: root.marketplaceId});
+                }
+                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: 20;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.baseGray;
+        }
+        RalewayRegular {
+            id: ownedBy;
+            text: root.itemOwner;
+            // Text size
+            size: 22;
+            // Anchors
+            anchors.top: ownedByHeader.bottom;
+            anchors.topMargin: 4;
+            anchors.left: ownedByHeader.left;
+            anchors.right: ownedByHeader.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+            elide: Text.ElideRight;
+        }
+
+        RalewayRegular {
+            id: editionHeader;
+            text: "EDITION";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: ownedBy.bottom;
+            anchors.topMargin: 20;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.baseGray;
+        }
+        AnonymousProRegular {
+            id: edition;
+            text: root.itemEdition;
+            // Text size
+            size: 22;
+            // Anchors
+            anchors.top: editionHeader.bottom;
+            anchors.topMargin: 4;
+            anchors.left: editionHeader.left;
+            anchors.right: editionHeader.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+
+        RalewayRegular {
+            id: dateOfPurchaseHeader;
+            text: "DATE OF PURCHASE";
+            visible: root.dateOfPurchase !== "";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: ownedBy.bottom;
+            anchors.topMargin: 20;
+            anchors.left: parent.left;
+            anchors.leftMargin: 45;
+            anchors.right: parent.right;
+            anchors.rightMargin: 16;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.baseGray;
+        }
+        AnonymousProRegular {
+            id: dateOfPurchase;
+            text: root.dateOfPurchase;
+            visible: root.dateOfPurchase !== "";
+            // Text size
+            size: 22;
+            // Anchors
+            anchors.top: editionHeader.bottom;
+            anchors.topMargin: 4;
+            anchors.left: editionHeader.left;
+            anchors.right: editionHeader.right;
+            height: paintedHeight;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+
+        RalewayRegular {
+            id: errorText;
+            text: "Here we will display some text if there's an <b>error</b> with the certificate " +
+            "(DMCA takedown, invalid cert, location of item updated)";
+            // Text size
+            size: 20;
+            // Anchors
+            anchors.top: root.dateOfPurchase !== "" ? dateOfPurchase.bottom : edition.bottom;
+            anchors.topMargin: 40;
+            anchors.left: root.dateOfPurchase !== "" ? dateOfPurchase.left : edition.left;
+            anchors.right: root.dateOfPurchase !== "" ? dateOfPurchase.right : edition.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: 50;
+        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;
+            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', itemId: root.marketplaceId});
+            }
+        }
+    }
+
+    //
+    // 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_setMarketplaceId':
+                root.marketplaceId = message.marketplaceId;
+            break;
+            case 'inspectionCertificate_setItemInfo':
+                root.itemName = message.itemName;
+                root.itemOwner = message.itemOwner;
+                root.itemEdition = message.itemEdition;
+            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/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/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/purchases/FirstUseTutorial.qml
new file mode 100644
index 0000000000..2e8ad6db65
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/purchases/FirstUseTutorial.qml
@@ -0,0 +1,215 @@
+//
+//  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;    
+
+    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/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
new file mode 100644
index 0000000000..5eb5516519
--- /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 int displayedItemCount;
+    property int itemEdition;
+    property int numberSold;
+    property int limitedRun;
+
+    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', itemMarketplaceId: root.itemId});
+                }
+                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 ? "INFTY" : 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.purchaseStatus !== "invalidated";
+            
+            onClicked: {
+                if (urlHandler.canHandleUrl(root.itemHref)) {
+                    urlHandler.handleUrl(root.itemHref);
+                }
+                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: "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..990fd348c6
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -0,0 +1,703 @@
+//
+//  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 (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();
+
+                if (root.pendingInventoryReply) {
+                    inventoryTimer.start();
+                }
+            }
+
+            root.pendingInventoryReply = false;
+        }
+    }
+
+    Timer {
+        id: notSetUpTimer;
+        interval: 200;
+        onTriggered: {
+            sendToScript({method: 'checkout_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);
+                }
+            }
+        }
+    }
+
+    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: root_file_url;
+                purchaseStatus: status;
+                purchaseStatusChanged: statusChanged;
+                itemEdition: model.edition_number;
+                numberSold: model.number_sold;
+                limitedRun: model.limited_run;
+                displayedItemCount: model.displayedItemCount;
+                anchors.topMargin: 12;
+                anchors.bottomMargin: 12;
+
+                Connections {
+                    onSendToPurchases: {
+                        if (msg.method === 'purchases_itemInfoClicked') {
+                            sendToScript({method: 'purchases_itemInfoClicked', itemId: itemId});
+                        } 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: 90000;
+        onTriggered: {
+            if (root.activeView === "purchasesMain" && !root.pendingInventoryReply) {
+                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);
+                }
+            }
+        }
+    }
+
+    //
+    // 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_setMarketplaceId':
+            case 'inspectionCertificate_setItemInfo':
+                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/purchases/images/Purchase-First-Run-1.jpg b/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-1.jpg
new file mode 100644
index 0000000000..ce0d87363f
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-1.jpg differ
diff --git a/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-2.jpg b/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-2.jpg
new file mode 100644
index 0000000000..40bed974af
Binary files /dev/null and b/interface/resources/qml/hifi/commerce/purchases/images/Purchase-First-Run-2.jpg differ
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..21548ea788
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -0,0 +1,286 @@
+//
+//  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;
+
+    Hifi.QmlCommerce {
+        id: commerce;
+
+        onKeyFilePathIfExistsResult: {
+            keyFilePath = path;
+        }
+    }
+
+    Component.onCompleted: {
+        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;
+        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;
+        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 decrypt code.<br><br>In High Fidelity, <b>your private keys are used to decrypt the contents of your Wallet and Purchases.</b>");
+        }
+        ListElement {
+            isExpanded: false;
+            question: "Where are my private keys stored?"
+            answer: qsTr('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 file path of your hifikey in your file explorer.</a></font></b><br><br> You may backup this file 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.');
+        }
+        ListElement {
+            isExpanded: false;
+            question: "What happens if I lose my passphrase?"
+            answer: qsTr("If you lose your passphrase, you will 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 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..8d5d9f97de
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -0,0 +1,392 @@
+//
+//  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: 998;
+    property bool keyboardRaised: 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;
+            }
+
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    root.keyboardRaised = true;
+                    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: 999;
+        visible: keyboard.raised;
+        property bool punctuationMode: false;
+        anchors {
+            bottom: parent.bottom;
+            left: parent.left;
+            right: parent.right;
+        }
+
+        Image {
+            id: lowerKeyboardButton;
+            source: "images/lowerKeyboard.png";
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.bottom: keyboard.top;
+            height: 30;
+            width: 120;
+
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    root.keyboardRaised = false;
+                }
+            }
+        }
+
+        HifiControlsUit.Keyboard {
+            id: keyboard;
+            raised: HMD.mounted && root.keyboardRaised;
+            numeric: parent.punctuationMode;
+            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..7c0cecd98d
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
@@ -0,0 +1,338 @@
+//
+//  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) {
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
+            } else if (!passphraseFieldAgain.focus) {
+                sendSignalToWallet({method: 'walletSetup_lowerKeyboard'});
+            }
+        }
+
+        MouseArea {
+            anchors.fill: parent;
+            onPressed: {
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
+                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: {
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
+                mouse.accepted = false;
+            }
+        }
+
+        onFocusChanged: {
+            if (focus) {
+                sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'});
+            } else if (!passphraseFieldAgain.focus) {
+                sendMessageToLightbox({method: 'walletSetup_lowerKeyboard'});
+            }
+        }
+
+        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: {
+                sendSignalToWallet({method: 'walletSetup_raiseKeyboard'});
+                mouse.accepted = false;
+            }
+        }
+
+        onFocusChanged: {
+            if (focus) {
+                sendMessageToLightbox({method: 'walletSetup_raiseKeyboard'});
+            } else if (!passphraseField.focus) {
+                sendMessageToLightbox({method: 'walletSetup_lowerKeyboard'});
+            }
+        }
+
+        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..9b70bb1f71
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/Security.qml
@@ -0,0 +1,358 @@
+//
+//  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: {
+            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;
+
+            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;
+                color: hifi.colors.blueHighlight;
+                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: {
+                    Qt.openUrlExternally("https://www.highfidelity.com/");
+                    Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
+                    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..9056d5bed3
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -0,0 +1,722 @@
+//
+//  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;
+
+    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: 998;
+        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 if (msg.method === 'walletSetup_raiseKeyboard') {
+                    root.keyboardRaised = true;
+                } else if (msg.method === 'walletSetup_lowerKeyboard') {
+                    root.keyboardRaised = false;
+                } else {
+                    sendToScript(msg);
+                }
+            }
+        }
+    }
+    PassphraseChange {
+        id: passphraseChange;
+        visible: root.activeView === "passphraseChange";
+        z: 998;
+        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;
+                } 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: 998;
+        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") {
+                    root.activeView = "walletHome";
+                } 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: 999;
+        visible: keyboard.raised;
+        property bool punctuationMode: false;
+        anchors {
+            bottom: parent.bottom;
+            left: parent.left;
+            right: parent.right;
+        }
+
+        Image {
+            id: lowerKeyboardButton;
+            source: "images/lowerKeyboard.png";
+            anchors.horizontalCenter: parent.horizontalCenter;
+            anchors.bottom: keyboard.top;
+            height: 30;
+            width: 120;
+
+            MouseArea {
+                anchors.fill: parent;
+
+                onClicked: {
+                    root.keyboardRaised = false;
+                }
+            }
+        }
+
+        HifiControlsUit.Keyboard {
+            id: keyboard;
+            raised: HMD.mounted && root.keyboardRaised;
+            numeric: parent.punctuationMode;
+            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..b94616bd7a
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -0,0 +1,361 @@
+//
+//  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();
+            }
+        }
+    }
+
+    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();
+                }
+            }
+        }
+
+        // "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;
+        }
+    }
+
+    // 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: 30;
+            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;
+            anchors.rightMargin: 24;
+            
+            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
+                    }
+                }
+            }
+
+            // This should never be visible (since you immediately get 100 HFC)
+            FiraSansRegular {
+                id: emptyTransationHistory;
+                size: 24;
+                visible: !transactionHistory.visible && root.historyReceived;
+                text: "Recent Activity Unavailable";
+                anchors.fill: parent;
+                horizontalAlignment: Text.AlignHCenter;
+                verticalAlignment: Text.AlignVCenter;
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS START
+    //
+
+    function getFormattedDate(timestamp) {
+        var a = new Date(timestamp);
+        var year = a.getFullYear();
+        var month = a.getMonth();
+        var day = a.getDate();
+        var hour = a.getHours();
+        var drawnHour = hour;
+        if (hour === 0) {
+            drawnHour = 12;
+        } else if (hour > 12) {
+            drawnHour -= 12;
+        }
+        
+        var amOrPm = "AM";
+        if (hour >= 12) {
+            amOrPm = "PM";
+        }
+
+        var min = a.getMinutes();
+        var sec = 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;
+        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..898cdf0ef2
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -0,0 +1,750 @@
+//
+//  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;
+
+    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";
+            } else {
+                root.activeView = "step_3";
+            }
+        }
+
+        onKeyFilePathIfExistsResult: {
+            keyFilePath.text = 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: keyFilePathText;
+                    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: keyFilePathText.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.text.substring(0, keyFilePath.text.lastIndexOf('/')));
+                    }
+                }
+                RalewayRegular {
+                    id: 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: keyFilePath.bottom;
+                    anchors.topMargin: 30;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 30;
+                    anchors.right: parent.right;
+                    anchors.rightMargin: 30;
+                    height: 40;
+                    text: "Open Instructions for Later";
+                    onClicked: {
+                        instructions01Container.visible = false;
+                        instructions02Container.visible = true;
+                        keysReadyPageFinishButton.visible = true;
+                        Qt.openUrlExternally("https://www.highfidelity.com/");
+                        Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
+                    }
+                }
+            }
+
+            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..9fc88262db
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/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 a7b4ad7a53..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
@@ -48,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);
 
@@ -105,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();
@@ -144,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() {
@@ -179,25 +200,25 @@ Rectangle {
         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) {
@@ -205,23 +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;
-                case SHAPE_TYPE_BOX:
-                    shapeType = "box";
-                    break;
-                case SHAPE_TYPE_SPHERE:
-                    shapeType = "sphere";
-                    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;
@@ -230,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
@@ -293,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();
 
@@ -339,12 +360,12 @@ Rectangle {
         }
 
         var object = tabletRoot.messageBox({
-                                            icon: hifi.icons.question,
-                                            buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
-                                            defaultButton: OriginalDialogs.StandardButton.Yes,
-                                            title: "Delete",
-                                            text: modalMessage
-                                        });
+            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);
@@ -379,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) {
@@ -421,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;
@@ -442,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 {
@@ -469,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
 
@@ -511,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"
@@ -539,38 +773,118 @@ Rectangle {
                     }
                 }
             }
-
         }
-        HifiControls.Tree {
-            id: treeView
-            height: 290
-            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
-            selectionMode: SelectionMode.ExtendedSelection
+        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..80c1b58444 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,90 @@ 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
 
+
+    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 +130,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 +150,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 +200,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 +223,7 @@ Rectangle {
                     expandSelectedRow: true
 
                     itemDelegate: Item {
+                        property bool canEdit: canEditScript(styleData.value);
                         anchors {
                             left: parent ? parent.left : undefined
                             leftMargin: hifi.dimensions.tablePadding
@@ -148,8 +247,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 +258,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 +276,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 +285,11 @@ Rectangle {
                                 MouseArea {
                                     id: stopButtonArea
                                     anchors { fill: parent; margins: -2 }
-                                    onClicked: stopScript(model.url)
+                                    onClicked: {
+                                        if (canEdit) {
+                                            stopScript(model.url)
+                                        }
+                                    }
                                 }
                             }
 
@@ -250,13 +365,6 @@ Rectangle {
                             onTriggered: ApplicationInterface.loadDialog();
                         }
                     }
-
-                    HifiControls.Button {
-                        text: "Load Defaults"
-                        color: hifi.buttons.black
-                        height: 26
-                        onClicked: loadDefaults()
-                    }
                 }
 
                 HifiControls.VerticalSpacer {}
@@ -292,6 +400,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 +427,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 {
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/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml
index 43672190dd..66e3dfdbbb 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
@@ -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 8bf13bad76..e8752b01e7 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));
diff --git a/interface/resources/qml/hifi/tablet/TabletButton.qml b/interface/resources/qml/hifi/tablet/TabletButton.qml
index 5e7e0f5709..58091d9fab 100644
--- a/interface/resources/qml/hifi/tablet/TabletButton.qml
+++ b/interface/resources/qml/hifi/tablet/TabletButton.qml
@@ -3,6 +3,8 @@ import QtGraphicalEffects 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
@@ -102,7 +104,7 @@ Item {
 
     Text {
         id: text
-        color: "#ffffff"
+        color: captionColorOverride !== "" ? captionColorOverride: "#ffffff"
         text: tabletButton.text
         font.bold: true
         font.pixelSize: 18
@@ -116,6 +118,7 @@ Item {
         anchors.fill: parent
         hoverEnabled: true
         enabled: true
+        preventStealing: true
         onClicked: {
             console.log("Tablet Button Clicked!");
             if (tabletButton.inDebugMode) {
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 9076cd6c48..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})
@@ -133,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;
         }
@@ -181,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..ecfb653923 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@@ -9,8 +9,6 @@
 //
 
 import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
 
 import "../../styles-uit"
 import "."
@@ -36,7 +34,6 @@ FocusScope {
         //color: isSubMenu ? hifi.colors.faintGray : hifi.colors.faintGray80
     }
 
-
     ListView {
         id: listView
         x: 0
@@ -68,8 +65,8 @@ 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 {
                 anchors.fill: parent
@@ -124,8 +121,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 c7df6ac64f..5084377273 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -8,6 +8,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 +94,11 @@ Item {
         loader.source = "";
         loader.source = "TabletWebView.qml";
     }
+
+    function loadTabletWebBase() {
+        loader.source = "";
+        loader.source = "./BlocksWebView.qml";
+    }
         
     function returnToPreviousApp() {
         tabletApps.remove(currentApp);
@@ -121,6 +127,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 +158,11 @@ Item {
 
     function setUsername(newUsername) {
         username = newUsername;
+        usernameShort = newUsername.substring(0, 8);
+
+        if (newUsername.length > 8) {
+            usernameShort = usernameShort + "..."
+        }
     }
 
     ListModel {
diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml
index fdfcfcf806..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.
diff --git a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml
index 3d4231ced7..bbf2d019fb 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
@@ -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 1556a9c0c0..a0af92dec0 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -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]
@@ -337,5 +342,16 @@ Item {
         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/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/shaders/hmd_ui.frag b/interface/resources/shaders/hmd_ui.frag
new file mode 100644
index 0000000000..5341ab575d
--- /dev/null
+++ b/interface/resources/shaders/hmd_ui.frag
@@ -0,0 +1,30 @@
+//
+//  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;
+    float alpha;
+};
+
+layout(std140) uniform overlayBuffer {
+    OverlayData overlay;
+};
+
+in vec2 vTexCoord;
+
+out vec4 FragColor;
+
+void main() {
+    FragColor = texture(sampler, vTexCoord);
+    FragColor.a *= overlay.alpha;
+    if (FragColor.a <= 0.0) {
+        discard;
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/shaders/hmd_ui_glow.vert b/interface/resources/shaders/hmd_ui.vert
similarity index 76%
rename from interface/resources/shaders/hmd_ui_glow.vert
rename to interface/resources/shaders/hmd_ui.vert
index 71089d8608..41b9b3666f 100644
--- a/interface/resources/shaders/hmd_ui_glow.vert
+++ b/interface/resources/shaders/hmd_ui.vert
@@ -8,12 +8,7 @@
 
 struct OverlayData {
     mat4 mvp;
-    vec4 glowPoints;
-    vec4 glowColors[2];
-    vec4 resolutionRadiusAlpha;
-
-    vec4 extraGlowColor;
-    vec2 extraGlowPoint;
+    float alpha;
 };
 
 layout(std140) uniform overlayBuffer {
@@ -25,11 +20,9 @@ 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/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/src/Application.cpp b/interface/src/Application.cpp
index e5fb9949db..0fc8c46cdc 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -113,7 +113,6 @@
 #include <plugins/SteamClientPlugin.h>
 #include <plugins/InputConfiguration.h>
 #include <RecordingScriptingInterface.h>
-#include <RenderableWebEntityItem.h>
 #include <UpdateSceneTask.h>
 #include <RenderViewTask.h>
 #include <SecondaryCamera.h>
@@ -139,6 +138,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"
@@ -166,6 +166,8 @@
 #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
@@ -187,13 +189,21 @@
 #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)
@@ -204,6 +214,73 @@ extern "C" {
 }
 #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();
+                // Ensure we never back up the render events.  Each render should be triggered only in response
+                // to the NEXT render event after the last render occured
+                QCoreApplication::removePostedEvents(this, ApplicationEvent::Render);
+                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;
@@ -212,6 +289,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
@@ -222,6 +303,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";
@@ -255,6 +337,8 @@ 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 },
@@ -262,6 +346,7 @@ const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensi
     { JSON_EXTENSION, &Application::importJSONFromURL },
     { JS_EXTENSION, &Application::askToLoadScript },
     { FST_EXTENSION, &Application::askToSetAvatarUrl },
+    { JSON_GZ_EXTENSION, &Application::askToReplaceDomainContent },
     { ZIP_EXTENSION, &Application::importFromZIP }
 };
 
@@ -415,10 +500,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(); }
 };
@@ -525,6 +610,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);
@@ -597,7 +683,16 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     DependencyManager::set<Snapshot>();
     DependencyManager::set<CloseEventSender>();
     DependencyManager::set<ResourceManager>();
+    DependencyManager::set<SelectionScriptingInterface>();
     DependencyManager::set<ContextOverlayInterface>();
+    DependencyManager::set<Ledger>();
+    DependencyManager::set<Wallet>();
+    DependencyManager::set<WalletScriptingInterface>();
+
+    DependencyManager::set<FadeEffect>();
+
+    DependencyManager::set<LaserPointerScriptingInterface>();
+    DependencyManager::set<RayPickScriptingInterface>();
 
     return previousSessionCrashed;
 }
@@ -702,12 +797,12 @@ 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
 
@@ -715,8 +810,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();
@@ -834,8 +937,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);
@@ -846,9 +947,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);
@@ -877,7 +975,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
 
     auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
-    scriptEngines->registerScriptInitializer([this](ScriptEngine* engine){
+    scriptEngines->registerScriptInitializer([this](ScriptEnginePointer engine){
         registerScriptEngineWithApplicationServices(engine);
     });
 
@@ -894,7 +992,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
@@ -942,6 +1040,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _glWidget->setFocusPolicy(Qt::StrongFocus);
     _glWidget->setFocus();
 
+    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
@@ -955,6 +1056,53 @@ 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.
+    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;
+    }
+
+    // add firstRun flag from settings to launch event
     Setting::Handle<bool> firstRun { Settings::firstRun, true };
 
     // once the settings have been loaded, check if we need to flip the default for UserActivityLogger
@@ -1303,8 +1451,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 {
@@ -1401,15 +1548,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();
 
@@ -1628,7 +1773,7 @@ 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();
     });
@@ -1672,6 +1817,27 @@ 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);
+    });
+
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 }
 
@@ -1689,7 +1855,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:
@@ -1773,7 +1939,7 @@ void Application::showCursor(const Cursor::Icon& cursor) {
 }
 
 void Application::updateHeartbeat() const {
-    static_cast<DeadlockWatchdogThread*>(_deadlockWatchdogThread)->updateHeartbeat();
+    DeadlockWatchdogThread::updateHeartbeat();
 }
 
 void Application::onAboutToQuit() {
@@ -1858,7 +2024,8 @@ 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
@@ -1901,6 +2068,7 @@ void Application::cleanupBeforeQuit() {
     // 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";
 }
@@ -1934,7 +2102,6 @@ Application::~Application() {
     _octreeProcessor.terminate();
     _entityEditSender.terminate();
 
-
     DependencyManager::destroy<AvatarManager>();
     DependencyManager::destroy<AnimationCache>();
     DependencyManager::destroy<FramebufferCache>();
@@ -2014,6 +2181,13 @@ void Application::initializeGL() {
     _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
@@ -2037,31 +2211,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();
 
@@ -2080,6 +2257,7 @@ void Application::initializeUi() {
         qApp->quit();
     });
 
+
     setupPreferences();
 
     // For some reason there is already an "Application" object in the QML context,
@@ -2152,7 +2330,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()));
@@ -2198,296 +2378,109 @@ void Application::initializeUi() {
 
     // 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;
-    }
-
-    DisplayPluginPointer displayPlugin;
-    {
-        PROFILE_RANGE(render, "/getActiveDisplayPlugin");
-        displayPlugin = getActiveDisplayPlugin();
-    }
-
-    {
-        PROFILE_RANGE(render, "/offscreenMakeCurrent");
-        // FIXME not needed anymore?
-        _offscreenContext->makeCurrent();
-    }
-
-    {
-        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(_frameCount)) {
-            _inPaint = false;
-            updateDisplayMode();
-            return;
-        }
-    }
-
-    // update the avatar with a fresh HMD pose
-    {
-        PROFILE_RANGE(render, "/updateAvatar");
-        getMyAvatar()->updateFromHMDSensorMatrix(getHMDSensorPose());
-    }
-
-    auto lodManager = DependencyManager::get<LODManager>();
-
-    RenderArgs renderArgs;
-    {
-        PROFILE_RANGE(render, "/buildFrustrumAndArgs");
-        {
-            QMutexLocker viewLocker(&_viewMutex);
-            _viewFrustum.calculate();
-        }
-        renderArgs = RenderArgs(_gpuContext, lodManager->getOctreeSizeScale(),
-            lodManager->getBoundaryLevelAdjust(), RenderArgs::DEFAULT_RENDER_MODE,
-            RenderArgs::MONO, RenderArgs::RENDER_DEBUG_NONE);
-        {
-            QMutexLocker viewLocker(&_viewMutex);
-            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();
-    }
-
-    {
-        PROFILE_RANGE(render, "/gpuContextReset");
-        _gpuContext->beginFrame(getHMDSensorPose());
-        // 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);
-    }
+void Application::updateCamera(RenderArgs& renderArgs) {
+    PROFILE_RANGE(render, "/updateCamera");
+    PerformanceTimer perfTimer("CameraUpdates");
 
     glm::vec3 boomOffset;
-    {
-        PROFILE_RANGE(render, "/updateCamera");
-        {
-            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));
+        }
+        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);
             }
-
-            // 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 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 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->getUniformScale(), 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->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);
-                }
-                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());
-                    }
-                }
-            }
-            // Update camera position
-            if (!isHMDMode()) {
-                _myCamera.update(1.0f / _frameCounter.rate());
+            else {
+                _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                    + myAvatar->getOrientation() * boomOffset);
             }
         }
     }
+    else if (_myCamera.getMode() == CAMERA_MODE_MIRROR) {
+        if (isHMDMode()) {
+            auto mirrorBodyOrientation = myAvatar->getOrientation() * glm::quat(glm::vec3(0.0f, PI + _rotateMirror, 0.0f));
 
-    {
-        PROFILE_RANGE(render, "/updateCompositor");
-        getApplicationCompositor().setFrameInfo(_frameCount, _myCamera.getTransform());
-    }
+            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);
 
-    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();
-    }
+            glm::quat worldMirrorRotation = mirrorBodyOrientation * mirrorHmdRotation;
 
-    {
-        PROFILE_RANGE(render, "/mainRender");
-        PerformanceTimer perfTimer("mainRender");
-        renderArgs._boomOffset = boomOffset;
-        // FIXME is this ever going to be different from the size previously set in the render args
-        // in the overlay render?
-        // Viewport is assigned to the size of the framebuffer
-        renderArgs._viewport = ivec4(0, 0, finalFramebufferSize.width(), finalFramebufferSize.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();
+            _myCamera.setOrientation(worldMirrorRotation);
 
-            // 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);
+            glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
+            // Mirror HMD lateral offsets
+            hmdOffset.x = -hmdOffset.x;
 
-            // Configure the type of display / stereo
-            renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR);
+            _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);
         }
-        renderArgs._blitFramebuffer = finalFramebuffer;
-        displaySide(&renderArgs, _myCamera);
+        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());
+                _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());
+            }
+        }
+    }
+    // Update camera position
+    if (!isHMDMode()) {
+        _myCamera.update();
     }
 
-    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() {
@@ -2604,15 +2597,6 @@ 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) {
@@ -2643,35 +2627,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";
@@ -2681,58 +2648,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 },
@@ -2741,24 +2681,15 @@ 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)) {
@@ -2774,64 +2705,39 @@ bool Application::importSVOFromURL(const QString& urlString) {
     return true;
 }
 
-void Application::onPresent(quint32 frameCount) {
-    if (shouldPaint()) {
-        postEvent(this, new QEvent(static_cast<QEvent::Type>(Idle)), Qt::HighEventPriority);
-        postEvent(this, new QEvent(static_cast<QEvent::Type>(Paint)), Qt::HighEventPriority);
-    }
-}
-
 bool Application::importFromZIP(const QString& filePath) {
     qDebug() << "A zip file has been dropped in: " << filePath;
     QUrl empty;
-    qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true);
+    // handle Blocks download from Marketplace
+    if (filePath.contains("vr.google.com/downloads")) {
+        addAssetToWorldFromURL(filePath);
+    } else {
+        qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false);
+    }
     return true;
 }
 
-bool _renderRequested { false };
-
-bool Application::event(QEvent* event) {
-    if (!Menu::getInstance()) {
-        return false;
+void Application::onPresent(quint32 frameCount) {
+    postEvent(this, new QEvent((QEvent::Type)ApplicationEvent::Idle), Qt::HighEventPriority);
+    if (_renderEventHandler && !isAboutToQuit()) {
+        postEvent(_renderEventHandler, new QEvent((QEvent::Type)ApplicationEvent::Render));
     }
+}
 
-    int type = event->type();
-    switch (type) {
-        case Event::Lambda:
-            static_cast<LambdaEvent*>(event)->call();
-            return true;
+static inline bool isKeyEvent(QEvent::Type type) {
+    return type == QEvent::KeyPress || type == QEvent::KeyRelease;
+}
 
-        // Explicit idle keeps the idle running at a lower interval, but without any rendering
-        // see (windowMinimizedChanged)
-        case Event::Idle:
-            idle();
-            // Clear the event queue of pending idle calls
-            removePostedEvents(this, Idle);
-            return true;
-
-        case Event::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();
-            // Clear the event queue of pending paint calls
-            removePostedEvents(this, Paint);
-            return true;
-
-        default:
-            break;
-    }
-
-    {
-        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()) {
+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;
@@ -2839,20 +2745,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);
@@ -2861,15 +2764,52 @@ 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;
+}
+
+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();
+            // Don't process extra idle events that arrived in the event queue while we were doing this idle
+            QCoreApplication::removePostedEvents(this, ApplicationEvent::Idle);
+            return true;
+
         case QEvent::MouseMove:
             mouseMoveEvent(static_cast<QMouseEvent*>(event));
             return true;
@@ -2910,28 +2850,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));
     }
@@ -3626,7 +3555,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;
@@ -3634,11 +3563,12 @@ bool Application::acceptSnapshot(const QString& urlString) {
 
 static uint32_t _renderedFrameIndex { INVALID_FRAME };
 
-bool Application::shouldPaint() {
+bool Application::shouldPaint() const {
     if (_aboutToQuit) {
         return false;
     }
 
+
     auto displayPlugin = getActiveDisplayPlugin();
 
 #ifdef DEBUG_PAINT_DELAY
@@ -3654,15 +3584,14 @@ bool Application::shouldPaint() {
             (float)paintDelaySamples / paintDelayUsecs << "us";
     }
 #endif
-    
+
     // Throttle if requested
-    if (displayPlugin->isThrottled() && (_lastTimeUpdated.elapsed() < 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;
 }
 
@@ -3872,7 +3801,6 @@ void setupCpuMonitorThread() {
 
 #endif
 
-
 void Application::idle() {
     PerformanceTimer perfTimer("idle");
 
@@ -3903,13 +3831,21 @@ void Application::idle() {
     });
 #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());
@@ -3945,14 +3881,16 @@ void Application::idle() {
 
     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()");
@@ -4015,6 +3953,14 @@ void Application::idle() {
     }
 
     _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 {
@@ -4269,7 +4215,6 @@ void Application::init() {
     _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";
@@ -4318,14 +4263,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()) {
@@ -4335,11 +4273,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();
     }
@@ -4384,10 +4324,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;
@@ -4561,12 +4504,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();
@@ -4636,9 +4575,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();
                 }
@@ -4705,12 +4647,7 @@ 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) {
@@ -4721,13 +4658,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;
@@ -4745,6 +4678,7 @@ void Application::update(float deltaTime) {
         PROFILE_ASYNC_END(app, "Scene Loading", "");
     }
 
+    auto myAvatar = getMyAvatar();
     {
         PerformanceTimer perfTimer("devices");
 
@@ -4778,129 +4712,127 @@ 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);
-    }
-
-    // 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));
-    }
 
-    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
-    };
+        userInputMapper->setInputCalibrationData(calibrationData);
+        userInputMapper->update(deltaTime);
 
-    // 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));
+        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));
+        }
     }
 
     updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
@@ -4908,114 +4840,133 @@ void Application::update(float deltaTime) {
 
     QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
 
-    if (_physicsEnabled) {
+    {
         PROFILE_RANGE_EX(simulation_physics, "Physics", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
-
         PerformanceTimer perfTimer("physics");
+        if (_physicsEnabled) {
+            {
+                PROFILE_RANGE_EX(simulation_physics, "UpdateStates", 0xffffff00, (uint64_t)getActiveDisplayPlugin()->presentCount());
 
-        {
-            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_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);
+                    });
+
+                    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);
+
+                        // 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...
+                    }
+
+                    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();
-
         {
+            PerformanceTimer perfTimer("otherAvatars");
             PROFILE_RANGE_EX(simulation, "OtherAvatars", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
             avatarManager->updateOtherAvatars(deltaTime);
         }
 
-        qApp->updateMyAvatarLookAtPosition();
-
         {
             PROFILE_RANGE_EX(simulation, "MyAvatar", 0xffff00ff, (uint64_t)getActiveDisplayPlugin()->presentCount());
+            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");
@@ -5075,7 +5026,8 @@ void Application::update(float deltaTime) {
         }
     }
 
-    avatarManager->postUpdate(deltaTime);
+    avatarManager->postUpdate(deltaTime, getMain3DScene());
+
 
     {
         PROFILE_RANGE_EX(app, "PreRenderLambdas", 0xffff0000, (uint64_t)0);
@@ -5087,9 +5039,123 @@ 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;
+        {
+            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._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() {
@@ -5148,11 +5214,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
@@ -5308,16 +5373,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);
@@ -5333,7 +5388,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();
@@ -5389,127 +5444,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);
-
-            RenderArgs::OutlineFlags renderOutlineFlags = RenderArgs::RENDER_OUTLINE_NONE;
-            auto contextOverlayInterface = DependencyManager::get<ContextOverlayInterface>();
-            if (contextOverlayInterface->getEnabled()) {
-                if (DependencyManager::get<ContextOverlayInterface>()->getIsInMarketplaceInspectionMode()) {
-                    renderOutlineFlags = RenderArgs::RENDER_OUTLINE_MARKETPLACE_MODE;
-                } else {
-                    renderOutlineFlags = RenderArgs::RENDER_OUTLINE_WIREFRAMES;
-                }
-            }
-            renderArgs->_outlineFlags = renderOutlineFlags;
-        }
-    }
-
-    // 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();
@@ -5577,8 +5511,6 @@ void Application::clearDomainOctreeDetails() {
 
     skyStage->setBackgroundMode(model::SunSkyStage::SKY_DEFAULT);
 
-    _recentlyClearedDomain = true;
-
     DependencyManager::get<AnimationCache>()->clearUnusedResources();
     DependencyManager::get<ModelCache>()->clearUnusedResources();
     DependencyManager::get<SoundCache>()->clearUnusedResources();
@@ -5625,14 +5557,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) {
@@ -5807,7 +5735,7 @@ int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer
 void Application::packetSent(quint64 length) {
 }
 
-void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) {
+void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) {
 
     scriptEngine->setEmitScriptUpdatesFunction([this]() {
         SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
@@ -5842,29 +5770,31 @@ 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>);
     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.
@@ -5883,6 +5813,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());
@@ -5893,7 +5826,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());
 
@@ -5921,11 +5854,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());
@@ -5933,16 +5866,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);
 
 }
 
@@ -5997,7 +5937,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;
     }
 
@@ -6009,41 +5949,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;
@@ -6051,8 +6005,6 @@ bool Application::askToSetAvatarUrl(const QString& url) {
 
 
 bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
-    QMessageBox::StandardButton reply;
-
     QString shortName = scriptFilenameOrURL;
 
     QUrl scriptURL { scriptFilenameOrURL };
@@ -6064,15 +6016,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;
 }
 
@@ -6109,22 +6066,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\"");
@@ -6140,22 +6101,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 {
@@ -6189,7 +6192,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()) {
@@ -6216,7 +6219,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("vr.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.";
@@ -6237,7 +6252,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("vr.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;
@@ -6252,7 +6281,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, false);
+                tempFile.close();
+                qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false, isBlocks);
             } else {
                 QString errorInfo = "Couldn't open temporary file for download";
                 qWarning(interfaceapp) << errorInfo;
@@ -6282,7 +6312,7 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) {
     addAssetToWorldError(filename, "Couldn't unzip file " + filename + ".");
 }
 
-void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip) {
+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 mapping;
     QString path = filePath;
@@ -6291,6 +6321,11 @@ void Application::addAssetToWorld(QString filePath, QString zipFile, bool 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;
     }
@@ -6396,7 +6431,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);
 
@@ -6443,7 +6480,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));
@@ -6670,12 +6707,12 @@ void Application::onAssetToWorldMessageBoxClosed() {
 }
 
 
-void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip) {
+void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks) {
     if (autoAdd) {
         if (!unzipFile.isEmpty()) {
             for (int i = 0; i < unzipFile.length(); i++) {
                 qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
-                addAssetToWorld(unzipFile.at(i), zipFile, isZip);
+                addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks);
             }
         } else {
             addAssetToWorldUnzipFailure(zipFile);
@@ -6702,12 +6739,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() {
@@ -6720,12 +6762,16 @@ void Application::setPreviousScriptLocation(const QString& location) {
 }
 
 void Application::loadScriptURLDialog() const {
-    QString 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.trimmed());
-    }
+    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());
+        }
+    });
 }
 
 void Application::loadLODToolsDialog() {
@@ -6806,6 +6852,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...
@@ -6836,7 +6888,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);
     }
 }
 
@@ -6845,7 +6897,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 {
@@ -7058,14 +7110,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();
 
@@ -7142,12 +7186,12 @@ void Application::updateDisplayMode() {
         bool wasRepositionLocked = offscreenUi->getDesktop()->property("repositionLocked").toBool();
         offscreenUi->getDesktop()->setProperty("repositionLocked", true);
 
-        auto oldDisplayPlugin = _displayPlugin;
         if (_displayPlugin) {
-            disconnect(_displayPluginPresentConnection);
+            disconnect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
             _displayPlugin->deactivate();
         }
 
+        auto oldDisplayPlugin = _displayPlugin;
         bool active = newDisplayPlugin->activate();
 
         if (!active) {
@@ -7185,8 +7229,11 @@ void Application::updateDisplayMode() {
         _offscreenContext->makeCurrent();
         getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
         _displayPlugin = newDisplayPlugin;
-        _displayPluginPresentConnection = connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
-        offscreenUi->getDesktop()->setProperty("repositionLocked", wasRepositionLocked);
+        connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
+        auto desktop = offscreenUi->getDesktop();
+        if (desktop) {
+            desktop->setProperty("repositionLocked", wasRepositionLocked);
+        }
     }
 
     bool isHmd = _displayPlugin->isHmd();
@@ -7437,3 +7484,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 f8eb393f9e..478642e2da 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -37,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>
@@ -71,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"
 
@@ -128,12 +131,6 @@ public:
 
     virtual DisplayPluginPointer getActiveDisplayPlugin() const override;
 
-    enum Event {
-        Paint = QEvent::User + 1,
-        Idle,
-        Lambda
-    };
-
     // FIXME? Empty methods, do we still need them?
     static void initPlugins(const QStringList& arguments);
     static void shutdownPlugins();
@@ -151,6 +148,8 @@ public:
 
     void initializeGL();
     void initializeUi();
+
+    void updateCamera(RenderArgs& renderArgs);
     void paintGL();
     void resizeGL();
 
@@ -177,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; }
@@ -196,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);
@@ -222,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(); }
@@ -270,10 +267,10 @@ 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; }
@@ -297,9 +294,13 @@ public:
     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; }
 
+    LaserPointerManager& getLaserPointerManager() { return _laserPointerManager; }
+    RayPickManager& getRayPickManager() { return _rayPickManager; }
+
 signals:
     void svoImportRequested(const QString& url);
 
@@ -331,14 +332,14 @@ public slots:
     // FIXME: Move addAssetToWorld* methods to own class?
     void addAssetToWorldFromURL(QString url);
     void addAssetToWorldFromURLRequestFinished();
-    void addAssetToWorld(QString filePath, QString zipFile, bool isZip);
+    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, QStringList destinationFile, bool autoAdd, bool isZip);
+    void handleUnzip(QString sourceFile, QStringList destinationFile, bool autoAdd, bool isZip, bool isBlocks);
 
     FileScriptingInterface* getFileDownloadInterface() { return _fileDownload; }
 
@@ -428,7 +429,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;
 
@@ -452,21 +454,20 @@ private slots:
 private:
     static void initDisplay();
     void init();
-
+    bool handleKeyEventForFocusedEntityOrOverlay(QEvent* event);
+    bool handleFileOpenEvent(QFileOpenEvent* event);
     void cleanupBeforeQuit();
 
-    bool shouldPaint();
+    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();
@@ -477,7 +478,7 @@ 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);
@@ -528,16 +529,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;
@@ -549,7 +552,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
@@ -620,6 +622,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;
@@ -630,7 +650,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 };
 
@@ -647,8 +666,6 @@ private:
     Qt::CursorShape _desiredCursor{ Qt::BlankCursor };
     bool _cursorNeedsChanging { false };
 
-    QThread* _deadlockWatchdogThread;
-
     std::map<void*, std::function<void()>> _postUpdateLambdas;
     std::mutex _postUpdateLambdasLock;
 
@@ -656,12 +673,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;
@@ -696,6 +711,11 @@ private:
 
     QUrl _avatarOverrideUrl;
     bool _saveAvatarOverrideUrl { false };
+    QObject* _renderEventHandler{ nullptr };
 
+    RayPickManager _rayPickManager;
+    LaserPointerManager _laserPointerManager;
+
+    friend class RenderEventHandler;
 };
 #endif // hifi_Application_h
diff --git a/interface/src/Application_render.cpp b/interface/src/Application_render.cpp
new file mode 100644
index 0000000000..bbcd8266d7
--- /dev/null
+++ b/interface/src/Application_render.cpp
@@ -0,0 +1,240 @@
+//
+//  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;
+        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._blitFramebuffer = finalFramebuffer;
+        runRenderFrame(&renderArgs);
+    }
+
+    gpu::Batch postCompositeBatch;
+    {
+        PROFILE_RANGE(render, "/postComposite");
+        PerformanceTimer perfTimer("postComposite");
+        renderArgs._batch = &postCompositeBatch;
+        renderArgs._batch->setViewportTransform(ivec4(0, 0, finalFramebufferSize.width(), finalFramebufferSize.height()));
+        renderArgs._batch->setViewTransform(renderArgs.getViewFrustum().getView());
+        _overlays.render3DHUDOverlays(&renderArgs);
+    }
+
+    auto frame = _gpuContext->endFrame();
+    frame->frameIndex = _renderFrameCount;
+    frame->framebuffer = finalFramebuffer;
+    frame->framebufferRecycler = [](const gpu::FramebufferPointer& framebuffer) {
+        DependencyManager::get<FramebufferCache>()->releaseFramebuffer(framebuffer);
+    };
+    frame->overlay = _applicationOverlay.getOverlayTexture();
+    frame->postCompositeBatch = postCompositeBatch;
+    // 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 73192b0bef..5b9c45eef5 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -106,30 +106,30 @@ void AvatarBookmarks::changeToBookmarkedAvatar() {
 }
 
 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();
 
-    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+        const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString();
+        const QVariant& avatarScale = myAvatar->getAvatarScale();
 
-    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);
+    });
 
-    // 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);
 }
 
 void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& bookmark) {
diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp
index 0bd6b01128..f48b5e1f5b 100644
--- a/interface/src/Bookmarks.cpp
+++ b/interface/src/Bookmarks.cpp
@@ -58,20 +58,25 @@ void Bookmarks::addBookmarkToFile(const QString& bookmarkName, const QVariant& b
     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?");
-        auto result = offscreenUi->waitForMessageBoxResult(duplicateBookmarkMessage);
-        if (result != QMessageBox::Yes) {
-            return;
-        }
-        removeBookmarkFromMenu(menubar, bookmarkName);
-    }
+        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);
 
-    addBookmarkToMenu(menubar, bookmarkName, bookmark);
-    insert(bookmarkName, bookmark);  // Overwrites any item with the same bookmarkName.
-    enableMenuItems(true);
+            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);
+    }
 }
 
 void Bookmarks::insert(const QString& name, const QVariant& bookmark) {
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index bf756a55a5..d3c8746e16 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -39,16 +39,29 @@ 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
+    float blend = BLEND_TIMESCALE / deltaTimeSec;
+    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 +69,6 @@ void LODManager::autoAdjustLOD(float currentFPS) {
     
     quint64 now = usecTimestampNow();
 
-    bool changed = false;
     quint64 elapsedSinceDownShift = now - _lastDownShift;
     quint64 elapsedSinceUpShift = now - _lastUpShift;
 
@@ -64,6 +76,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 +189,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 +241,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 eee6cdf3c8..285f533a7f 100644
--- a/interface/src/LocationBookmarks.cpp
+++ b/interface/src/LocationBookmarks.cpp
@@ -63,6 +63,10 @@ void LocationBookmarks::setHomeLocation() {
     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();
@@ -70,20 +74,21 @@ 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 QVariant& address) {
@@ -97,4 +102,4 @@ void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, co
         menubar->addActionToQMenuAndActionHash(_bookmarksMenu, teleportAction, name, 0, QAction::NoRole);
         Bookmarks::sortActions(menubar, _bookmarksMenu);
     }
-}
\ No newline at end of file
+}
diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h
index 6cac56ae04..9a800ba35e 100644
--- a/interface/src/LocationBookmarks.h
+++ b/interface/src/LocationBookmarks.h
@@ -27,6 +27,7 @@ public:
 
 public slots:
     void addBookmark();
+    void setHomeLocationToAddress(const QVariant& address);
 
 protected:
     void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override;
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 56bd3eb749..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(
+    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(
+    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(
+    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
@@ -355,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);
@@ -532,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)));
@@ -555,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()),
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index a81ef9ac86..854f8d8c2b 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -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 56b8b3ef85..9d19b8fb0f 100644
--- a/interface/src/SecondaryCamera.cpp
+++ b/interface/src/SecondaryCamera.cpp
@@ -18,7 +18,6 @@
 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>());
@@ -30,14 +29,6 @@ void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render
 }
 
 class SecondaryCameraJob {  // Changes renderContext for our framebuffer and view.
-    QUuid _attachedEntityId{};
-    glm::vec3 _position{};
-    glm::quat _orientation{};
-    float _vFoV{};
-    float _nearClipPlaneDistance{};
-    float _farClipPlaneDistance{};
-    EntityPropertyFlags _attachedEntityPropertyFlags;
-    QSharedPointer<EntityScriptingInterface> _entityScriptingInterface;
 public:
     using Config = SecondaryCameraJobConfig;
     using JobModel = render::Job::ModelO<SecondaryCameraJob, RenderArgsPointer, Config>;
@@ -55,13 +46,15 @@ public:
         _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;
@@ -98,6 +91,18 @@ 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) {
@@ -123,16 +128,10 @@ void SecondaryCameraJobConfig::enableSecondaryCameraRenderConfigs(bool enabled)
     setEnabled(enabled);
 }
 
-void SecondaryCameraJobConfig::resetSizeSpectatorCamera(int width, int height) { // Carefully adjust the framebuffer / texture.
-    qApp->getRenderEngine()->getConfiguration()->getConfig<SecondaryCameraRenderTask>()->resetSize(width, height);
-}
-
-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 SecondaryCameraJobConfig::resetSizeSpectatorCamera(int width, int height) {
+    textureWidth = width;
+    textureHeight = height;
+    emit dirty();
 }
 
 class EndSecondaryCameraFrame {  // Restores renderContext.
diff --git a/interface/src/SecondaryCamera.h b/interface/src/SecondaryCamera.h
index 0941959c0a..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>;
@@ -37,12 +36,15 @@ class SecondaryCameraJobConfig : public render::Task::Config { // Exposes second
     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:
-    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 };
+    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();
@@ -59,9 +61,6 @@ class SecondaryCameraRenderTaskConfig : public render::Task::Config {
     Q_OBJECT
 public:
     SecondaryCameraRenderTaskConfig() : render::Task::Config(false) {}
-    void resetSize(int width, int height);
-signals:
-    void dirty();
 };
 
 class SecondaryCameraRenderTask {
diff --git a/interface/src/assets/ATPAssetMigrator.cpp b/interface/src/assets/ATPAssetMigrator.cpp
index 667c2587b0..8de40865b7 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() << "Count 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 fe5355ff2e..a47bbbad1b 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -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 bd545c64e0..5d8393ba7a 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -252,19 +252,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 +274,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);
@@ -323,6 +320,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
         // 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);
 }
@@ -476,19 +474,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()) {
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarManager*>(this), "findRayIntersection",
-                                  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 30801807d6..39a4f7a4af 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -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);
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 36295e87b8..10e2202553 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -64,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 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 = 100.0f;   // degrees/sec
 const float PITCH_SPEED_DEFAULT = 75.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;
+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
+
 float MIN_SCRIPTED_MOTOR_TIMESCALE = 0.005f;
 float DEFAULT_SCRIPTED_MOTOR_TIMESCALE = 1.0e6f;
 const int SCRIPTED_MOTOR_CAMERA_FRAME = 0;
@@ -87,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),
@@ -262,7 +234,7 @@ void MyAvatar::setDominantHand(const QString& hand) {
     }
 }
 
-void MyAvatar::registerMetaTypes(QScriptEngine* engine) {
+void MyAvatar::registerMetaTypes(ScriptEnginePointer engine) {
     QScriptValue value = engine->newQObject(this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater | QScriptEngine::ExcludeChildObjects);
     engine->globalObject().setProperty("MyAvatar", value);
 
@@ -273,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) {
@@ -344,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
@@ -397,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);
@@ -573,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);
         }
     }
@@ -585,7 +558,7 @@ void MyAvatar::simulate(float deltaTime) {
             headPosition = getPosition();
         }
         head->setPosition(headPosition);
-        head->setScale(getUniformScale());
+        head->setScale(getModelScale());
         head->simulate(deltaTime);
     }
 
@@ -611,7 +584,7 @@ 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->getNestableType() == NestableType::Entity && object->checkAndMaybeUpdateQueryAACube()) {
@@ -663,7 +636,7 @@ void MyAvatar::updateFromHMDSensorMatrix(const glm::mat4& hmdSensorMatrix) {
     }
 
     _hmdSensorPosition = newHmdSensorPosition;
-    _hmdSensorOrientation = glm::quat_cast(hmdSensorMatrix);
+    _hmdSensorOrientation = glmExtractRotation(hmdSensorMatrix);
     auto headPose = getControllerPoseInSensorFrame(controller::Action::HEAD);
     if (headPose.isValid()) {
         _headControllerFacing = getFacingDir2D(headPose.rotation);
@@ -687,9 +660,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();
@@ -938,6 +913,9 @@ void MyAvatar::saveData() {
 
     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)
@@ -998,6 +976,7 @@ void MyAvatar::saveData() {
     settings.setValue("collisionSoundURL", _collisionSoundURL);
     settings.setValue("useSnapTurn", _useSnapTurn);
     settings.setValue("clearOverlayWhenMoving", _clearOverlayWhenMoving);
+    settings.setValue("userHeight", getUserHeight());
 
     settings.endGroup();
 }
@@ -1060,6 +1039,10 @@ void MyAvatar::setEnableDebugDrawIKConstraints(bool isEnabled) {
     _enableDebugDrawIKConstraints = isEnabled;
 }
 
+void MyAvatar::setEnableDebugDrawDetailedCollision(bool isEnabled) {
+    _enableDebugDrawDetailedCollision = isEnabled;
+}
+
 void MyAvatar::setEnableDebugDrawIKChains(bool isEnabled) {
     _enableDebugDrawIKChains = isEnabled;
 }
@@ -1083,6 +1066,9 @@ void MyAvatar::loadData() {
 
     getHead()->setBasePitch(loadSetting(settings, "headPitch", 0.0f));
 
+    _yawSpeed = loadSetting(settings, "yawSpeed", _yawSpeed);
+    _pitchSpeed = loadSetting(settings, "pitchSpeed", _pitchSpeed);
+
     _prefOverrideAnimGraphUrl.set(QUrl(settings.value("animGraphURL", "").toString()));
     _fullAvatarURLFromPreferences = settings.value("fullAvatarURL", AvatarData::defaultFullAvatarModelUrl()).toUrl();
     _fullAvatarModelName = settings.value("fullAvatarModelName", DEFAULT_FULL_AVATAR_MODEL_NAME).toString();
@@ -1131,6 +1117,7 @@ void MyAvatar::loadData() {
     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));
@@ -1205,6 +1192,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
@@ -1227,15 +1223,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.
@@ -1252,14 +1247,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();
@@ -1273,7 +1273,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);
 
@@ -1305,7 +1305,7 @@ glm::vec3 MyAvatar::getDefaultEyePosition() const {
 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
@@ -1349,6 +1349,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");
@@ -1421,7 +1465,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);
@@ -1527,6 +1571,7 @@ void MyAvatar::prepareForPhysicsSimulation() {
     }
     _characterController.handleChangedCollisionGroup();
     _characterController.setParentVelocity(parentVelocity);
+    _characterController.setScaleFactor(getSensorToWorldScale());
 
     _characterController.setPositionAndOrientation(getPosition(), getOrientation());
     auto headPose = getControllerPoseInAvatarFrame(controller::Action::HEAD);
@@ -1746,11 +1791,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();
@@ -1805,6 +1850,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) {
@@ -1813,6 +1889,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;
 }
@@ -1820,7 +1907,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 {
@@ -1868,38 +1955,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());
@@ -1993,17 +2050,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;
             }
@@ -2011,7 +2068,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);
@@ -2025,22 +2082,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
@@ -2051,18 +2110,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) {
@@ -2149,6 +2196,14 @@ float MyAvatar::getDomainMaxScale() {
     return _domainMaximumScale;
 }
 
+void MyAvatar::setGravity(float gravity) {
+    _characterController.setGravity(gravity);
+}
+
+float MyAvatar::getGravity() {
+    return _characterController.getGravity();
+}
+
 void MyAvatar::increaseSize() {
     // make sure we're starting from an allowable scale
     clampTargetScaleToDomainLimits();
@@ -2215,7 +2270,8 @@ void MyAvatar::restrictScaleFromDomainSettings(const QJsonObject& domainSettings
         _targetScale = clampedScale;
     }
 
-    setScale(glm::vec3(_targetScale));
+    setModelScale(_targetScale);
+    rebuildCollisionShape();
     settings.endGroup();
 }
 
@@ -2446,6 +2502,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) {
@@ -2600,11 +2657,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:
@@ -2723,7 +2799,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.
@@ -2747,7 +2822,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;
 
@@ -2775,6 +2849,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);
     }
@@ -2799,16 +2877,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;
     }
@@ -2866,15 +2944,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;
 }
@@ -2960,9 +3043,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());
     }
 }
 
@@ -2972,9 +3055,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());
     }
 }
 
@@ -2984,9 +3067,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());
     }
 }
 
@@ -2996,9 +3079,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());
     }
 }
 
@@ -3008,9 +3091,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());
     }
 }
 
@@ -3020,9 +3103,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());
     }
 }
 
@@ -3032,9 +3115,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());
     }
 }
 
@@ -3043,9 +3126,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());
     }
 }
 
@@ -3054,9 +3137,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());
     }
 }
 
@@ -3065,9 +3148,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());
     }
 }
 
@@ -3146,3 +3229,12 @@ 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);
+    }
+}
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index dc4357be52..9620d61a49 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -19,10 +19,13 @@
 #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"
@@ -101,6 +104,8 @@ 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)
      */
 
     // FIXME: `glm::vec3 position` is not accessible from QML, so this exposes position in a QML-native type
@@ -138,10 +143,16 @@ 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)
+ 
     const QString DOMINANT_LEFT_HAND = "left";
     const QString DOMINANT_RIGHT_HAND = "right";
 
@@ -165,7 +176,7 @@ public:
     ~MyAvatar();
 
     void instantiableAvatar() override {};
-    void registerMetaTypes(QScriptEngine* engine);
+    void registerMetaTypes(ScriptEnginePointer engine);
 
     virtual void simulateAttachments(float deltaTime) override;
 
@@ -192,7 +203,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; }
@@ -390,6 +401,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;
@@ -414,13 +426,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);
 
@@ -521,6 +540,10 @@ 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;
+
 public slots:
     void increaseSize();
     void decreaseSize();
@@ -528,6 +551,9 @@ public slots:
     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(),
                       bool shouldFaceLocation = false);
@@ -553,6 +579,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);
@@ -567,6 +594,8 @@ public slots:
     glm::vec3 getPositionForAudio();
     glm::quat getOrientationForAudio();
 
+    virtual void setModelScale(float scale) override;
+
 signals:
     void audioListenerModeChanged();
     void transformChanged();
@@ -579,6 +608,7 @@ signals:
     void wentActive();
     void skeletonChanged();
     void dominantHandChanged(const QString& hand);
+    void sensorToWorldScaleChanged(float sensorToWorldScale);
 
 private:
 
@@ -699,7 +729,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.
@@ -757,6 +787,7 @@ private:
     bool _enableDebugDrawIKTargets { false };
     bool _enableDebugDrawIKConstraints { false };
     bool _enableDebugDrawIKChains { false };
+    bool _enableDebugDrawDetailedCollision { false };
 
     AudioListenerMode _audioListenerMode;
     glm::vec3 _customListenPosition;
@@ -764,8 +795,6 @@ private:
 
     AtRestDetector _hmdAtRestDetector;
     bool _lastIsMoving { false };
-    bool _hoverReferenceCameraFacingIsCaptured { false };
-    glm::vec3 _hoverReferenceCameraFacing { 0.0f, 0.0f, -1.0f }; // hmd sensor space
 
     // all poses are in sensor-frame
     std::map<controller::Action, controller::Pose> _controllerPoseMap;
@@ -792,6 +821,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/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 6d468c3f30..a707031167 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -124,17 +124,31 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
         }
     }
 
-    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);
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..a68a6fe929
--- /dev/null
+++ b/interface/src/commerce/Ledger.cpp
@@ -0,0 +1,236 @@
+//
+//  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 "AccountManager.h"
+#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, 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,
+        AccountManagerAuth::Required,
+        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, 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, 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, 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, QJsonObject());
+}
+
+// The api/failResponse is called just for the side effect of logging.
+void Ledger::updateLocationSuccess(QNetworkReply& reply) { apiResponse("reset", reply); }
+void Ledger::updateLocationFailure(QNetworkReply& reply) { failResponse("reset", reply); }
+void Ledger::updateLocation(const QString& asset_id, const QString location, const bool controlledFailure) {
+    auto wallet = DependencyManager::get<Wallet>();
+    QStringList keys = wallet->listPublicKeys();
+    QString key = keys[0];
+    QJsonObject transaction;
+    transaction["asset_id"] = asset_id;
+    transaction["location"] = location;
+    QJsonDocument transactionDoc{ transaction };
+    auto transactionString = transactionDoc.toJson(QJsonDocument::Compact);
+    signedSend("transaction", transactionString, key, "location", "updateLocationSuccess", "updateLocationFailure", controlledFailure);
+}
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
new file mode 100644
index 0000000000..da6c67224f
--- /dev/null
+++ b/interface/src/commerce/Ledger.h
@@ -0,0 +1,71 @@
+//
+//  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>
+
+
+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);
+
+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);
+
+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);
+
+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, 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..9f8847e8c7
--- /dev/null
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -0,0 +1,153 @@
+//
+//  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>
+#include "scripting/WalletScriptingInterface.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(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);
+    });
+}
+
+void QmlCommerce::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;
+    }
+}
+
+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();
+}
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
new file mode 100644
index 0000000000..8e6af6da65
--- /dev/null
+++ b/interface/src/commerce/QmlCommerce.h
@@ -0,0 +1,75 @@
+//
+//  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);
+
+    enum WalletStatus {
+        WALLET_STATUS_NOT_LOGGED_IN = 0,
+        WALLET_STATUS_NOT_SET_UP,
+        WALLET_STATUS_NOT_AUTHENTICATED,
+        WALLET_STATUS_READY
+    };
+
+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);
+
+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();
+};
+
+#endif // hifi_QmlCommerce_h
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
new file mode 100644
index 0000000000..079e3a9479
--- /dev/null
+++ b/interface/src/commerce/Wallet.cpp
@@ -0,0 +1,684 @@
+//
+//  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* 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 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& packetReceiver = nodeList->getPacketReceiver();
+
+    packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnershipPacket");
+}
+
+Wallet::~Wallet() {
+    if (_securityImage) {
+        delete _securityImage;
+    }
+}
+
+bool Wallet::setPassphrase(const QString& passphrase) {
+    if (_passphrase) {
+        delete _passphrase;
+    }
+    _passphrase = new QString(passphrase);
+
+    _publicKeys.clear();
+
+    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();
+
+    // TODO: redo this soon -- need error checking and so on
+    writeSecurityImage(_securityImage, keyFilePath());
+    emit keyFilePathIfExistsResult(getKeyFilePath());
+    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";
+                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) {
+    QString decryptedText;
+    quint64 encryptedTextSize;
+    quint64 publicKeySize;
+
+    if (verifyOwnerChallenge(packet->read(packet->readPrimitive(&encryptedTextSize)), packet->read(packet->readPrimitive(&publicKeySize)), decryptedText)) {
+        auto nodeList = DependencyManager::get<NodeList>();
+        // setup the packet
+        auto decryptedTextPacket = NLPacket::create(PacketType::ChallengeOwnership, NUM_BYTES_RFC4122_UUID + decryptedText.size(), true);
+
+        // write the decrypted text to the packet
+        decryptedTextPacket->write(decryptedText.toUtf8());
+
+        qCDebug(commerce) << "Sending ChallengeOwnership Packet containing decrypted text";
+
+        nodeList->sendPacket(std::move(decryptedTextPacket), *sendingNode);
+    } else {
+        qCDebug(commerce) << "verifyOwnerChallenge() returned false";
+    }
+}
+
+bool Wallet::verifyOwnerChallenge(const QByteArray& encryptedText, const QString& publicKey, QString& decryptedText) {
+    // I have no idea how to do this yet, so here's some dummy code that may not even work.
+    decryptedText = QString("hello");
+    return true;
+}
diff --git a/interface/src/commerce/Wallet.h b/interface/src/commerce/Wallet.h
new file mode 100644
index 0000000000..acf9f8e45e
--- /dev/null
+++ b/interface/src/commerce/Wallet.h
@@ -0,0 +1,76 @@
+//
+//  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 <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();
+
+signals:
+    void securityImageResult(bool exists);
+    void keyFilePathIfExistsResult(const QString& path);
+
+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 verifyOwnerChallenge(const QByteArray& encryptedText, const QString& publicKey, QString& decryptedText);
+};
+
+#endif // hifi_Wallet_h
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index a19055d4da..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;
@@ -144,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
@@ -216,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);
@@ -233,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..b4f0dde687
--- /dev/null
+++ b/interface/src/raypick/JointRayPick.cpp
@@ -0,0 +1,48 @@
+//
+//  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 "DependencyManager.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..3cd622fbbe
--- /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 "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..0e0f13cd6c
--- /dev/null
+++ b/interface/src/raypick/LaserPointer.cpp
@@ -0,0 +1,281 @@
+//
+//  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 "ui/overlays/Overlay.h"
+#include "avatar/AvatarManager.h"
+
+LaserPointer::LaserPointer(const QVariant& rayProps, const RenderStateMap& renderStates, const DefaultRenderStateMap& defaultRenderStates,
+        const bool faceAvatar, const bool centerEndY, const bool lockEnd, const bool enabled) :
+    _renderingEnabled(enabled),
+    _renderStates(renderStates),
+    _defaultRenderStates(defaultRenderStates),
+    _faceAvatar(faceAvatar),
+    _centerEndY(centerEndY),
+    _lockEnd(lockEnd)
+{
+    _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() {
+    DependencyManager::get<RayPickScriptingInterface>()->removeRayPick(_rayPickUID);
+
+    for (auto& renderState : _renderStates) {
+        renderState.second.deleteOverlays();
+    }
+    for (auto& renderState : _defaultRenderStates) {
+        renderState.second.second.deleteOverlays();
+    }
+}
+
+void LaserPointer::enable() {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->enableRayPick(_rayPickUID);
+    _renderingEnabled = true;
+}
+
+void LaserPointer::disable() {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->disableRayPick(_rayPickUID);
+    _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) {
+    QWriteLocker lock(getLock());
+    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) {
+    QWriteLocker lock(getLock());
+    updateRenderStateOverlay(_renderStates[state].getStartID(), startProps);
+    updateRenderStateOverlay(_renderStates[state].getPathID(), pathProps);
+    updateRenderStateOverlay(_renderStates[state].getEndID(), endProps);
+}
+
+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() {
+    QReadLocker lock(getLock());
+    return DependencyManager::get<RayPickScriptingInterface>()->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) && _objectLockEnd.first.isNull()) || type == IntersectionType::HUD) {
+        endVec = pickRay.origin + pickRay.direction * distance;
+    } else {
+        if (!_objectLockEnd.first.isNull()) {
+            glm::vec3 pos;
+            glm::quat rot;
+            glm::vec3 dim;
+            glm::vec3 registrationPoint;
+            if (_objectLockEnd.second) {
+                pos = vec3FromVariant(qApp->getOverlays().getProperty(_objectLockEnd.first, "position").value);
+                rot = quatFromVariant(qApp->getOverlays().getProperty(_objectLockEnd.first, "rotation").value);
+                dim = vec3FromVariant(qApp->getOverlays().getProperty(_objectLockEnd.first, "dimensions").value);
+                registrationPoint = glm::vec3(0.5f);
+            } else {
+                EntityItemProperties props = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(_objectLockEnd.first);
+                pos = props.getPosition();
+                rot = props.getRotation();
+                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());
+        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)));
+        if (_centerEndY) {
+            endProps.insert("position", end);
+        } else {
+            glm::vec3 dim = vec3FromVariant(qApp->getOverlays().getProperty(renderState.getEndID(), "dimensions").value);
+            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
+    QReadLocker lock(getLock());
+    RayPickResult prevRayPickResult = DependencyManager::get<RayPickScriptingInterface>()->getPrevRayPickResult(_rayPickUID);
+    if (_renderingEnabled && !_currentRenderState.empty() && _renderStates.find(_currentRenderState) != _renderStates.end() &&
+            (prevRayPickResult.type != IntersectionType::NONE || _laserLength > 0.0f || !_objectLockEnd.first.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) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setPrecisionPicking(_rayPickUID, precisionPicking);
+}
+
+void LaserPointer::setLaserLength(const float laserLength) {
+    QWriteLocker lock(getLock());
+    _laserLength = laserLength;
+}
+
+void LaserPointer::setLockEndUUID(QUuid objectID, const bool isOverlay) {
+    QWriteLocker lock(getLock());
+    _objectLockEnd = std::pair<QUuid, bool>(objectID, isOverlay);
+}
+
+void LaserPointer::setIgnoreEntities(const QScriptValue& ignoreEntities) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setIgnoreEntities(_rayPickUID, ignoreEntities);
+}
+
+void LaserPointer::setIncludeEntities(const QScriptValue& includeEntities) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setIncludeEntities(_rayPickUID, includeEntities);
+}
+
+void LaserPointer::setIgnoreOverlays(const QScriptValue& ignoreOverlays) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setIgnoreOverlays(_rayPickUID, ignoreOverlays);
+}
+
+void LaserPointer::setIncludeOverlays(const QScriptValue& includeOverlays) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setIncludeOverlays(_rayPickUID, includeOverlays);
+}
+
+void LaserPointer::setIgnoreAvatars(const QScriptValue& ignoreAvatars) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setIgnoreAvatars(_rayPickUID, ignoreAvatars);
+}
+
+void LaserPointer::setIncludeAvatars(const QScriptValue& includeAvatars) {
+    QWriteLocker lock(getLock());
+    DependencyManager::get<RayPickScriptingInterface>()->setIncludeAvatars(_rayPickUID, includeAvatars);
+}
+
+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();
+    }
+    if (!_endID.isNull()) {
+        _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);
+    }
+}
\ No newline at end of file
diff --git a/interface/src/raypick/LaserPointer.h b/interface/src/raypick/LaserPointer.h
new file mode 100644
index 0000000000..01dfe01cfd
--- /dev/null
+++ b/interface/src/raypick/LaserPointer.h
@@ -0,0 +1,102 @@
+//
+//  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 "raypick/RayPickScriptingInterface.h"
+
+class RayPickResult;
+
+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 deleteOverlays();
+
+private:
+    OverlayID _startID;
+    OverlayID _pathID;
+    OverlayID _endID;
+    bool _startIgnoreRays;
+    bool _pathIgnoreRays;
+    bool _endIgnoreRays;
+};
+
+
+class LaserPointer {
+
+public:
+
+    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 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);
+
+    void setIgnoreEntities(const QScriptValue& ignoreEntities);
+    void setIncludeEntities(const QScriptValue& includeEntities);
+    void setIgnoreOverlays(const QScriptValue& ignoreOverlays);
+    void setIncludeOverlays(const QScriptValue& includeOverlays);
+    void setIgnoreAvatars(const QScriptValue& ignoreAvatars);
+    void setIncludeAvatars(const QScriptValue& includeAvatars);
+
+    QReadWriteLock* getLock() { return &_lock; }
+
+    void update();
+
+private:
+    bool _renderingEnabled;
+    float _laserLength { 0.0f };
+    std::string _currentRenderState { "" };
+    RenderStateMap _renderStates;
+    DefaultRenderStateMap _defaultRenderStates;
+    bool _faceAvatar;
+    bool _centerEndY;
+    bool _lockEnd;
+    std::pair<QUuid, bool> _objectLockEnd { std::pair<QUuid, bool>(QUuid(), false)};
+
+    QUuid _rayPickUID;
+    QReadWriteLock _lock;
+
+    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..8615a96c3f
--- /dev/null
+++ b/interface/src/raypick/LaserPointerManager.cpp
@@ -0,0 +1,149 @@
+//
+//  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 enabled) {
+    std::shared_ptr<LaserPointer> laserPointer = std::make_shared<LaserPointer>(rayProps, renderStates, defaultRenderStates, faceAvatar, centerEndY, lockEnd, enabled);
+    if (!laserPointer->getRayUID().isNull()) {
+        QWriteLocker containsLock(&_containsLock);
+        QUuid id = QUuid::createUuid();
+        _laserPointers[id] = laserPointer;
+        return id;
+    }
+    return QUuid();
+}
+
+void LaserPointerManager::removeLaserPointer(const QUuid uid) {
+    QWriteLocker lock(&_containsLock);
+    _laserPointers.remove(uid);
+}
+
+void LaserPointerManager::enableLaserPointer(const QUuid uid) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->enable();
+    }
+}
+
+void LaserPointerManager::disableLaserPointer(const QUuid uid) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->disable();
+    }
+}
+
+void LaserPointerManager::setRenderState(QUuid uid, const std::string& renderState) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setRenderState(renderState);
+    }
+}
+
+void LaserPointerManager::editRenderState(QUuid uid, const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->editRenderState(state, startProps, pathProps, endProps);
+    }
+}
+
+const RayPickResult LaserPointerManager::getPrevRayPickResult(const QUuid uid) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        return laserPointer.value()->getPrevRayPickResult();
+    }
+    return RayPickResult();
+}
+
+void LaserPointerManager::update() {
+    QReadLocker lock(&_containsLock);
+    for (QUuid& uid : _laserPointers.keys()) {
+        auto laserPointer = _laserPointers.find(uid);
+        laserPointer.value()->update();
+    }
+}
+
+void LaserPointerManager::setPrecisionPicking(QUuid uid, const bool precisionPicking) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setPrecisionPicking(precisionPicking);
+    }
+}
+
+void LaserPointerManager::setLaserLength(QUuid uid, const float laserLength) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setLaserLength(laserLength);
+    }
+}
+
+void LaserPointerManager::setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setIgnoreEntities(ignoreEntities);
+    }
+}
+
+void LaserPointerManager::setIncludeEntities(QUuid uid, const QScriptValue& includeEntities) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setIncludeEntities(includeEntities);
+    }
+}
+
+void LaserPointerManager::setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setIgnoreOverlays(ignoreOverlays);
+    }
+}
+
+void LaserPointerManager::setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setIncludeOverlays(includeOverlays);
+    }
+}
+
+void LaserPointerManager::setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setIgnoreAvatars(ignoreAvatars);
+    }
+}
+
+void LaserPointerManager::setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setIncludeAvatars(includeAvatars);
+    }
+}
+
+void LaserPointerManager::setLockEndUUID(QUuid uid, QUuid objectID, const bool isOverlay) {
+    QReadLocker lock(&_containsLock);
+    auto laserPointer = _laserPointers.find(uid);
+    if (laserPointer != _laserPointers.end()) {
+        laserPointer.value()->setLockEndUUID(objectID, isOverlay);
+    }
+}
diff --git a/interface/src/raypick/LaserPointerManager.h b/interface/src/raypick/LaserPointerManager.h
new file mode 100644
index 0000000000..b841877578
--- /dev/null
+++ b/interface/src/raypick/LaserPointerManager.h
@@ -0,0 +1,52 @@
+//
+//  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 "LaserPointer.h"
+
+class RayPickResult;
+
+class LaserPointerManager {
+
+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 enabled);
+    void removeLaserPointer(const QUuid uid);
+    void enableLaserPointer(const QUuid uid);
+    void disableLaserPointer(const QUuid uid);
+    void setRenderState(QUuid uid, const std::string& renderState);
+    void editRenderState(QUuid uid, const std::string& state, const QVariant& startProps, const QVariant& pathProps, const QVariant& endProps);
+    const RayPickResult getPrevRayPickResult(const QUuid uid);
+
+    void setPrecisionPicking(QUuid uid, const bool precisionPicking);
+    void setLaserLength(QUuid uid, const float laserLength);
+    void setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities);
+    void setIncludeEntities(QUuid uid, const QScriptValue& includeEntities);
+    void setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays);
+    void setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays);
+    void setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars);
+    void setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars);
+
+    void setLockEndUUID(QUuid uid, QUuid objectID, const bool isOverlay);
+
+    void update();
+
+private:
+    QHash<QUuid, std::shared_ptr<LaserPointer>> _laserPointers;
+    QReadWriteLock _containsLock;
+
+};
+
+#endif // hifi_LaserPointerManager_h
diff --git a/interface/src/raypick/LaserPointerScriptingInterface.cpp b/interface/src/raypick/LaserPointerScriptingInterface.cpp
new file mode 100644
index 0000000000..d5e435f490
--- /dev/null
+++ b/interface/src/raypick/LaserPointerScriptingInterface.cpp
@@ -0,0 +1,123 @@
+//
+//  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 <QVariant>
+#include "GLMHelpers.h"
+
+QUuid LaserPointerScriptingInterface::createLaserPointer(const QVariant& properties) {
+    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 enabled = false;
+    if (propertyMap["enabled"].isValid()) {
+        enabled = propertyMap["enabled"].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, enabled);
+}
+
+void LaserPointerScriptingInterface::editRenderState(QUuid uid, const QString& renderState, const QVariant& properties) {
+    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);
+}
+
+const 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..2f6da87b5f
--- /dev/null
+++ b/interface/src/raypick/LaserPointerScriptingInterface.h
@@ -0,0 +1,49 @@
+//
+//  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);
+    Q_INVOKABLE void enableLaserPointer(QUuid uid) { qApp->getLaserPointerManager().enableLaserPointer(uid); }
+    Q_INVOKABLE void disableLaserPointer(QUuid uid) { qApp->getLaserPointerManager().disableLaserPointer(uid); }
+    Q_INVOKABLE void removeLaserPointer(QUuid uid) { qApp->getLaserPointerManager().removeLaserPointer(uid); }
+    Q_INVOKABLE void editRenderState(QUuid uid, const QString& renderState, const QVariant& properties);
+    Q_INVOKABLE void setRenderState(QUuid uid, const QString& renderState) { qApp->getLaserPointerManager().setRenderState(uid, renderState.toStdString()); }
+    Q_INVOKABLE RayPickResult getPrevRayPickResult(QUuid uid) { return qApp->getLaserPointerManager().getPrevRayPickResult(uid); }
+
+    Q_INVOKABLE void setPrecisionPicking(QUuid uid, const bool precisionPicking) { qApp->getLaserPointerManager().setPrecisionPicking(uid, precisionPicking); }
+    Q_INVOKABLE void setLaserLength(QUuid uid, const float laserLength) { qApp->getLaserPointerManager().setLaserLength(uid, laserLength); }
+    Q_INVOKABLE void setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities) { qApp->getLaserPointerManager().setIgnoreEntities(uid, ignoreEntities); }
+    Q_INVOKABLE void setIncludeEntities(QUuid uid, const QScriptValue& includeEntities) { qApp->getLaserPointerManager().setIncludeEntities(uid, includeEntities); }
+    Q_INVOKABLE void setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays) { qApp->getLaserPointerManager().setIgnoreOverlays(uid, ignoreOverlays); }
+    Q_INVOKABLE void setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays) { qApp->getLaserPointerManager().setIncludeOverlays(uid, includeOverlays); }
+    Q_INVOKABLE void setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars) { qApp->getLaserPointerManager().setIgnoreAvatars(uid, ignoreAvatars); }
+    Q_INVOKABLE void setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars) { qApp->getLaserPointerManager().setIncludeAvatars(uid, includeAvatars); }
+
+    Q_INVOKABLE void setLockEndUUID(QUuid uid, QUuid objectID, const bool isOverlay) { qApp->getLaserPointerManager().setLockEndUUID(uid, objectID, isOverlay); }
+
+private:
+    const 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..848a5de336
--- /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 "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/RayPick.cpp b/interface/src/raypick/RayPick.cpp
new file mode 100644
index 0000000000..a5b1299210
--- /dev/null
+++ b/interface/src/raypick/RayPick.cpp
@@ -0,0 +1,62 @@
+//
+//  RayPick.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 "RayPick.h"
+
+RayPick::RayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled) :
+    _filter(filter),
+    _maxDistance(maxDistance),
+    _enabled(enabled)
+{
+}
+void RayPick::enable() {
+    QWriteLocker lock(getLock());
+    _enabled = true;
+}
+
+void RayPick::disable() {
+    QWriteLocker lock(getLock());
+    _enabled = false;
+}
+
+const RayPickResult& RayPick::getPrevRayPickResult() {
+    QReadLocker lock(getLock());
+    return _prevResult;
+}
+
+void RayPick::setIgnoreEntities(const QScriptValue& ignoreEntities) {
+    QWriteLocker lock(getLock());
+    _ignoreEntities = qVectorEntityItemIDFromScriptValue(ignoreEntities);
+}
+
+void RayPick::setIncludeEntities(const QScriptValue& includeEntities) {
+    QWriteLocker lock(getLock());
+    _includeEntities = qVectorEntityItemIDFromScriptValue(includeEntities);
+}
+
+void RayPick::setIgnoreOverlays(const QScriptValue& ignoreOverlays) {
+    QWriteLocker lock(getLock());
+    _ignoreOverlays = qVectorOverlayIDFromScriptValue(ignoreOverlays);
+}
+
+void RayPick::setIncludeOverlays(const QScriptValue& includeOverlays) {
+    QWriteLocker lock(getLock());
+    _includeOverlays = qVectorOverlayIDFromScriptValue(includeOverlays);
+}
+
+void RayPick::setIgnoreAvatars(const QScriptValue& ignoreAvatars) {
+    QWriteLocker lock(getLock());
+    _ignoreAvatars = qVectorEntityItemIDFromScriptValue(ignoreAvatars);
+}
+
+void RayPick::setIncludeAvatars(const QScriptValue& includeAvatars) {
+    QWriteLocker lock(getLock());
+    _includeAvatars = qVectorEntityItemIDFromScriptValue(includeAvatars);
+}
\ No newline at end of file
diff --git a/interface/src/raypick/RayPick.h b/interface/src/raypick/RayPick.h
new file mode 100644
index 0000000000..6dacc084b4
--- /dev/null
+++ b/interface/src/raypick/RayPick.h
@@ -0,0 +1,149 @@
+//
+//  RayPick.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_RayPick_h
+#define hifi_RayPick_h
+
+#include <stdint.h>
+#include "RegisteredMetaTypes.h"
+
+#include "EntityItemID.h"
+#include "ui/overlays/Overlay.h"
+#include <QReadWriteLock>
+
+class RayPickFilter {
+public:
+    enum FlagBit {
+        PICK_NOTHING = 0,
+        PICK_ENTITIES,
+        PICK_OVERLAYS,
+        PICK_AVATARS,
+        PICK_HUD,
+
+        PICK_COURSE, // 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() : _flags(getBitMask(PICK_NOTHING)) {}
+    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[PICK_NOTHING]; }
+    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 doesPickCourse() const { return _flags[PICK_COURSE]; }
+    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 (doesPickCourse()) {
+            toReturn |= getBitMask(PICK_COURSE);
+        }
+        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 (doesPickCourse()) {
+            toReturn |= getBitMask(PICK_COURSE);
+        }
+        return Flags(toReturn);
+    }
+    Flags getAvatarFlags() const { return Flags(getBitMask(PICK_AVATARS)); }
+    Flags getHUDFlags() const { return Flags(getBitMask(PICK_HUD)); }
+
+    static unsigned int getBitMask(FlagBit bit) { return 1 << bit; }
+
+};
+
+class RayPick {
+
+public:
+    RayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled);
+
+    virtual const PickRay getPickRay(bool& valid) const = 0;
+
+    void enable();
+    void disable();
+
+    const RayPickFilter& getFilter() { return _filter; }
+    float getMaxDistance() { return _maxDistance; }
+    bool isEnabled() { return _enabled; }
+    const RayPickResult& getPrevRayPickResult();
+
+    void setPrecisionPicking(bool precisionPicking) { _filter.setFlag(RayPickFilter::PICK_COURSE, !precisionPicking); }
+
+    void setRayPickResult(const RayPickResult& rayPickResult) { _prevResult = rayPickResult; }
+
+    const QVector<EntityItemID>& getIgnoreEntites() { return _ignoreEntities; }
+    const QVector<EntityItemID>& getIncludeEntites() { return _includeEntities; }
+    const QVector<OverlayID>& getIgnoreOverlays() { return _ignoreOverlays; }
+    const QVector<OverlayID>& getIncludeOverlays() { return _includeOverlays; }
+    const QVector<EntityItemID>& getIgnoreAvatars() { return _ignoreAvatars; }
+    const QVector<EntityItemID>& getIncludeAvatars() { return _includeAvatars; }
+    void setIgnoreEntities(const QScriptValue& ignoreEntities);
+    void setIncludeEntities(const QScriptValue& includeEntities);
+    void setIgnoreOverlays(const QScriptValue& ignoreOverlays);
+    void setIncludeOverlays(const QScriptValue& includeOverlays);
+    void setIgnoreAvatars(const QScriptValue& ignoreAvatars);
+    void setIncludeAvatars(const QScriptValue& includeAvatars);
+
+    QReadWriteLock* getLock() { return &_lock; }
+
+private:
+    RayPickFilter _filter;
+    float _maxDistance;
+    bool _enabled;
+    RayPickResult _prevResult;
+
+    QVector<EntityItemID> _ignoreEntities;
+    QVector<EntityItemID> _includeEntities;
+    QVector<OverlayID> _ignoreOverlays;
+    QVector<OverlayID> _includeOverlays;
+    QVector<EntityItemID> _ignoreAvatars;
+    QVector<EntityItemID> _includeAvatars;
+
+    QReadWriteLock _lock;
+};
+
+#endif // hifi_RayPick_h
diff --git a/interface/src/raypick/RayPickManager.cpp b/interface/src/raypick/RayPickManager.cpp
new file mode 100644
index 0000000000..1728ecd01a
--- /dev/null
+++ b/interface/src/raypick/RayPickManager.cpp
@@ -0,0 +1,231 @@
+//
+//  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 "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 "StaticRayPick.h"
+#include "MouseRayPick.h"
+
+bool RayPickManager::checkAndCompareCachedResults(QPair<glm::vec3, glm::vec3>& ray, RayPickCache& cache, RayPickResult& res, const RayPickFilter::Flags& mask) {
+    if (cache.contains(ray) && cache[ray].find(mask) != cache[ray].end()) {
+        if (cache[ray][mask].distance < res.distance) {
+            res = cache[ray][mask];
+        }
+        return true;
+    }
+    return false;
+}
+
+void RayPickManager::cacheResult(const bool intersects, const RayPickResult& resTemp, const RayPickFilter::Flags& mask, RayPickResult& res, QPair<glm::vec3, glm::vec3>& ray, RayPickCache& cache) {
+    if (intersects) {
+        cache[ray][mask] = resTemp;
+        if (resTemp.distance < res.distance) {
+            res = resTemp;
+        }
+    } else {
+        cache[ray][mask] = RayPickResult(res.searchRay);
+    }
+}
+
+void RayPickManager::update() {
+    QReadLocker lock(&_containsLock);
+    RayPickCache results;
+    for (auto& uid : _rayPicks.keys()) {
+        std::shared_ptr<RayPick> rayPick = _rayPicks[uid];
+        QWriteLocker lock(rayPick->getLock());
+        if (!rayPick->isEnabled() || rayPick->getFilter().doesPickNothing() || rayPick->getMaxDistance() < 0.0f) {
+            continue;
+        }
+
+        bool valid;
+        PickRay 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();
+            RayPickFilter::Flags entityMask = rayPick->getFilter().getEntityFlags();
+            if (!checkAndCompareCachedResults(rayKey, results, res, entityMask)) {
+                entityRes = DependencyManager::get<EntityScriptingInterface>()->findRayIntersectionVector(ray, !rayPick->getFilter().doesPickCourse(),
+                    rayPick->getIncludeEntites(), rayPick->getIgnoreEntites(), !invisible, !nonCollidable);
+                fromCache = false;
+            }
+
+            if (!fromCache) {
+                cacheResult(entityRes.intersects, RayPickResult(IntersectionType::ENTITY, entityRes.entityID, entityRes.distance, entityRes.intersection, ray, entityRes.surfaceNormal),
+                    entityMask, res, rayKey, results);
+            }
+        }
+
+        if (rayPick->getFilter().doesPickOverlays()) {
+            RayToOverlayIntersectionResult overlayRes;
+            bool fromCache = true;
+            bool invisible = rayPick->getFilter().doesPickInvisible();
+            bool nonCollidable = rayPick->getFilter().doesPickNonCollidable();
+            RayPickFilter::Flags overlayMask = rayPick->getFilter().getOverlayFlags();
+            if (!checkAndCompareCachedResults(rayKey, results, res, overlayMask)) {
+                overlayRes = qApp->getOverlays().findRayIntersectionVector(ray, !rayPick->getFilter().doesPickCourse(),
+                    rayPick->getIncludeOverlays(), rayPick->getIgnoreOverlays(), !invisible, !nonCollidable);
+                fromCache = false;
+            }
+
+            if (!fromCache) {
+                cacheResult(overlayRes.intersects, RayPickResult(IntersectionType::OVERLAY, overlayRes.overlayID, overlayRes.distance, overlayRes.intersection, ray, overlayRes.surfaceNormal),
+                    overlayMask, res, rayKey, results);
+            }
+        }
+
+        if (rayPick->getFilter().doesPickAvatars()) {
+            RayPickFilter::Flags avatarMask = rayPick->getFilter().getAvatarFlags();
+            if (!checkAndCompareCachedResults(rayKey, results, res, avatarMask)) {
+                RayToAvatarIntersectionResult avatarRes = DependencyManager::get<AvatarManager>()->findRayIntersectionVector(ray, rayPick->getIncludeAvatars(), rayPick->getIgnoreAvatars());
+                cacheResult(avatarRes.intersects, RayPickResult(IntersectionType::AVATAR, avatarRes.avatarID, avatarRes.distance, avatarRes.intersection, ray), avatarMask, res, rayKey, results);
+            }
+        }
+
+        // Can't intersect with HUD in desktop mode
+        if (rayPick->getFilter().doesPickHUD() && DependencyManager::get<HMDScriptingInterface>()->isHMDMode()) {
+            RayPickFilter::Flags hudMask = rayPick->getFilter().getHUDFlags();
+            if (!checkAndCompareCachedResults(rayKey, results, res, hudMask)) {
+                glm::vec3 hudRes = DependencyManager::get<HMDScriptingInterface>()->calculateRayUICollisionPoint(ray.origin, ray.direction);
+                cacheResult(true, RayPickResult(IntersectionType::HUD, 0, glm::distance(ray.origin, hudRes), hudRes, ray), hudMask, 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, const float maxDistance, const bool enabled) {
+    QWriteLocker lock(&_containsLock);
+    QUuid id = QUuid::createUuid();
+    _rayPicks[id] = std::make_shared<JointRayPick>(jointName, posOffset, dirOffset, filter, maxDistance, enabled);
+    return id;
+}
+
+QUuid RayPickManager::createRayPick(const RayPickFilter& filter, const float maxDistance, const bool enabled) {
+    QWriteLocker lock(&_containsLock);
+    QUuid id = QUuid::createUuid();
+    _rayPicks[id] = std::make_shared<MouseRayPick>(filter, maxDistance, enabled);
+    return id;
+}
+
+QUuid RayPickManager::createRayPick(const glm::vec3& position, const glm::vec3& direction, const RayPickFilter& filter, const float maxDistance, const bool enabled) {
+    QWriteLocker lock(&_containsLock);
+    QUuid id = QUuid::createUuid();
+    _rayPicks[id] = std::make_shared<StaticRayPick>(position, direction, filter, maxDistance, enabled);
+    return id;
+}
+
+void RayPickManager::removeRayPick(const QUuid uid) {
+    QWriteLocker lock(&_containsLock);
+    _rayPicks.remove(uid);
+}
+
+void RayPickManager::enableRayPick(const QUuid uid) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->enable();
+    }
+}
+
+void RayPickManager::disableRayPick(const QUuid uid) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->disable();
+    }
+}
+
+const RayPickResult RayPickManager::getPrevRayPickResult(const QUuid uid) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        return rayPick.value()->getPrevRayPickResult();
+    }
+    return RayPickResult();
+}
+
+void RayPickManager::setPrecisionPicking(QUuid uid, const bool precisionPicking) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setPrecisionPicking(precisionPicking);
+    }
+}
+
+void RayPickManager::setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setIgnoreEntities(ignoreEntities);
+    }
+}
+
+void RayPickManager::setIncludeEntities(QUuid uid, const QScriptValue& includeEntities) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setIncludeEntities(includeEntities);
+    }
+}
+
+void RayPickManager::setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setIgnoreOverlays(ignoreOverlays);
+    }
+}
+
+void RayPickManager::setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setIncludeOverlays(includeOverlays);
+    }
+}
+
+void RayPickManager::setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setIgnoreAvatars(ignoreAvatars);
+    }
+}
+
+void RayPickManager::setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars) {
+    QReadLocker containsLock(&_containsLock);
+    auto rayPick = _rayPicks.find(uid);
+    if (rayPick != _rayPicks.end()) {
+        rayPick.value()->setIncludeAvatars(includeAvatars);
+    }
+}
\ No newline at end of file
diff --git a/interface/src/raypick/RayPickManager.h b/interface/src/raypick/RayPickManager.h
new file mode 100644
index 0000000000..974022eb4d
--- /dev/null
+++ b/interface/src/raypick/RayPickManager.h
@@ -0,0 +1,58 @@
+//
+//  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 "RayPick.h"
+
+#include <memory>
+#include <QtCore/QObject>
+
+#include "RegisteredMetaTypes.h"
+
+#include <unordered_map>
+#include <queue>
+
+class RayPickResult;
+
+class RayPickManager {
+
+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);
+    void disableRayPick(const QUuid uid);
+    const RayPickResult getPrevRayPickResult(const QUuid uid);
+
+    void setPrecisionPicking(QUuid uid, const bool precisionPicking);
+    void setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities);
+    void setIncludeEntities(QUuid uid, const QScriptValue& includeEntities);
+    void setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays);
+    void setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays);
+    void setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars);
+    void setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars);
+
+private:
+    QHash<QUuid, std::shared_ptr<RayPick>> _rayPicks;
+    QReadWriteLock _containsLock;
+
+    typedef QHash<QPair<glm::vec3, glm::vec3>, std::unordered_map<RayPickFilter::Flags, 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 RayPickFilter::Flags& mask);
+    void cacheResult(const bool intersects, const RayPickResult& resTemp, const RayPickFilter::Flags& mask, 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..cb2b3e4471
--- /dev/null
+++ b/interface/src/raypick/RayPickScriptingInterface.cpp
@@ -0,0 +1,111 @@
+//
+//  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(QUuid uid) {
+    qApp->getRayPickManager().enableRayPick(uid);
+}
+
+void RayPickScriptingInterface::disableRayPick(QUuid uid) {
+    qApp->getRayPickManager().disableRayPick(uid);
+}
+
+void RayPickScriptingInterface::removeRayPick(QUuid uid) {
+    qApp->getRayPickManager().removeRayPick(uid);
+}
+
+RayPickResult RayPickScriptingInterface::getPrevRayPickResult(QUuid uid) {
+    return qApp->getRayPickManager().getPrevRayPickResult(uid);
+}
+
+void RayPickScriptingInterface::setPrecisionPicking(QUuid uid, const bool precisionPicking) {
+    qApp->getRayPickManager().setPrecisionPicking(uid, precisionPicking);
+}
+
+void RayPickScriptingInterface::setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities) {
+    qApp->getRayPickManager().setIgnoreEntities(uid, ignoreEntities);
+}
+
+void RayPickScriptingInterface::setIncludeEntities(QUuid uid, const QScriptValue& includeEntities) {
+    qApp->getRayPickManager().setIncludeEntities(uid, includeEntities);
+}
+
+void RayPickScriptingInterface::setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays) {
+    qApp->getRayPickManager().setIgnoreOverlays(uid, ignoreOverlays);
+}
+
+void RayPickScriptingInterface::setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays) {
+    qApp->getRayPickManager().setIncludeOverlays(uid, includeOverlays);
+}
+
+void RayPickScriptingInterface::setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars) {
+    qApp->getRayPickManager().setIgnoreAvatars(uid, ignoreAvatars);
+}
+
+void RayPickScriptingInterface::setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars) {
+    qApp->getRayPickManager().setIncludeAvatars(uid, includeAvatars);
+}
diff --git a/interface/src/raypick/RayPickScriptingInterface.h b/interface/src/raypick/RayPickScriptingInterface.h
new file mode 100644
index 0000000000..f7ed2e6fa6
--- /dev/null
+++ b/interface/src/raypick/RayPickScriptingInterface.h
@@ -0,0 +1,70 @@
+//
+//  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 "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_COURSE READ PICK_COURSE 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(QUuid uid);
+    Q_INVOKABLE void disableRayPick(QUuid uid);
+    Q_INVOKABLE void removeRayPick(QUuid uid);
+    Q_INVOKABLE RayPickResult getPrevRayPickResult(QUuid uid);
+
+    Q_INVOKABLE void setPrecisionPicking(QUuid uid, const bool precisionPicking);
+    Q_INVOKABLE void setIgnoreEntities(QUuid uid, const QScriptValue& ignoreEntities);
+    Q_INVOKABLE void setIncludeEntities(QUuid uid, const QScriptValue& includeEntities);
+    Q_INVOKABLE void setIgnoreOverlays(QUuid uid, const QScriptValue& ignoreOverlays);
+    Q_INVOKABLE void setIncludeOverlays(QUuid uid, const QScriptValue& includeOverlays);
+    Q_INVOKABLE void setIgnoreAvatars(QUuid uid, const QScriptValue& ignoreAvatars);
+    Q_INVOKABLE void setIncludeAvatars(QUuid uid, const QScriptValue& includeAvatars);
+
+    unsigned int PICK_NOTHING() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_NOTHING); }
+    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_COURSE() { return RayPickFilter::getBitMask(RayPickFilter::FlagBit::PICK_COURSE); }
+    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/raypick/StaticRayPick.cpp b/interface/src/raypick/StaticRayPick.cpp
new file mode 100644
index 0000000000..89bcddb3df
--- /dev/null
+++ b/interface/src/raypick/StaticRayPick.cpp
@@ -0,0 +1,22 @@
+//
+//  StaticRayPick.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 "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/interface/src/raypick/StaticRayPick.h b/interface/src/raypick/StaticRayPick.h
new file mode 100644
index 0000000000..fc09ee6a27
--- /dev/null
+++ b/interface/src/raypick/StaticRayPick.h
@@ -0,0 +1,28 @@
+//
+//  StaticRayPick.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_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/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..4f87e02dce 100644
--- a/interface/src/scripting/AccountScriptingInterface.h
+++ b/interface/src/scripting/AccountScriptingInterface.h
@@ -18,6 +18,7 @@ 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
@@ -32,6 +33,7 @@ signals:
      * @return {Signal}
      */
     void usernameChanged();
+    void loggedInChanged(bool loggedIn);
 
 public slots:
     static AccountScriptingInterface* getInstance();
@@ -50,6 +52,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..5308be59bf 100644
--- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp
+++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp
@@ -19,20 +19,12 @@
 #include <AssetUpload.h>
 #include <MappingRequest.h>
 #include <NetworkLogging.h>
+#include <NodeList.h>
 #include <OffscreenUi.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);
@@ -154,7 +146,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 +166,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 +176,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 +233,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 +262,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 +338,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 9719c23885..f9c1a95fb5 100644
--- a/interface/src/scripting/Audio.cpp
+++ b/interface/src/scripting/Audio.cpp
@@ -135,10 +135,10 @@ void Audio::setReverbOptions(const AudioEffectOptions* options) {
     DependencyManager::get<AudioClient>()->setReverbOptions(options);
 }
 
-void Audio::setInputDevice(const QAudioDeviceInfo& device) {
-    _devices.chooseInputDevice(device);
+void Audio::setInputDevice(const QAudioDeviceInfo& device, bool isHMD) {
+    _devices.chooseInputDevice(device, isHMD);
 }
 
-void Audio::setOutputDevice(const QAudioDeviceInfo& device) {
-    _devices.chooseOutputDevice(device);
+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 bd40de4303..abd2312cf0 100644
--- a/interface/src/scripting/Audio.h
+++ b/interface/src/scripting/Audio.h
@@ -50,8 +50,8 @@ public:
     void showMicMeter(bool show);
     void setInputVolume(float volume);
 
-    Q_INVOKABLE void setInputDevice(const QAudioDeviceInfo& device);
-    Q_INVOKABLE void setOutputDevice(const QAudioDeviceInfo& device);
+    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);
 
diff --git a/interface/src/scripting/AudioDevices.cpp b/interface/src/scripting/AudioDevices.cpp
index f2e6dbf4d7..a130b46877 100644
--- a/interface/src/scripting/AudioDevices.cpp
+++ b/interface/src/scripting/AudioDevices.cpp
@@ -37,6 +37,22 @@ Setting::Handle<QString>& getSetting(bool contextIsHMD, QAudio::Mode mode) {
     }
 }
 
+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);
@@ -52,29 +68,85 @@ static QString getTargetDevice(bool hmd, QAudio::Mode mode) {
     return deviceName;
 }
 
-QHash<int, QByteArray> AudioDeviceList::_roles {
-    { Qt::DisplayRole, "display" },
-    { Qt::CheckStateRole, "selected" },
-    { Qt::UserRole, "info" }
-};
 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;
-    } else if (role == Qt::UserRole) {
-        return QVariant::fromValue<QAudioDeviceInfo>(_devices.at(index.row()).info);
+    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();
     }
 }
 
+QVariant AudioInputDeviceList::data(const QModelIndex& index, int role) const {
+    if (!index.isValid() || index.row() >= rowCount()) {
+        return QVariant();
+    }
+
+    if (role == PeakRole) {
+        return std::static_pointer_cast<AudioInputDevice>(_devices.at(index.row()))->peak;
+    } else {
+        return AudioDeviceList::data(index, role);
+    }
+}
+
 void AudioDeviceList::resetDevice(bool contextIsHMD) {
     auto client = DependencyManager::get<AudioClient>().data();
     QString deviceName = getTargetDevice(contextIsHMD, _mode);
@@ -109,64 +181,116 @@ void AudioDeviceList::resetDevice(bool contextIsHMD) {
 #endif
 }
 
-void AudioDeviceList::onDeviceChanged(const QAudioDeviceInfo& device) {
-    auto oldDevice = _selectedDevice;
-    _selectedDevice = device;
+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;
+        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));
+    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) {
     _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();
@@ -202,42 +326,94 @@ void AudioDevices::onDeviceSelected(QAudio::Mode mode, const QAudioDeviceInfo& d
 void AudioDevices::onDeviceChanged(QAudio::Mode mode, const QAudioDeviceInfo& device) {
     if (mode == QAudio::AudioInput) {
         if (_requestedInputDevice == device) {
-            onDeviceSelected(QAudio::AudioInput, device, _inputs._selectedDevice);
+            onDeviceSelected(QAudio::AudioInput, device,
+                             _contextIsHMD ? _inputs._selectedHMDDevice : _inputs._selectedDesktopDevice,
+                             _contextIsHMD);
             _requestedInputDevice = QAudioDeviceInfo();
         }
-        _inputs.onDeviceChanged(device);
+        _inputs.onDeviceChanged(device, _contextIsHMD);
     } else { // if (mode == QAudio::AudioOutput)
         if (_requestedOutputDevice == device) {
-            onDeviceSelected(QAudio::AudioOutput, device, _outputs._selectedDevice);
+            onDeviceSelected(QAudio::AudioOutput, device,
+                             _contextIsHMD ? _outputs._selectedHMDDevice : _outputs._selectedDesktopDevice,
+                             _contextIsHMD);
             _requestedOutputDevice = QAudioDeviceInfo();
         }
-        _outputs.onDeviceChanged(device);
+        _outputs.onDeviceChanged(device, _contextIsHMD);
     }
 }
 
 void AudioDevices::onDevicesChanged(QAudio::Mode mode, const QList<QAudioDeviceInfo>& devices) {
     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);
+        _inputs.onDevicesChanged(devices, _contextIsHMD);
+        _inputs.onDevicesChanged(devices, !_contextIsHMD);
     } else { // if (mode == QAudio::AudioOutput)
-        _outputs.onDevicesChanged(devices);
+        _outputs.onDevicesChanged(devices, _contextIsHMD);
+        _outputs.onDevicesChanged(devices, !_contextIsHMD);
     }
-    std::call_once(once, [&] { onContextChanged(QString()); });
 }
 
 
-void AudioDevices::chooseInputDevice(const QAudioDeviceInfo& device) {
-    auto client = DependencyManager::get<AudioClient>();
-    _requestedInputDevice = device;
-    QMetaObject::invokeMethod(client.data(), "switchAudioDevice",
-        Q_ARG(QAudio::Mode, QAudio::AudioInput),
-        Q_ARG(const QAudioDeviceInfo&, device));
+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) {
-    auto client = DependencyManager::get<AudioClient>();
-    _requestedOutputDevice = device;
-    QMetaObject::invokeMethod(client.data(), "switchAudioDevice",
-        Q_ARG(QAudio::Mode, QAudio::AudioOutput),
-        Q_ARG(const QAudioDeviceInfo&, device));
+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 3278a53374..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; }
@@ -44,48 +52,91 @@ public:
 signals:
     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;
 
     static QHash<int, QByteArray> _roles;
     static Qt::ItemFlags _flags;
     const QAudio::Mode _mode;
-    QAudioDeviceInfo _selectedDevice;
-    QList<AudioDevice> _devices;
+    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);
-    void chooseInputDevice(const QAudioDeviceInfo& device);
-    void chooseOutputDevice(const QAudioDeviceInfo& device);
+    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;
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 35f2e2aa86..39d3164f1f 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -82,6 +82,22 @@ bool HMDScriptingInterface::shouldShowHandControllers() const {
     return _showHandControllersCount > 0;
 }
 
+void HMDScriptingInterface::activateHMDHandMouse() {
+    QWriteLocker lock(&_hmdHandMouseLock);
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
+    offscreenUi->getDesktop()->setProperty("hmdHandMouseActive", true);
+    _hmdHandMouseCount++;
+}
+
+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;
 }
@@ -135,7 +151,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();
 }
@@ -153,50 +169,6 @@ QString HMDScriptingInterface::preferredAudioOutput() const {
     return qApp->getActiveDisplayPlugin()->getPreferredAudioOutDevice();
 }
 
-bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) {
-    if (QThread::currentThread() != thread()) {
-        bool result;
-        BLOCKING_INVOKE_METHOD(this, "setHandLasers", Q_RETURN_ARG(bool, result), 
-            Q_ARG(int, hands), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction));
-        return result;
-    }
-
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    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) {
-    if (QThread::currentThread() != thread()) {
-        bool result;
-        BLOCKING_INVOKE_METHOD(this, "setExtraLaser", Q_RETURN_ARG(bool, result), 
-            Q_ARG(glm::vec3, worldStart), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction));
-        return result;
-    }
-
-    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    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() {
-    setExtraLaser(vec3(0), false, vec4(0), vec3(0));
-}
-
-void HMDScriptingInterface::disableHandLasers(int hands) {
-    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 3ed7db0232..2eefe6ea22 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
@@ -51,12 +52,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);
-    Q_INVOKABLE void disableHandLasers(int hands);
-
-    Q_INVOKABLE bool setExtraLaser(const glm::vec3& worldStart, bool enabled, const glm::vec4& color, const glm::vec3& direction);
-    Q_INVOKABLE void disableExtraLaser();
-
+    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
@@ -119,6 +116,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/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..808396c901
--- /dev/null
+++ b/interface/src/scripting/SelectionScriptingInterface.cpp
@@ -0,0 +1,195 @@
+//
+//  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;
+}
+
+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..d1a372c5c4
--- /dev/null
+++ b/interface/src/scripting/SelectionScriptingInterface.h
@@ -0,0 +1,91 @@
+
+//  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);
+
+    Q_INVOKABLE void printList(const QString& listName);
+    Q_INVOKABLE bool removeListFromMap(const QString& listName);
+
+    Q_INVOKABLE bool addToSelectedItemsList(const QString& listName, const QString& itemType, const QUuid& id);
+    Q_INVOKABLE bool removeFromSelectedItemsList(const QString& listName, const QString& itemType, const QUuid& id);
+
+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/WalletScriptingInterface.cpp b/interface/src/scripting/WalletScriptingInterface.cpp
new file mode 100644
index 0000000000..555e9477b0
--- /dev/null
+++ b/interface/src/scripting/WalletScriptingInterface.cpp
@@ -0,0 +1,47 @@
+//
+//  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() {
+}
+
+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..31b42094cf
--- /dev/null
+++ b/interface/src/scripting/WalletScriptingInterface.h
@@ -0,0 +1,51 @@
+
+//  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"
+
+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 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();
+
+private:
+    uint _walletStatus;
+};
+
+#endif // hifi_WalletScriptingInterface_h
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 84f4cbbbd8..c99e190d12 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -59,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.");
         }
     });
 
@@ -103,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'
@@ -123,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;
@@ -160,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 {
@@ -191,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`
@@ -213,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
@@ -235,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
@@ -260,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();
 }
@@ -294,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);
 }
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index f8ed20f42f..61aaec7bea 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -51,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);
@@ -87,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..d7b59ba912 100644
--- a/interface/src/ui/AddressBarDialog.cpp
+++ b/interface/src/ui/AddressBarDialog.cpp
@@ -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/JSConsole.cpp b/interface/src/ui/JSConsole.cpp
index 8c1ff87d13..c5f8b54ebd 100644
--- a/interface/src/ui/JSConsole.cpp
+++ b/interface/src/ui/JSConsole.cpp
@@ -61,7 +61,7 @@ void _writeLines(const QString& filename, const QList<QString>& lines) {
     QTextStream(&file) << json;
 }
 
-JSConsole::JSConsole(QWidget* parent, const QSharedPointer<ScriptEngine>& scriptEngine) :
+JSConsole::JSConsole(QWidget* parent, const ScriptEnginePointer& scriptEngine) :
     QWidget(parent),
     _ui(new Ui::Console),
     _currentCommandInHistory(NO_CURRENT_HISTORY_COMMAND),
@@ -97,7 +97,7 @@ JSConsole::~JSConsole() {
     delete _ui;
 }
 
-void JSConsole::setScriptEngine(const QSharedPointer<ScriptEngine>&  scriptEngine) {
+void JSConsole::setScriptEngine(const ScriptEnginePointer&  scriptEngine) {
     if (_scriptEngine == scriptEngine && scriptEngine != NULL) {
         return;
     }
@@ -111,7 +111,7 @@ void JSConsole::setScriptEngine(const QSharedPointer<ScriptEngine>&  scriptEngin
 
     // if scriptEngine is NULL then create one and keep track of it using _ownScriptEngine
     if (scriptEngine.isNull()) {
-        _scriptEngine = QSharedPointer<ScriptEngine>(DependencyManager::get<ScriptEngines>()->loadScript(_consoleFileName, false), &QObject::deleteLater);
+        _scriptEngine = DependencyManager::get<ScriptEngines>()->loadScript(_consoleFileName, false);
     } else {
         _scriptEngine = scriptEngine;
     }
diff --git a/interface/src/ui/JSConsole.h b/interface/src/ui/JSConsole.h
index 5010b5b9ca..4b6409a76f 100644
--- a/interface/src/ui/JSConsole.h
+++ b/interface/src/ui/JSConsole.h
@@ -30,10 +30,10 @@ const int CONSOLE_HEIGHT = 200;
 class JSConsole : public QWidget {
     Q_OBJECT
 public:
-    JSConsole(QWidget* parent, const QSharedPointer<ScriptEngine>& scriptEngine = QSharedPointer<ScriptEngine>());
+    JSConsole(QWidget* parent, const ScriptEnginePointer& scriptEngine = ScriptEnginePointer());
     ~JSConsole();
 
-    void setScriptEngine(const QSharedPointer<ScriptEngine>& scriptEngine = QSharedPointer<ScriptEngine>());
+    void setScriptEngine(const ScriptEnginePointer& scriptEngine = ScriptEnginePointer());
     void clear();
 
 public slots:
@@ -66,7 +66,7 @@ private:
     QString _savedHistoryFilename;
     QList<QString> _commandHistory;
     QString _rootCommand;
-    QSharedPointer<ScriptEngine> _scriptEngine;
+    ScriptEnginePointer _scriptEngine;
     static const QString _consoleFileName;
 };
 
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index c9341fd3d9..515215a8d3 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -169,12 +169,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 c9e59ada23..b3bd6fbd34 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -52,7 +52,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,16 +91,6 @@ 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); };
@@ -193,7 +183,7 @@ void setupPreferences() {
         preferences->addPreference(new PrimaryHandPreference(AVATAR_TUNING, "Dominant Hand", getter, setter));
     }
     {
-        auto getter = [=]()->float { return myAvatar->getUniformScale(); };
+        auto getter = [=]()->float { return myAvatar->getTargetScale(); };
         auto setter = [=](float value) { myAvatar->setTargetScale(value); };
         auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
         preference->setStep(0.05f);
@@ -205,6 +195,16 @@ void setupPreferences() {
         // 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);
+    }
     {
         auto getter = []()->float { return DependencyManager::get<DdeFaceTracker>()->getEyeClosingThreshold(); };
         auto setter = [](float value) { DependencyManager::get<DdeFaceTracker>()->setEyeClosingThreshold(value); };
@@ -315,48 +315,24 @@ void setupPreferences() {
         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/Stats.cpp b/interface/src/ui/Stats.cpp
index 8e3636dd7e..8140dfb8ae 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>
 
@@ -116,12 +117,6 @@ void Stats::updateStats(bool force) {
         }
     }
 
-    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 +124,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 +132,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 +144,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 +173,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 +243,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 +399,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 +453,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 bba14cd5d7..6f499f2a8d 100644
--- a/interface/src/ui/TestingDialog.cpp
+++ b/interface/src/ui/TestingDialog.cpp
@@ -24,7 +24,7 @@ TestingDialog::TestingDialog(QWidget* parent) :
     _console->setFixedHeight(TESTING_CONSOLE_HEIGHT);
 
     auto _engines = DependencyManager::get<ScriptEngines>();
-    _engine.reset(_engines->loadScript(qApp->applicationDirPath() + testRunnerRelativePath));
+    _engine = _engines->loadScript(qApp->applicationDirPath() + testRunnerRelativePath);
     _console->setScriptEngine(_engine);
     connect(_engine.data(), &ScriptEngine::finished, this, &TestingDialog::onTestingFinished);
 }
diff --git a/interface/src/ui/TestingDialog.h b/interface/src/ui/TestingDialog.h
index 055e43eaf7..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;
-    QSharedPointer<ScriptEngine> _engine;
+    ScriptEnginePointer _engine;
 };
 
 #endif
diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index 6f1167cfc9..4210e76097 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -26,8 +26,7 @@ Base3DOverlay::Base3DOverlay() :
     _isSolid(DEFAULT_IS_SOLID),
     _isDashedLine(DEFAULT_IS_DASHED_LINE),
     _ignoreRayIntersection(false),
-    _drawInFront(false),
-    _isAA(true)
+    _drawInFront(false)
 {
 }
 
@@ -39,7 +38,6 @@ Base3DOverlay::Base3DOverlay(const Base3DOverlay* base3DOverlay) :
     _isDashedLine(base3DOverlay->_isDashedLine),
     _ignoreRayIntersection(base3DOverlay->_ignoreRayIntersection),
     _drawInFront(base3DOverlay->_drawInFront),
-    _isAA(base3DOverlay->_isAA),
     _isGrabbable(base3DOverlay->_isGrabbable)
 {
     setTransform(base3DOverlay->getTransform());
@@ -191,13 +189,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();
@@ -253,9 +244,6 @@ QVariant Base3DOverlay::getProperty(const QString& property) {
     if (property == "parentJointIndex") {
         return getParentJointIndex();
     }
-    if (property == "isAA") {
-        return _isAA;
-    }
 
     return Overlay::getProperty(property);
 }
@@ -268,15 +256,46 @@ 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
+    notifyRenderTransformChange();
 }
 
 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 (_renderTransformDirty) {
+        auto itemID = getRenderItemID();
+        // Capture the render transform value in game loop before 
+        auto latestTransform = evalRenderTransform();
+        _renderTransformDirty = false;
+        if (render::Item::isValidID(itemID)) {
+            render::ScenePointer scene = qApp->getMain3DScene();
+            render::Transaction transaction;
+            transaction.updateItem<Overlay>(itemID, [latestTransform](Overlay& data) {
+                auto overlay3D = dynamic_cast<Base3DOverlay*>(&data);
+                if (overlay3D) {
+                    overlay3D->setRenderTransform(latestTransform);
+                }
+            });
+            scene->enqueueTransaction(transaction);
+        } else {
+            setRenderTransform(latestTransform);
+        }
+    }
+}
+
+void Base3DOverlay::notifyRenderTransformChange() const {
+    _renderTransformDirty = true;
+}
+
+Transform Base3DOverlay::evalRenderTransform() {
+    return getTransform();
+}
+
+void Base3DOverlay::setRenderTransform(const Transform& transform) {
+    _renderTransform = transform;
+}
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index 29d4c093a9..3e65f163e2 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -43,18 +43,19 @@ public:
     bool getDrawInFront() const { return _drawInFront; }
     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; }
     void setIsGrabbable(bool value) { _isGrabbable = value; }
 
     virtual AABox getBounds() const override = 0;
 
+    void update(float deltatime) override;
+    
+    void notifyRenderTransformChange() const;
+
     void setProperties(const QVariantMap& properties) override;
     QVariant getProperty(const QString& property) override;
 
@@ -70,13 +71,18 @@ protected:
     virtual void locationChanged(bool tellPhysics = true) override;
     virtual void parentDeleted() override;
 
+    mutable Transform _renderTransform;
+    virtual Transform evalRenderTransform();
+    virtual void setRenderTransform(const Transform& transform);
+    const Transform& getRenderTransform() const { return _renderTransform; }
+
     float _lineWidth;
     bool _isSolid;
     bool _isDashedLine;
     bool _ignoreRayIntersection;
     bool _drawInFront;
-    bool _isAA;
     bool _isGrabbable { false };
+    mutable bool _renderTransformDirty{ true };
 
     QString _name;
 };
diff --git a/interface/src/ui/overlays/Billboard3DOverlay.cpp b/interface/src/ui/overlays/Billboard3DOverlay.cpp
index f5668caa71..960f0de095 100644
--- a/interface/src/ui/overlays/Billboard3DOverlay.cpp
+++ b/interface/src/ui/overlays/Billboard3DOverlay.cpp
@@ -45,3 +45,14 @@ bool Billboard3DOverlay::applyTransformTo(Transform& transform, bool force) {
     }
     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 d429537b5b..6b3aa40451 100644
--- a/interface/src/ui/overlays/Billboard3DOverlay.h
+++ b/interface/src/ui/overlays/Billboard3DOverlay.h
@@ -28,6 +28,8 @@ public:
 
 protected:
     virtual bool applyTransformTo(Transform& transform, bool force = false) override;
+
+    Transform evalRenderTransform() override;
 };
 
 #endif // hifi_Billboard3DOverlay_h
diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp
index 827417a912..4e51844d21 100644
--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@@ -84,11 +84,7 @@ void Circle3DOverlay::render(RenderArgs* args) {
         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...
@@ -264,10 +260,10 @@ void Circle3DOverlay::render(RenderArgs* args) {
 
 const render::ShapeKey Circle3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder().withoutCullFace().withUnlit();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
-    if (!getIsSolid()) {
+    if (!getIsSolid() || shouldDrawHUDLayer()) {
         builder.withUnlit().withDepthBias();
     }
     return builder.build();
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 77b9424d2f..39fd4f9377 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -13,6 +13,11 @@
 #include "Application.h"
 
 #include <EntityTreeRenderer.h>
+#include <NetworkingConstants.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
@@ -27,6 +32,9 @@ ContextOverlayInterface::ContextOverlayInterface() {
     _entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     _hmdScriptingInterface = DependencyManager::get<HMDScriptingInterface>();
     _tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    _selectionScriptingInterface = DependencyManager::get<SelectionScriptingInterface>();
+
+    _selectionToSceneHandler.initialize("contextOverlayHighlightList");
 
     _entityPropertyFlags += PROP_POSITION;
     _entityPropertyFlags += PROP_ROTATION;
@@ -34,11 +42,6 @@ ContextOverlayInterface::ContextOverlayInterface() {
     _entityPropertyFlags += PROP_DIMENSIONS;
     _entityPropertyFlags += PROP_REGISTRATION_POINT;
 
-    // initially, set _enabled to match the switch.  Later we enable/disable via the getter/setters
-    // if we are in edit or pal (for instance).  Note this is temporary, as we expect to enable this all
-    // the time after getting edge highlighting, etc...
-    _enabled = _settingSwitch.get();
-
     auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>().data();
     connect(entityTreeRenderer, SIGNAL(mousePressOnEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(createOrDestroyContextOverlay(const EntityItemID&, const PointerEvent&)));
     connect(entityTreeRenderer, SIGNAL(hoverEnterEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(contextOverlays_hoverEnterEntity(const EntityItemID&, const PointerEvent&)));
@@ -55,42 +58,42 @@ ContextOverlayInterface::ContextOverlayInterface() {
             _contextOverlayJustClicked = false;
         }
     });
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>().data();
+    connect(entityScriptingInterface, &EntityScriptingInterface::deletingEntity, this, &ContextOverlayInterface::deletingEntity);
+
+    connect(_selectionScriptingInterface.data(), &SelectionScriptingInterface::selectedItemsListChanged, &_selectionToSceneHandler, &SelectionToSceneHandler::selectedItemsListChanged);
 }
 
+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_CLOSE_DISTANCE = 1.5f; // in meters
-static const float CONTEXT_OVERLAY_CLOSE_SIZE = 0.12f; // in meters, same x and y dims
-static const float CONTEXT_OVERLAY_FAR_SIZE = 0.08f; // in meters, same x and y dims
-static const float CONTEXT_OVERLAY_CLOSE_OFFSET_ANGLE = 20.0f;
+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;
-static const float CONTEXT_OVERLAY_FAR_OFFSET = 0.1f;
 
 void ContextOverlayInterface::setEnabled(bool enabled) {
-    // only enable/disable if the setting in 'on'.   If it is 'off',
-    // make sure _enabled is always false.
-    if (_settingSwitch.get()) {
-        _enabled = enabled;
-    } else {
-        _enabled = false;
-    }
+    _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();
-            float distanceFromCameraToEntity = glm::distance(entityProperties.getPosition(), cameraPosition);
             glm::vec3 entityDimensions = entityProperties.getDimensions();
             glm::vec3 entityPosition = entityProperties.getPosition();
             glm::vec3 contextOverlayPosition = entityProperties.getPosition();
@@ -123,27 +126,22 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
                 // 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_CLOSE_SIZE, CONTEXT_OVERLAY_CLOSE_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
-            } else if (distanceFromCameraToEntity < CONTEXT_OVERLAY_CLOSE_DISTANCE) {
-                // Else if the entity is too close to the camera...
-                // ...rotate the Context Overlay to the right of the entity.
-                // This makes it easy to inspect things you're holding.
-                float offsetAngle = -CONTEXT_OVERLAY_CLOSE_OFFSET_ANGLE;
-                if (event.getID() == LEFT_HAND_HW_ID) {
-                    offsetAngle *= -1;
-                }
-                contextOverlayPosition = (glm::quat(glm::radians(glm::vec3(0.0f, offsetAngle, 0.0f))) * (entityPosition - cameraPosition)) + cameraPosition;
-                contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_CLOSE_SIZE, CONTEXT_OVERLAY_CLOSE_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
+                contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_SIZE, CONTEXT_OVERLAY_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
             } else {
-                // Else, place the Context Overlay some offset away from the entity's bounding
-                // box in the direction of the camera.
+                // 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);
-                contextOverlayPosition = (cameraPosition + direction * distance) - direction * CONTEXT_OVERLAY_FAR_OFFSET;
-                contextOverlayDimensions = glm::vec2(CONTEXT_OVERLAY_FAR_SIZE, CONTEXT_OVERLAY_FAR_SIZE) * glm::distance(contextOverlayPosition, cameraPosition);
+                float offsetAngle = -CONTEXT_OVERLAY_OFFSET_ANGLE;
+                if (event.getID() == LEFT_HAND_HW_ID) {
+                    offsetAngle *= -1.0f;
+                }
+                contextOverlayPosition = (glm::quat(glm::radians(glm::vec3(0.0f, offsetAngle, 0.0f)))) *
+                    ((cameraPosition + 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
@@ -168,6 +166,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
         }
     } else {
         if (!_currentEntityWithContextOverlay.isNull()) {
+            disableEntityHighlight(_currentEntityWithContextOverlay);
             return destroyContextOverlay(_currentEntityWithContextOverlay, event);
         }
         return false;
@@ -202,8 +201,13 @@ bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityIt
 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;
-        openMarketplace();
-        destroyContextOverlay(_currentEntityWithContextOverlay, PointerEvent());
+        Setting::Handle<bool> _settingSwitch{ "commerce", false };
+        if (_settingSwitch.get()) {
+            openInspectionCertificate();
+        } else {
+            openMarketplace();
+        }
+        emit contextOverlayClicked(_currentEntityWithContextOverlay);
         _contextOverlayJustClicked = true;
     }
 }
@@ -229,18 +233,28 @@ void ContextOverlayInterface::contextOverlays_hoverLeaveOverlay(const OverlayID&
 }
 
 void ContextOverlayInterface::contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event) {
-    if (contextOverlayFilterPassed(entityID)) {
+    if (contextOverlayFilterPassed(entityID) && _enabled && event.getID() != MOUSE_HW_ID) {
         enableEntityHighlight(entityID);
     }
 }
 
 void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event) {
-    if (_currentEntityWithContextOverlay != entityID) {
+    if (_currentEntityWithContextOverlay != entityID && _enabled && event.getID() != MOUSE_HW_ID) {
         disableEntityHighlight(entityID);
     }
 }
 
-static const QString MARKETPLACE_BASE_URL = "https://metaverse.highfidelity.com/marketplace/items/";
+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();
+    }
+}
+
+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
@@ -250,30 +264,23 @@ void ContextOverlayInterface::openMarketplace() {
         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;
-        tablet->gotoWebScreen(url);
+        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) {
-    auto entityTree = qApp->getEntities()->getTree();
-    entityTree->withReadLock([&] {
-        auto entityItem = entityTree->findEntityByEntityItemID(entityItemID);
-        if ((entityItem != NULL) && !entityItem->getShouldHighlight()) {
-            qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'true' for Entity ID:" << entityItemID;
-            entityItem->setShouldHighlight(true);
-        }
-    });
+    _selectionScriptingInterface->addToSelectedItemsList("contextOverlayHighlightList", "entity", entityItemID);
 }
 
 void ContextOverlayInterface::disableEntityHighlight(const EntityItemID& entityItemID) {
-    auto entityTree = qApp->getEntities()->getTree();
-    entityTree->withReadLock([&] {
-        auto entityItem = entityTree->findEntityByEntityItemID(entityItemID);
-        if ((entityItem != NULL) && entityItem->getShouldHighlight()) {
-            qCDebug(context_overlay) << "Setting 'shouldHighlight' to 'false' for Entity ID:" << entityItemID;
-            entityItem->setShouldHighlight(false);
-        }
-    });
+    _selectionScriptingInterface->removeFromSelectedItemsList("contextOverlayHighlightList", "entity", entityItemID);
+}
+
+void ContextOverlayInterface::deletingEntity(const EntityItemID& entityID) {
+    if (_currentEntityWithContextOverlay == entityID) {
+        destroyContextOverlay(_currentEntityWithContextOverlay, PointerEvent());
+    }
 }
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.h b/interface/src/ui/overlays/ContextOverlayInterface.h
index ba9cb68575..b4d3ddc0c2 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.h
+++ b/interface/src/ui/overlays/ContextOverlayInterface.h
@@ -25,6 +25,7 @@
 #include "ui/overlays/Image3DOverlay.h"
 #include "ui/overlays/Overlays.h"
 #include "scripting/HMDScriptingInterface.h"
+#include "scripting/SelectionScriptingInterface.h"
 
 #include "EntityTree.h"
 #include "ContextOverlayLogging.h"
@@ -42,6 +43,7 @@ class ContextOverlayInterface : public QObject, public Dependency  {
     EntityPropertyFlags _entityPropertyFlags;
     QSharedPointer<HMDScriptingInterface> _hmdScriptingInterface;
     QSharedPointer<TabletScriptingInterface> _tabletScriptingInterface;
+    QSharedPointer<SelectionScriptingInterface> _selectionScriptingInterface;
     OverlayID _contextOverlayID { UNKNOWN_OVERLAY_ID };
     std::shared_ptr<Image3DOverlay> _contextOverlay { nullptr };
 public:
@@ -54,6 +56,9 @@ public:
     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);
@@ -74,12 +79,14 @@ private:
 
     bool _isInMarketplaceInspectionMode { false };
 
-    Setting::Handle<bool> _settingSwitch { "inspectionMode", false };
-
+    void openInspectionCertificate();
     void openMarketplace();
     void enableEntityHighlight(const EntityItemID& entityItemID);
     void disableEntityHighlight(const EntityItemID& entityItemID);
 
+    void deletingEntity(const EntityItemID& entityItemID);
+
+    SelectionToSceneHandler _selectionToSceneHandler;
 };
 
 #endif // hifi_ContextOverlayInterface_h
diff --git a/interface/src/ui/overlays/Cube3DOverlay.cpp b/interface/src/ui/overlays/Cube3DOverlay.cpp
index a353545245..0ac9dba34b 100644
--- a/interface/src/ui/overlays/Cube3DOverlay.cpp
+++ b/interface/src/ui/overlays/Cube3DOverlay.cpp
@@ -53,17 +53,11 @@ 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 shapePipeline = args->_shapePipeline;
         if (!shapePipeline) {
@@ -71,12 +65,12 @@ void Cube3DOverlay::render(RenderArgs* args) {
         }
 
         if (_isSolid) {
-            transform.setScale(dimensions);
             batch->setModelTransform(transform);
             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,7 +101,6 @@ 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, shapePipeline);
             }
@@ -117,10 +110,10 @@ 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()) {
+    if (!getIsSolid() || shouldDrawHUDLayer()) {
         builder.withUnlit().withDepthBias();
     }
     return builder.build();
@@ -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..ca275368cb 100644
--- a/interface/src/ui/overlays/Grid3DOverlay.cpp
+++ b/interface/src/ui/overlays/Grid3DOverlay.cpp
@@ -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 7dfee2c491..998cc312eb 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,6 +46,11 @@ Image3DOverlay::~Image3DOverlay() {
 }
 
 void Image3DOverlay::update(float deltatime) {
+    if (!_isLoaded) {
+        _isLoaded = true;
+        _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
+        _textureIsLoaded = false;
+    }
 #if OVERLAY_PANELS
     if (usecTimestampNow() > _transformExpiry) {
         Transform transform = getTransform();
@@ -52,18 +58,30 @@ void Image3DOverlay::update(float deltatime) {
         setTransform(transform);
     }
 #endif
+    Parent::update(deltatime);
 }
 
 void Image3DOverlay::render(RenderArgs* args) {
-    if (!_isLoaded) {
-        _isLoaded = true;
-        _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
-    }
-
     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);
     gpu::Batch* batch = args->_batch;
 
@@ -92,24 +110,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();
-    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);
-    }
-    transform.postScale(glm::vec3(getDimensions(), 1.0f));
 
-    batch->setModelTransform(transform);
+    batch->setModelTransform(getRenderTransform());
     batch->setResourceTexture(0, _texture->getGPUTexture());
 
     DependencyManager::get<GeometryCache>()->renderQuad(
@@ -123,10 +132,10 @@ void Image3DOverlay::render(RenderArgs* args) {
 
 const render::ShapeKey Image3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder().withoutCullFace().withDepthBias();
-    if (_emissive) {
+    if (_emissive || shouldDrawHUDLayer()) {
         builder.withUnlit();
     }
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
     return builder.build();
@@ -231,3 +240,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..69f52c5f2e 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();
+    _glow = line3DOverlay->getGlow();
+    _glowWidth = line3DOverlay->getGlowWidth();
 }
 
 Line3DOverlay::~Line3DOverlay() {
@@ -130,26 +133,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, _glowWidth, _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,15 +224,23 @@ 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"];
+    auto glowWidth = properties["glowWidth"];
     if (glowWidth.isValid()) {
-        setGlow(glowWidth.toFloat());
+        setGlowWidth(glowWidth.toFloat());
     }
 
 }
@@ -258,3 +268,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..bcb65b1f1e 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;
@@ -45,6 +46,7 @@ public:
 
     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 };
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 0bed07891e..4f5ea2042f 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,45 @@ 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);
+    }
+    scene->enqueueTransaction(transaction);
 }
 
 bool ModelOverlay::addToScene(Overlay::Pointer overlay, const render::ScenePointer& scene, render::Transaction& transaction) {
@@ -72,34 +101,27 @@ 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);
-    }
-
-    _model->setVisibleInScene(_visible, scene);
-    _model->setLayeredInFront(getDrawInFront(), scene);
-
-    scene->enqueueTransaction(transaction);
+void ModelOverlay::setDrawInFront(bool drawInFront) {
+    Base3DOverlay::setDrawInFront(drawInFront);
+    _drawInFrontDirty = 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 +134,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 +193,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 +261,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 +325,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 +363,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 +385,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..93deebac43 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,28 @@ 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;
+
 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 +77,26 @@ private:
     bool _updateModel = { false };
     bool _scaleToFit = { false };
     float _loadPriority { 0.0f };
+
+    bool _visibleDirty { false };
+    bool _drawInFrontDirty { false };
+    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
 };
 
 #endif // hifi_ModelOverlay_h
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 675dff7e93..8b88d1e963 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;
 
@@ -30,6 +32,7 @@ Overlay::Overlay() :
     _colorPulse(0.0f),
     _color(DEFAULT_OVERLAY_COLOR),
     _visible(true),
+    _drawHUDLayer(false),
     _anchor(NO_ANCHOR)
 {
 }
@@ -48,6 +51,7 @@ Overlay::Overlay(const Overlay* overlay) :
     _colorPulse(overlay->_colorPulse),
     _color(overlay->_color),
     _visible(overlay->_visible),
+    _drawHUDLayer(overlay->_drawHUDLayer),
     _anchor(overlay->_anchor)
 {
 }
@@ -86,6 +90,11 @@ void Overlay::setProperties(const QVariantMap& properties) {
         setColorPulse(properties["colorPulse"].toFloat());
     }
 
+    if (properties["drawHUDLayer"].isValid()) {
+        bool drawHUDLayer = properties["drawHUDLayer"].toBool();
+        setDrawHUDLayer(drawHUDLayer);
+    }
+
     if (properties["visible"].isValid()) {
         bool visible = properties["visible"].toBool();
         setVisible(visible);
@@ -161,6 +170,12 @@ float Overlay::getAlpha() {
     return (_alphaPulse >= 0.0f) ? _alpha * pulseLevel : _alpha * (1.0f - pulseLevel);
 }
 
+void Overlay::setDrawHUDLayer(bool drawHUDLayer) {
+    if (drawHUDLayer != _drawHUDLayer) {
+        qApp->getOverlays().setOverlayDrawHUDLayer(getOverlayID(), drawHUDLayer);
+        _drawHUDLayer = drawHUDLayer;
+    }
+}
 
 // pulse travels from min to max, then max to min in one period.
 float Overlay::updatePulse() {
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index 494c287676..775c597397 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -58,6 +58,8 @@ public:
     virtual bool is3D() const = 0;
     bool isLoaded() { return _isLoaded; }
     bool getVisible() const { return _visible; }
+    bool shouldDrawHUDLayer() const { return _drawHUDLayer; }
+    virtual bool isTransparent() { return getAlphaPulse() != 0.0f || getAlpha() != 1.0f; };
     xColor getColor();
     float getAlpha();
     Anchor getAnchor() const { return _anchor; }
@@ -71,7 +73,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; }
@@ -114,6 +117,7 @@ protected:
 
     xColor _color;
     bool _visible; // should the overlay be drawn at all
+    bool _drawHUDLayer; // should the overlay be drawn on the HUD layer
     Anchor _anchor;
 
     unsigned int _stackOrder { 0 };
diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp
index b6c7dcbd46..c93d225718 100644
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@@ -37,20 +37,29 @@
 #include "Web3DOverlay.h"
 #include <QtQuick/QQuickWindow>
 
+#include "render/ShapePipeline.h"
+
 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> overlays3DHUD;
     QMap<OverlayID, Overlay::Pointer> overlaysWorld;
     {
         QMutexLocker locker(&_mutex);
         overlaysHUD.swap(_overlaysHUD);
+        overlays3DHUD.swap(_overlays3DHUD);
         overlaysWorld.swap(_overlaysWorld);
     }
 
     foreach(Overlay::Pointer overlay, overlaysHUD) {
         _overlaysToDelete.push_back(overlay);
     }
+    foreach(Overlay::Pointer overlay, overlays3DHUD) {
+        _overlaysToDelete.push_back(overlay);
+    }
     foreach(Overlay::Pointer overlay, overlaysWorld) {
         _overlaysToDelete.push_back(overlay);
     }
@@ -64,6 +73,8 @@ void Overlays::init() {
 #if OVERLAY_PANELS
     _scriptEngine = new QScriptEngine();
 #endif
+    _shapePlumber = std::make_shared<render::ShapePlumber>();
+    initOverlay3DPipelines(*_shapePlumber, true);
 }
 
 void Overlays::update(float deltatime) {
@@ -72,6 +83,9 @@ void Overlays::update(float deltatime) {
         foreach(const auto& thisOverlay, _overlaysHUD) {
             thisOverlay->update(deltatime);
         }
+        foreach(const auto& thisOverlay, _overlays3DHUD) {
+            thisOverlay->update(deltatime);
+        }
         foreach(const auto& thisOverlay, _overlaysWorld) {
             thisOverlay->update(deltatime);
         }
@@ -96,7 +110,7 @@ void Overlays::cleanupOverlaysToDelete() {
             } while (!_overlaysToDelete.isEmpty());
         }
 
-        if (transaction._removedItems.size() > 0) {
+        if (transaction.hasRemovedItems()) {
             scene->enqueueTransaction(transaction);
         }
     }
@@ -128,6 +142,23 @@ void Overlays::renderHUD(RenderArgs* renderArgs) {
     }
 }
 
+void Overlays::render3DHUDOverlays(RenderArgs* renderArgs) {
+    PROFILE_RANGE(render_overlays, __FUNCTION__);
+    gpu::Batch& batch = *renderArgs->_batch;
+
+    auto textureCache = DependencyManager::get<TextureCache>();
+
+    QMutexLocker lock(&_mutex);
+    foreach(Overlay::Pointer thisOverlay, _overlays3DHUD) {
+        // Reset necessary batch pipeline settings between overlays
+        batch.setResourceTexture(0, textureCache->getWhiteTexture()); // FIXME - do we really need to do this??
+        batch.setModelTransform(Transform());
+
+        renderArgs->_shapePipeline = _shapePlumber->pickPipeline(renderArgs, thisOverlay->getShapeKey());
+        thisOverlay->render(renderArgs);
+    }
+}
+
 void Overlays::disable() {
     _enabled = false;
 }
@@ -142,8 +173,9 @@ Overlay::Pointer Overlays::getOverlay(OverlayID id) const {
     QMutexLocker locker(&_mutex);
     if (_overlaysHUD.contains(id)) {
         return _overlaysHUD[id];
-    }
-    if (_overlaysWorld.contains(id)) {
+    } else if (_overlays3DHUD.contains(id)) {
+        return _overlays3DHUD[id];
+    } else if (_overlaysWorld.contains(id)) {
         return _overlaysWorld[id];
     }
     return nullptr;
@@ -200,7 +232,7 @@ OverlayID Overlays::addOverlay(const Overlay::Pointer& overlay) {
     OverlayID thisID = OverlayID(QUuid::createUuid());
     overlay->setOverlayID(thisID);
     overlay->setStackOrder(_stackOrder++);
-    if (overlay->is3D()) {
+    if (overlay->is3D() && !overlay->shouldDrawHUDLayer()) {
         {
             QMutexLocker locker(&_mutex);
             _overlaysWorld[thisID] = overlay;
@@ -210,6 +242,9 @@ OverlayID Overlays::addOverlay(const Overlay::Pointer& overlay) {
         render::Transaction transaction;
         overlay->addToScene(overlay, scene, transaction);
         scene->enqueueTransaction(transaction);
+    } else if (overlay->is3D() && overlay->shouldDrawHUDLayer()) {
+        QMutexLocker locker(&_mutex);
+        _overlays3DHUD[thisID] = overlay;
     } else {
         QMutexLocker locker(&_mutex);
         _overlaysHUD[thisID] = overlay;
@@ -218,6 +253,28 @@ OverlayID Overlays::addOverlay(const Overlay::Pointer& overlay) {
     return thisID;
 }
 
+void Overlays::setOverlayDrawHUDLayer(const OverlayID& id, const bool drawHUDLayer) {
+    QMutexLocker locker(&_mutex);
+    if (drawHUDLayer && _overlaysWorld.contains(id)) {
+        std::shared_ptr<Overlay> overlay = _overlaysWorld.take(id);
+        render::ScenePointer scene = qApp->getMain3DScene();
+        render::Transaction transaction;
+        auto itemID = overlay->getRenderItemID();
+        if (render::Item::isValidID(itemID)) {
+            overlay->removeFromScene(overlay, scene, transaction);
+            scene->enqueueTransaction(transaction);
+        }
+        _overlays3DHUD[id] = overlay;
+    } else if (!drawHUDLayer && _overlays3DHUD.contains(id)) {
+        std::shared_ptr<Overlay> overlay = _overlays3DHUD.take(id);
+        render::ScenePointer scene = qApp->getMain3DScene();
+        render::Transaction transaction;
+        overlay->addToScene(overlay, scene, transaction);
+        scene->enqueueTransaction(transaction);
+        _overlaysWorld[id] = overlay;
+    }
+}
+
 OverlayID Overlays::cloneOverlay(OverlayID id) {
     if (QThread::currentThread() != thread()) {
         OverlayID result;
@@ -243,7 +300,12 @@ OverlayID Overlays::cloneOverlay(OverlayID id) {
 }
 
 bool Overlays::editOverlay(OverlayID id, const QVariant& properties) {
-    if (QThread::currentThread() != thread()) {
+    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
@@ -252,22 +314,15 @@ bool Overlays::editOverlay(OverlayID id, const QVariant& properties) {
         return true;
     }
 
-    Overlay::Pointer thisOverlay = getOverlay(id);
-    if (thisOverlay) {
-        thisOverlay->setProperties(properties.toMap());
-        return true;
-    }
-    return false;
+    thisOverlay->setProperties(properties.toMap());
+    return true;
 }
 
 bool Overlays::editOverlays(const QVariant& propertiesById) {
-    if (QThread::currentThread() != thread()) {
-        // NOTE see comment on editOverlay for why this is not a blocking call
-        QMetaObject::invokeMethod(this, "editOverlays", Q_ARG(QVariant, propertiesById));
-        return true;
-    }
+    bool defer2DOverlays = QThread::currentThread() != thread();
 
-    QVariantMap map = propertiesById.toMap();
+    QVariantMap deferrred;
+    const QVariantMap map = propertiesById.toMap();
     bool success = true;
     for (const auto& key : map.keys()) {
         OverlayID id = OverlayID(key);
@@ -276,9 +331,21 @@ 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;
 }
 
@@ -294,6 +361,8 @@ void Overlays::deleteOverlay(OverlayID id) {
         QMutexLocker locker(&_mutex);
         if (_overlaysHUD.contains(id)) {
             overlayToDelete = _overlaysHUD.take(id);
+        } else if (_overlays3DHUD.contains(id)) {
+            overlayToDelete = _overlays3DHUD.take(id);
         } else if (_overlaysWorld.contains(id)) {
             overlayToDelete = _overlaysWorld.take(id);
         } else {
@@ -475,15 +544,15 @@ 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) {
+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;
 
@@ -702,7 +771,7 @@ bool Overlays::isAddedOverlay(OverlayID id) {
     }
 
     QMutexLocker locker(&_mutex);
-    return _overlaysHUD.contains(id) || _overlaysWorld.contains(id);
+    return _overlaysHUD.contains(id) || _overlays3DHUD.contains(id) || _overlaysWorld.contains(id);
 }
 
 void Overlays::sendMousePressOnOverlay(const OverlayID& overlayID, const PointerEvent& event) {
@@ -849,21 +918,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;
     }
@@ -976,6 +1045,7 @@ QVector<QUuid> Overlays::findOverlays(const glm::vec3& center, float radius) {
             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 a915acb06a..1e85562485 100644
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@@ -90,6 +90,7 @@ public:
     void init();
     void update(float deltatime);
     void renderHUD(RenderArgs* renderArgs);
+    void render3DHUDOverlays(RenderArgs* renderArgs);
     void disable();
     void enable();
 
@@ -102,6 +103,8 @@ public:
     OverlayID addOverlay(Overlay* overlay) { return addOverlay(Overlay::Pointer(overlay)); }
     OverlayID addOverlay(const Overlay::Pointer& overlay);
 
+    void setOverlayDrawHUDLayer(const OverlayID& id, const bool drawHUDLayer);
+
     bool mousePressEvent(QMouseEvent* event);
     bool mouseDoublePressEvent(QMouseEvent* event);
     bool mouseReleaseEvent(QMouseEvent* event);
@@ -213,6 +216,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
      *
@@ -325,7 +334,11 @@ private:
 
     mutable QMutex _mutex { QMutex::Recursive };
     QMap<OverlayID, Overlay::Pointer> _overlaysHUD;
+    QMap<OverlayID, Overlay::Pointer> _overlays3DHUD;
     QMap<OverlayID, Overlay::Pointer> _overlaysWorld;
+
+    render::ShapePlumberPointer _shapePlumber;
+
 #if OVERLAY_PANELS
     QMap<OverlayID, OverlayPanel::Pointer> _panels;
 #endif
@@ -343,10 +356,6 @@ private:
     OverlayID _currentClickingOnOverlayID { UNKNOWN_OVERLAY_ID };
     OverlayID _currentHoverOverOverlayID { UNKNOWN_OVERLAY_ID };
 
-    Q_INVOKABLE 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..887bf7ff8e 100644
--- a/interface/src/ui/overlays/OverlaysPayload.cpp
+++ b/interface/src/ui/overlays/OverlaysPayload.cpp
@@ -37,10 +37,7 @@ namespace render {
             if (std::static_pointer_cast<Base3DOverlay>(overlay)->getDrawInFront()) {
                 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 {
@@ -53,21 +50,17 @@ namespace render {
     }
     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 LAYER_3D_FRONT;
+            } else {
+                return LAYER_3D;
+            }
         } else {
             return LAYER_2D;
         }
@@ -81,7 +74,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/Planar3DOverlay.cpp b/interface/src/ui/overlays/Planar3DOverlay.cpp
index 58d72b100b..ac3fe66ddc 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;
+    notifyRenderTransformChange();
+}
+
 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 8127d4ebb9..1360cccfc2 100644
--- a/interface/src/ui/overlays/Planar3DOverlay.h
+++ b/interface/src/ui/overlays/Planar3DOverlay.h
@@ -24,17 +24,19 @@ public:
     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/Rectangle3DOverlay.cpp b/interface/src/ui/overlays/Rectangle3DOverlay.cpp
index f981fe1462..47d47b76a5 100644
--- a/interface/src/ui/overlays/Rectangle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Rectangle3DOverlay.cpp
@@ -66,6 +66,7 @@ void Rectangle3DOverlay::render(RenderArgs* args) {
     auto batch = args->_batch;
 
     if (batch) {
+        // FIXME Start using the _renderTransform instead of calling for Transform and Dimensions from here, do the custom things needed in evalRenderTransform()
         Transform transform;
         transform.setTranslation(position);
         transform.setRotation(rotation);
@@ -110,7 +111,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();
@@ -123,3 +124,8 @@ void Rectangle3DOverlay::setProperties(const QVariantMap& properties) {
 Rectangle3DOverlay* Rectangle3DOverlay::createClone() const {
     return new Rectangle3DOverlay(this);
 }
+
+Transform Rectangle3DOverlay::evalRenderTransform() {
+    return getTransform();
+}
+
diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.h b/interface/src/ui/overlays/Rectangle3DOverlay.h
index a0c342a25b..a26ed524fc 100644
--- a/interface/src/ui/overlays/Rectangle3DOverlay.h
+++ b/interface/src/ui/overlays/Rectangle3DOverlay.h
@@ -28,6 +28,10 @@ public:
     void setProperties(const QVariantMap& properties) override;
 
     virtual Rectangle3DOverlay* createClone() const override;
+
+protected:
+    Transform evalRenderTransform() 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 a6fcacc769..2c1df478f6 100644
--- a/interface/src/ui/overlays/Shape3DOverlay.cpp
+++ b/interface/src/ui/overlays/Shape3DOverlay.cpp
@@ -33,25 +33,15 @@ 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 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, shapePipeline);
         } else {
@@ -62,10 +52,10 @@ void Shape3DOverlay::render(RenderArgs* args) {
 
 const render::ShapeKey Shape3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
-    if (!getIsSolid()) {
+    if (!getIsSolid() || shouldDrawHUDLayer()) {
         builder.withUnlit().withDepthBias();
     }
     return builder.build();
@@ -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 5bbf41eb94..f2c9968687 100644
--- a/interface/src/ui/overlays/Sphere3DOverlay.cpp
+++ b/interface/src/ui/overlays/Sphere3DOverlay.cpp
@@ -39,9 +39,7 @@ 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 shapePipeline = args->_shapePipeline;
@@ -59,10 +57,10 @@ void Sphere3DOverlay::render(RenderArgs* args) {
 
 const render::ShapeKey Sphere3DOverlay::getShapeKey() {
     auto builder = render::ShapeKey::Builder();
-    if (getAlpha() != 1.0f) {
+    if (isTransparent()) {
         builder.withTranslucent();
     }
-    if (!getIsSolid()) {
+    if (!getIsSolid() || shouldDrawHUDLayer()) {
         builder.withUnlit().withDepthBias();
     }
     return builder.build();
@@ -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 4b110b8099..57e3c32060 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;
@@ -96,9 +98,7 @@ void Text3DOverlay::render(RenderArgs* args) {
     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 +113,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 +133,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->_shapePipeline->pipeline);
-    args->_shapePipeline->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 +155,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 +255,8 @@ bool Text3DOverlay::findRayIntersection(const glm::vec3 &origin, const glm::vec3
     setTransform(transform);
     return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal);
 }
+
+Transform Text3DOverlay::evalRenderTransform() {
+    return Parent::evalRenderTransform();
+}
+
diff --git a/interface/src/ui/overlays/Text3DOverlay.h b/interface/src/ui/overlays/Text3DOverlay.h
index e7b09c9040..6ed31f37b3 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);
@@ -63,6 +65,9 @@ public:
 
     virtual Text3DOverlay* createClone() const override;
 
+protected:
+    Transform evalRenderTransform() override;
+
 private:
     TextRenderer3D* _textRenderer = nullptr;
 
diff --git a/interface/src/ui/overlays/Volume3DOverlay.cpp b/interface/src/ui/overlays/Volume3DOverlay.cpp
index ad61e28bc7..8aa8490937 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);
+    notifyRenderTransformChange();
+}
+
 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 8e58b648e6..526890b9c1 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"
@@ -60,6 +63,7 @@ static const float OPAQUE_ALPHA_THRESHOLD = 0.99f;
 
 const QString Web3DOverlay::TYPE = "web3d";
 const QString Web3DOverlay::QML = "Web3DOverlay.qml";
+
 Web3DOverlay::Web3DOverlay() : _dpi(DPI) {
     _touchDevice.setCapabilities(QTouchDevice::Position);
     _touchDevice.setType(QTouchDevice::TouchScreen);
@@ -67,6 +71,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,130 +88,173 @@ 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();
-        auto overlays = &(qApp->getOverlays());
-        QObject::disconnect(overlays, &Overlays::mousePressOnOverlay, this, nullptr);
-        QObject::disconnect(overlays, &Overlays::mouseReleaseOnOverlay, this, nullptr);
-        QObject::disconnect(overlays, &Overlays::mouseMoveOnOverlay, this, nullptr);
-        QObject::disconnect(overlays, &Overlays::hoverLeaveOverlay, this, nullptr);
-        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();
-    }
+    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();
+    auto overlays = &(qApp->getOverlays());
+    QObject::disconnect(overlays, &Overlays::mousePressOnOverlay, this, nullptr);
+    QObject::disconnect(overlays, &Overlays::mouseReleaseOnOverlay, this, nullptr);
+    QObject::disconnect(overlays, &Overlays::mouseMoveOnOverlay, this, nullptr);
+    QObject::disconnect(overlays, &Overlays::hoverLeaveOverlay, this, nullptr);
+    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();
+    });
+
+    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);
+        }
+    };
+
+    auto overlays = &(qApp->getOverlays());
+    QObject::connect(overlays, &Overlays::mousePressOnOverlay, this, forwardPointerEvent);
+    QObject::connect(overlays, &Overlays::mouseReleaseOnOverlay, this, forwardPointerEvent);
+    QObject::connect(overlays, &Overlays::mouseMoveOnOverlay, this, forwardPointerEvent);
+    QObject::connect(overlays, &Overlays::hoverLeaveOverlay, this, [=](OverlayID overlayID, const PointerEvent& event) {
+        auto self = weakSelf.lock();
+        if (!self) {
+            return;
+        }
+        if (overlayID == selfOverlayID && (self->_pressed || (!self->_activeTouchPoints.empty() && self->_touchBeginAccepted))) {
+            PointerEvent endEvent(PointerEvent::Release, event.getID(), event.getPos2D(), event.getPos3D(), event.getNormal(), event.getDirection(),
+                event.getButton(), event.getButtons(), event.getKeyboardModifiers());
+            forwardPointerEvent(overlayID, endEvent);
+        }
+    });
+
+    QObject::connect(this, &Web3DOverlay::scriptEventReceived, _webSurface.data(), &OffscreenQmlSurface::emitScriptEvent);
+    QObject::connect(_webSurface.data(), &OffscreenQmlSurface::webEventReceived, this, &Web3DOverlay::webEventReceived);
+}
+
+
 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")) {
-        if (_webSurface) {
-            _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) {
-        return;
-    }
+    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());
 
-        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());
-
-            _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) {
@@ -215,83 +265,32 @@ void Web3DOverlay::setMaxFPS(uint8_t maxFPS) {
     }
 }
 
+void Web3DOverlay::onResizeWebSurface() {
+    _mayNeedResize = false;
+    _webSurface->resize(QSize(_resolution.x, _resolution.y));
+}
+
 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);
-            }
-        };
-
-        auto overlays = &(qApp->getOverlays());
-        QObject::connect(overlays, &Overlays::mousePressOnOverlay, this, forwardPointerEvent);
-        QObject::connect(overlays, &Overlays::mouseReleaseOnOverlay, this, forwardPointerEvent);
-        QObject::connect(overlays, &Overlays::mouseMoveOnOverlay, this, forwardPointerEvent);
-        QObject::connect(overlays, &Overlays::hoverLeaveOverlay, this, [=](OverlayID overlayID, const PointerEvent& event) {
-            auto self = weakSelf.lock();
-            if (!self) {
-                return;
-            }
-            if (overlayID == selfOverlayID && (self->_pressed || (!self->_activeTouchPoints.empty() && self->_touchBeginAccepted))) {
-                PointerEvent endEvent(PointerEvent::Release, event.getID(), event.getPos2D(), event.getPos3D(), event.getNormal(), event.getDirection(),
-                                      event.getButton(), event.getButtons(), event.getKeyboardModifiers());
-                forwardPointerEvent(overlayID, endEvent);
-            }
-        });
-
-        QObject::connect(this, &Web3DOverlay::scriptEventReceived, _webSurface.data(), &OffscreenQmlSurface::emitScriptEvent);
-        QObject::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()) {
         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__);
     }
@@ -304,20 +303,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();
@@ -578,11 +591,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();
+                });
+            }
+        }
     }
 }
 
diff --git a/interface/src/ui/overlays/Web3DOverlay.h b/interface/src/ui/overlays/Web3DOverlay.h
index c08499cdf4..de74b95b3e 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;
@@ -62,14 +62,28 @@ public:
         Mouse
     };
 
+    void buildWebSurface();
+    void destroyWebSurface();
+    void onResizeWebSurface();
+
 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;
     gpu::TexturePointer _texture;
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 21f98d3e01..0897c26a12 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -32,6 +32,10 @@
 #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;
@@ -49,6 +53,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;
@@ -168,6 +192,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 +249,7 @@ void Rig::reset(const FBXGeometry& geometry) {
     _rightShoulderJointIndex = _rightElbowJointIndex >= 0 ? geometry.joints.at(_rightElbowJointIndex).parentIndex : -1;
 
     if (!_animGraphURL.isEmpty()) {
+        _animNode.reset();
         initAnimGraph(_animGraphURL);
     }
 }
@@ -933,8 +960,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.
@@ -1099,35 +1137,138 @@ 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;
+
+                // 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;
+    }
+}
+
+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 HAND_RADIUS = 0.05f;
     const float ELBOW_POLE_VECTOR_BLEND_FACTOR = 0.95f;
 
+    int hipsIndex = indexOfJoint("Hips");
+
     if (leftHandEnabled) {
 
         glm::vec3 handPosition = leftHandPose.trans();
         glm::quat handRotation = leftHandPose.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);
@@ -1173,11 +1314,8 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab
         glm::quat handRotation = rightHandPose.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);
@@ -1414,7 +1552,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
 
     updateHands(leftHandEnabled, rightHandEnabled, hipsEnabled, leftArmEnabled, rightArmEnabled, dt,
                 params.primaryControllerPoses[PrimaryControllerType_LeftHand], params.primaryControllerPoses[PrimaryControllerType_RightHand],
-                params.bodyCapsuleRadius, params.bodyCapsuleHalfHeight, params.bodyCapsuleLocalOffset);
+                params.hipsShapeInfo, params.spineShapeInfo, params.spine1ShapeInfo, params.spine2ShapeInfo);
 
     updateFeet(leftFootEnabled, rightFootEnabled,
                params.primaryControllerPoses[PrimaryControllerType_LeftFoot], params.primaryControllerPoses[PrimaryControllerType_RightFoot]);
@@ -1482,28 +1620,32 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
 }
 
 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);
+            }
+            _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 {
@@ -1660,59 +1802,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());
     glm::vec3 hipsPosition(0.0f);
     int hipsIndex = indexOfJoint("Hips");
     if (hipsIndex >= 0) {
         hipsPosition = transformPoint(_geometryToRigTransform, _animSkeleton->getAbsoluteDefaultPose(hipsIndex).trans());
     }
-    AnimVariantMap animVars;
-    animVars.setRigToGeometryTransform(_rigToGeometryTransform);
-    glm::quat handRotation = glm::angleAxis(PI, Vectors::UNIT_X);
-    animVars.set("leftHandPosition", hipsPosition);
-    animVars.set("leftHandRotation", handRotation);
-    animVars.set("leftHandType", (int)IKTarget::Type::RotationAndPosition);
-    animVars.set("rightHandPosition", hipsPosition);
-    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 geomFootPosition = glm::vec3(0.0f, _animSkeleton->getAbsoluteDefaultPose(rightFootIndex).trans().y, 0.0f);
-        glm::vec3 footPosition = transformPoint(_geometryToRigTransform, geomFootPosition);
-        glm::quat footRotation = glm::angleAxis(0.5f * PI, Vectors::UNIT_X);
-        animVars.set("leftFootPosition", footPosition);
-        animVars.set("leftFootRotation", footRotation);
-        animVars.set("leftFootType", (int)IKTarget::Type::RotationAndPosition);
-        animVars.set("rightFootPosition", footPosition);
-        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, _geometryToRigTransform, _rigToGeometryTransform);
-    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;
@@ -1723,15 +1817,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);
@@ -1745,7 +1839,6 @@ void Rig::computeAvatarBoundingCapsule(
     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 = transformPoint(_geometryToRigTransform, (0.5f * (totalExtents.maximum + totalExtents.minimum)));
-    localOffsetOut = rigCenter - transformPoint(_geometryToRigTransform, rootPosition);
+    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 7e1504e461..18d49c5f1e 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -75,9 +75,10 @@ public:
         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 {
@@ -96,8 +97,8 @@ public:
         Hover
     };
 
-    Rig() {}
-    virtual ~Rig() {}
+    Rig();
+    virtual ~Rig();
 
     void destroyAnimGraph();
 
@@ -249,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);
@@ -257,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)
@@ -299,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,
@@ -368,6 +373,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 bc02da1cc4..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) {
@@ -160,6 +160,7 @@ AudioClient::AudioClient() :
     AbstractAudioInterface(),
     _gate(this),
     _audioInput(NULL),
+    _dummyAudioInput(NULL),
     _desiredInputFormat(),
     _inputFormat(),
     _numInputCallbackBytes(0),
@@ -226,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();
 
@@ -274,6 +280,7 @@ void AudioClient::cleanupBeforeQuit() {
 
     stop();
     _checkDevicesTimer->stop();
+    _checkPeakValuesTimer->stop();
     guard.trigger();
 }
 
@@ -315,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);
@@ -345,6 +350,8 @@ QString AudioClient::getWinDeviceName(wchar_t* guid) {
         deviceName = QString("NONE");
     } else {
         deviceName = ::getWinDeviceName(pEndpoint);
+        pEndpoint->Release();
+        pEndpoint = nullptr;
     }
     pMMDeviceEnumerator->Release();
     pMMDeviceEnumerator = nullptr;
@@ -428,6 +435,8 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
             deviceName = QString("NONE");
         } else {
             deviceName = getWinDeviceName(pEndpoint);
+            pEndpoint->Release();
+            pEndpoint = nullptr;
         }
         pMMDeviceEnumerator->Release();
         pMMDeviceEnumerator = NULL;
@@ -617,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) {
@@ -1125,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);
@@ -1401,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;
 
@@ -1423,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;
@@ -1473,6 +1503,11 @@ bool AudioClient::switchInputToAudioDevice(const QAudioDeviceInfo& inputDeviceIn
                 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) {
@@ -1480,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) {
@@ -1518,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
@@ -1564,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;
@@ -1668,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;
 }
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 1c26b1bb08..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>
@@ -148,6 +148,9 @@ public:
     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();
@@ -223,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();
@@ -241,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);
@@ -277,6 +288,7 @@ private:
 
     Mutex _injectorsMutex;
     QAudioInput* _audioInput;
+    QTimer* _dummyAudioInput;
     QAudioFormat _desiredInputFormat;
     QAudioFormat _inputFormat;
     QIODevice* _inputDevice;
@@ -296,6 +308,7 @@ private:
     std::atomic<bool> _localInjectorsAvailable { false };
     MixedProcessedAudioStream _receivedAudioStream;
     bool _isStereoInput;
+    std::atomic<bool> _enablePeakValues { false };
 
     quint64 _outputStarveDetectionStartTimeMsec;
     int _outputStarveDetectionCount;
@@ -350,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;
@@ -393,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/AudioDynamics.h b/libraries/audio/src/AudioDynamics.h
index 08daa21348..b7c168bfab 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
 //
@@ -394,19 +397,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 +464,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..13c794b923 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
 //
@@ -41,7 +42,7 @@ public:
 
         x <<= 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
     }
 };
 
@@ -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);
 }
 
 //
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/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index d775fe05f0..87d4a2d343 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -15,6 +15,7 @@
 #include <glm/gtx/transform.hpp>
 #include <glm/gtx/vector_query.hpp>
 
+#include <AvatarConstants.h>
 #include <shared/QtHelpers.h>
 #include <DeferredLightingEffect.h>
 #include <EntityTreeRenderer.h>
@@ -30,6 +31,7 @@
 #include <DebugDraw.h>
 #include <shared/Camera.h>
 #include <SoftAttachmentModel.h>
+#include <render/TransitionStage.h>
 
 #include "Logging.h"
 
@@ -61,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();
         }
@@ -105,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();
@@ -154,14 +156,14 @@ glm::vec3 Avatar::getNeckPosition() const {
 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
@@ -176,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;
@@ -363,7 +365,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.
@@ -421,7 +423,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) {
@@ -433,7 +435,7 @@ void Avatar::slamPosition(const glm::vec3& newPosition) {
 
 void Avatar::updateAttitude(const glm::quat& orientation) {
     _skeletonModel->updateAttitude(orientation);
-	_worldUpDirection = orientation * Vectors::UNIT_Y;
+    _worldUpDirection = orientation * Vectors::UNIT_Y;
 }
 
 void Avatar::applyPositionDelta(const glm::vec3& delta) {
@@ -493,6 +495,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) {
@@ -510,12 +554,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;
@@ -534,6 +578,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) {
@@ -605,12 +651,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) {
@@ -629,6 +673,8 @@ void Avatar::render(RenderArgs* renderArgs) {
 }
 
 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
@@ -637,6 +683,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()) {
@@ -645,6 +692,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);
     }
@@ -674,9 +727,9 @@ void Avatar::simulateAttachments(float deltaTime) {
         } else {
             if (_skeletonModel->getJointPositionInWorldFrame(jointIndex, jointPosition) &&
                 _skeletonModel->getJointRotationInWorldFrame(jointIndex, jointRotation)) {
-                model->setTranslation(jointPosition + jointRotation * attachment.translation * getUniformScale());
+                model->setTranslation(jointPosition + jointRotation * attachment.translation * getModelScale());
                 model->setRotation(jointRotation * attachment.rotation);
-                float scale = getUniformScale() * attachment.scale;
+                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);
@@ -836,7 +889,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;
@@ -934,14 +987,12 @@ 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 CONTROLLER_LEFTHAND_INDEX: {
             Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix());
@@ -974,14 +1025,12 @@ 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 CONTROLLER_LEFTHAND_INDEX: {
             Transform controllerLeftHandTransform = Transform(getControllerLeftHandMatrix());
@@ -1009,6 +1058,22 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
     }
 }
 
+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;
@@ -1097,7 +1162,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) {
@@ -1299,7 +1364,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());
@@ -1496,3 +1561,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), "getHeight", 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 2c75012209..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,7 +108,6 @@ 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); }
 
@@ -120,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;
@@ -149,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; }
@@ -230,6 +232,7 @@ public:
 
     void animateScaleChanges(float deltaTime);
     void setTargetScale(float targetScale) override;
+    float getTargetScale() const { return _targetScale; }
 
     Q_INVOKABLE float getSimulationRate(const QString& rateName = QString("")) const;
 
@@ -240,12 +243,28 @@ public:
     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
@@ -297,6 +316,8 @@ 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; }
     void measureMotionDerivatives(float deltaTime);
@@ -344,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;
 
@@ -353,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 c0d5fc07d7..eaa62ecb0a 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -121,7 +121,7 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
 void SkeletonModel::updateAttitude(const glm::quat& orientation) {
     setTranslation(_owningAvatar->getSkeletonPosition());
     setRotation(orientation * Quaternions::Y_180);
-    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale());
+    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),
@@ -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/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 9570056353..877bcd9353 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -91,6 +91,7 @@ AvatarData::AvatarData() :
     _targetVelocity(0.0f),
     _density(DEFAULT_AVATAR_DENSITY)
 {
+    connect(this, &AvatarData::lookAtSnappingChanged, this, &AvatarData::markIdentityDataChanged);
 }
 
 AvatarData::~AvatarData() {
@@ -102,7 +103,7 @@ 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;
 }
@@ -1173,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);
@@ -1192,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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "isJointDataValid", 
-            Q_RETURN_ARG(bool, result), Q_ARG(int, index));
-        return result;
-    }
+    QReadLocker readLock(&_jointDataLock);
     return index < _jointData.size();
 }
 
@@ -1220,75 +1209,63 @@ glm::quat AvatarData::getJointRotation(int index) const {
     if (index == -1) {
         return glm::quat();
     }
-    if (QThread::currentThread() != thread()) {
-        glm::quat result;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getJointRotation", 
-            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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getJointTranslation", 
-            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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getJointTranslation", 
-            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);
@@ -1302,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);
@@ -1316,31 +1289,32 @@ 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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "isJointDataValid", 
-            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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getJointRotation", 
-            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 {
@@ -1358,30 +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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "setJointRotations",
-                                  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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getJointTranslations",
-                                  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) {
@@ -1390,29 +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;
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "setJointTranslations",
-                                  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 {
@@ -1488,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;
@@ -1530,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
@@ -1561,7 +1527,9 @@ QByteArray AvatarData::identityByteArray(bool setIsReplicated) const {
             << _displayName
             << getSessionDisplayNameForTransport() // depends on _sessionDisplayName
             << (_isReplicated || setIsReplicated)
-            << _avatarEntityData;
+            << _avatarEntityData
+            << _lookAtSnappingEnabled
+        ;
     });
 
     return identityData;
@@ -2302,10 +2270,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()) {
@@ -2323,11 +2287,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;
@@ -2337,12 +2296,6 @@ void AvatarData::clearAvatarEntity(const QUuid& entityID) {
 
 AvatarEntityMap AvatarData::getAvatarEntityData() const {
     AvatarEntityMap result;
-    if (QThread::currentThread() != thread()) {
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getAvatarEntityData",
-                                  Q_RETURN_ARG(AvatarEntityMap, result));
-        return result;
-    }
-
     _avatarEntitiesLock.withReadLock([&] {
         result = _avatarEntityData;
     });
@@ -2361,10 +2314,6 @@ void AvatarData::setAvatarEntityData(const AvatarEntityMap& avatarEntityData) {
         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
@@ -2384,11 +2333,6 @@ void AvatarData::setAvatarEntityData(const AvatarEntityMap& avatarEntityData) {
 
 AvatarEntityIDs AvatarData::getAndClearRecentlyDetachedIDs() {
     AvatarEntityIDs result;
-    if (QThread::currentThread() != thread()) {
-        BLOCKING_INVOKE_METHOD(const_cast<AvatarData*>(this), "getAndClearRecentlyDetachedIDs",
-                                  Q_RETURN_ARG(AvatarEntityIDs, result));
-        return result;
-    }
     _avatarEntitiesLock.withWriteLock([&] {
         result = _avatarEntityDetached;
         _avatarEntityDetached.clear();
@@ -2401,6 +2345,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 0e936c49e0..89fe270af1 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -353,6 +353,7 @@ class AvatarData : public QObject, public SpatiallyNestable {
 
     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)
@@ -374,17 +375,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; }
@@ -516,18 +520,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();
 
@@ -544,7 +548,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; }
@@ -559,6 +563,7 @@ public:
         QString sessionDisplayName;
         bool isReplicated;
         AvatarEntityMap avatarEntityData;
+        bool lookAtSnappingEnabled;
     };
 
     // identityChanged returns true if identity has changed, false otherwise.
@@ -571,6 +576,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);
@@ -617,6 +623,7 @@ public:
 
     // 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;
 
@@ -662,13 +669,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;
@@ -730,6 +744,7 @@ protected:
     QVector<AttachmentData> _attachmentData;
     QString _displayName;
     QString _sessionDisplayName { };
+    bool _lookAtSnappingEnabled { true };
 
     QHash<QString, int> _fstJointIndices; ///< 1-based, since zero is returned for missing keys
     QStringList _fstJointNames; ///< in order of depth-first traversal
@@ -822,6 +837,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;
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..017f11c680
--- /dev/null
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -0,0 +1,832 @@
+//
+//  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 };
+                    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 (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;
+                            }
+
+
+                            // 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/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/display-plugins/src/display-plugins/CompositorHelper.cpp b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
index 29b8aee08b..2f57cc29d0 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
@@ -20,6 +20,7 @@
 #include <QtGui/QWindow>
 #include <QQuickWindow>
 
+#include <DebugDraw.h>
 #include <shared/QtHelpers.h>
 #include <ui/Menu.h>
 #include <NumericalConstants.h>
@@ -339,24 +340,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;
 }
 
@@ -438,7 +444,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;
@@ -452,3 +458,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..b1d2815f65 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.h
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
@@ -109,9 +109,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();
@@ -126,6 +127,7 @@ private:
 
     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 8d01539e8a..97b71b5780 100644
--- a/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/NullDisplayPlugin.h
@@ -19,6 +19,7 @@ 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 e1259fc5fc..98f4e04492 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -626,6 +626,12 @@ void OpenGLDisplayPlugin::compositeLayers() {
         compositeScene();
     }
 
+    // Clear the depth framebuffer after drawing the scene so that the HUD elements can depth test against each other
+    render([&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+        batch.setFramebuffer(_compositeFramebuffer);
+        batch.clearDepthFramebuffer((float) UINT32_MAX);
+    });
 
 #ifdef HIFI_ENABLE_NSIGHT_DEBUG
     if (false) // do not compositeoverlay if running nsight debug
@@ -635,16 +641,33 @@ void OpenGLDisplayPlugin::compositeLayers() {
         compositeOverlay();
     }
 
-    auto compositorHelper = DependencyManager::get<CompositorHelper>();
-    if (compositorHelper->getReticleVisible()) {
-        PROFILE_RANGE_EX(render_detail, "compositePointer", 0xff0077ff, (uint64_t)presentCount())
-        compositePointer();
+    // Only render HUD layer 3D overlays in HMD mode
+    if (isHmd()) {
+        PROFILE_RANGE_EX(render_detail, "compositeHUDOverlays", 0xff0077ff, (uint64_t)presentCount())
+        render([&](gpu::Batch& batch) {
+            batch.enableStereo(false);
+            batch.setFramebuffer(_compositeFramebuffer);
+        });
+        _gpuContext->executeBatch(_currentFrame->postCompositeBatch);
     }
 
     {
         PROFILE_RANGE_EX(render_detail, "compositeExtra", 0xff0077ff, (uint64_t)presentCount())
         compositeExtra();
     }
+
+    // Clear the depth buffer again and draw the pointer last so it's on top of everything
+    render([&](gpu::Batch& batch) {
+        batch.enableStereo(false);
+        batch.setFramebuffer(_compositeFramebuffer);
+        batch.clearDepthFramebuffer((float) UINT32_MAX);
+    });
+
+    auto compositorHelper = DependencyManager::get<CompositorHelper>();
+    if (compositorHelper->getReticleVisible()) {
+        PROFILE_RANGE_EX(render_detail, "compositePointer", 0xff0077ff, (uint64_t)presentCount())
+            compositePointer();
+    }
 }
 
 void OpenGLDisplayPlugin::internalPresent() {
@@ -775,6 +798,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();
@@ -851,7 +887,8 @@ OpenGLDisplayPlugin::~OpenGLDisplayPlugin() {
 void OpenGLDisplayPlugin::updateCompositeFramebuffer() {
     auto renderSize = getRecommendedRenderSize();
     if (!_compositeFramebuffer || _compositeFramebuffer->getSize() != renderSize) {
-        _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", gpu::Element::COLOR_RGBA_32, renderSize.x, renderSize.y));
+        auto depthFormat = gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::DEPTH_STENCIL);
+        _compositeFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("OpenGLDisplayPlugin::composite", gpu::Element::COLOR_RGBA_32, depthFormat, renderSize.x, renderSize.y));
     }
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index 2f93fa630d..51f4a33bbd 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -60,6 +60,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;
 
@@ -128,10 +129,10 @@ 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 };
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 b183850e7f..88ec94eefb 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
@@ -32,9 +32,6 @@
 
 #include "../Logging.h"
 #include "../CompositorHelper.h"
-#include <../render-utils/shaders/render-utils/glowLine_vert.h>
-#include <../render-utils/shaders/render-utils/glowLine_frag.h>
-
 
 static const QString MONO_PREVIEW = "Mono Preview";
 static const QString DISABLE_PREVIEW = "Disable Preview";
@@ -45,17 +42,10 @@ 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);
@@ -72,24 +62,9 @@ QRect HmdDisplayPlugin::getRecommendedOverlayRect() 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 +79,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 +106,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>();
-    };
-
 }
 
 void HmdDisplayPlugin::uncustomizeContext() {
@@ -157,10 +123,6 @@ void HmdDisplayPlugin::uncustomizeContext() {
     });
     _overlayRenderer = OverlayRenderer();
     _previewTexture.reset();
-    _handLaserUniforms[0].reset();
-    _handLaserUniforms[1].reset();
-    _extraLaserUniforms.reset();
-    _glowLinePipeline.reset();
     Parent::uncustomizeContext();
 }
 
@@ -383,132 +345,13 @@ void HmdDisplayPlugin::updateFrameData() {
         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() {
@@ -573,8 +416,8 @@ void HmdDisplayPlugin::OverlayRenderer::build() {
 }
 
 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";
+    static const QString vsFile = PathUtils::resourcesPath() + "/shaders/hmd_ui.vert";
+    static const QString fsFile = PathUtils::resourcesPath() + "/shaders/hmd_ui.frag";
 
 #if LIVE_SHADER_RELOAD
     static qint64 vsBuiltAge = 0;
@@ -598,7 +441,7 @@ void HmdDisplayPlugin::OverlayRenderer::updatePipeline() {
         this->uniformsLocation = program->getUniformBuffers().findLocation("overlayBuffer");
 
         gpu::StatePointer state = gpu::StatePointer(new gpu::State());
-        state->setDepthTest(gpu::State::DepthTest(false));
+        state->setDepthTest(gpu::State::DepthTest(false, 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);
@@ -665,84 +508,6 @@ void HmdDisplayPlugin::compositeOverlay() {
     _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);
-        }
-    });
-}
-
 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..db4e0ff7a1 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -27,8 +27,8 @@ 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(); }
@@ -37,9 +37,6 @@ public:
 
     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,7 +51,6 @@ protected:
     virtual void postPreview() {};
     virtual void updatePresentPose();
 
-    bool beginFrameRender(uint32_t frameIndex) override;
     bool internalActivate() override;
     void internalDeactivate() override;
     void compositeOverlay() override;
@@ -63,33 +59,6 @@ protected:
     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,12 +86,8 @@ 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;
 
@@ -140,14 +105,7 @@ private:
 
         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 {
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index d55352d31e..67fcc5cc69 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -26,25 +26,17 @@
 #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) :
@@ -53,25 +45,14 @@ 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;
 }
@@ -81,35 +62,29 @@ 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);
+    return renderable ? renderable->getRenderItemID() : 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);
+    DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(entitiesScriptEngineProvider);
 }
 
 void EntityTreeRenderer::clear() {
@@ -131,13 +106,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 {
@@ -154,7 +125,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);
         }
@@ -186,29 +159,127 @@ 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) {
+    // 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) {
+    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 });
+    }
+
+    // NOTE: Looping over all the entity renderers is likely to be a bottleneck in the future
+    // Currently, this is necessary because the model entity loading logic requires constant polling
+    // This was working fine because the entity server used to send repeated updates as your view changed,
+    // but with the improved entity server logic (PR 11141), updateInScene (below) would not be triggered enough
+    for (const auto& entry : _entitiesInScene) {
+        const auto& renderable = entry.second;
+        if (renderable) {
+            renderable->update(scene, transaction);
+        }
+    }
+    if (!_renderablesToUpdate.empty()) {
+        for (const auto& entry : _renderablesToUpdate) {
+            const auto& renderable = entry.second;
+            renderable->updateInScene(scene, transaction);
+        }
+        _renderablesToUpdate.clear();
+    }
+}
+
+void EntityTreeRenderer::update(bool simulate) {
     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();
+        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 holdingClickOnEntity(_currentClickingOnEntityID, _lastPointerEvent);
-            _entitiesScriptEngine->callEntityScriptMethod(_currentClickingOnEntityID, "holdingClickOnEntity", _lastPointerEvent);
+            // 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);
+            }
         }
 
+        {
+            PerformanceTimer sceneTimer("scene");
+            auto scene = _viewState->getMain3DScene();
+            if (scene) {
+                render::Transaction transaction;
+                {
+                    PerformanceTimer pt("add");
+                    addPendingEntities(scene, transaction);
+                }
+                {
+                    PerformanceTimer pt("change");
+                    updateChangedEntities(scene, transaction);
+                }
+                {
+                    PerformanceTimer pt("enqueue");
+                    scene->enqueueTransaction(transaction);
+                }
+            }
+        }
     }
-    deleteReleasedModels();
 }
 
 bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityItemID>* entitiesContainingAvatar) {
@@ -244,18 +315,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()) {
@@ -355,11 +421,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);
@@ -376,80 +443,6 @@ 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()) {
-        BLOCKING_INVOKE_METHOD(this, "allocateModel",
-                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()) {
-        BLOCKING_INVOKE_METHOD(this, "updateModel",
-            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);
@@ -530,11 +523,10 @@ void EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
     if (!_tree || _shuttingDown) {
         return;
     }
+
     PerformanceTimer perfTimer("EntityTreeRenderer::mousePressEvent");
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-
-    bool precisionPicking = !_dontDoPrecisionPicking;
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
     if (rayPickResult.intersects) {
         //qCDebug(entitiesrenderer) << "mousePressEvent over entity:" << rayPickResult.entityID;
 
@@ -579,11 +571,10 @@ void EntityTreeRenderer::mouseDoublePressEvent(QMouseEvent* event) {
     if (!_tree || _shuttingDown) {
         return;
     }
+
     PerformanceTimer perfTimer("EntityTreeRenderer::mouseDoublePressEvent");
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-
-    bool precisionPicking = !_dontDoPrecisionPicking;
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
     if (rayPickResult.intersects) {
         //qCDebug(entitiesrenderer) << "mouseDoublePressEvent over entity:" << rayPickResult.entityID;
 
@@ -622,8 +613,7 @@ void EntityTreeRenderer::mouseReleaseEvent(QMouseEvent* event) {
 
     PerformanceTimer perfTimer("EntityTreeRenderer::mouseReleaseEvent");
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-    bool precisionPicking = !_dontDoPrecisionPicking;
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::Lock, precisionPicking);
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
     if (rayPickResult.intersects) {
         //qCDebug(entitiesrenderer) << "mouseReleaseEvent over entity:" << rayPickResult.entityID;
 
@@ -671,14 +661,11 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
     if (!_tree || _shuttingDown) {
         return;
     }
+
     PerformanceTimer perfTimer("EntityTreeRenderer::mouseMoveEvent");
-
     PickRay ray = _viewState->computePickRay(event->x(), event->y());
-
-    bool precisionPicking = true; // for mouse moves we do precision picking
-    RayToEntityIntersectionResult rayPickResult = findRayIntersectionWorker(ray, Octree::TryLock, precisionPicking);
+    RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
     if (rayPickResult.intersects) {
-
         glm::vec2 pos2D = projectOntoEntityXYPlane(rayPickResult.entity, ray, rayPickResult);
         PointerEvent pointerEvent(PointerEvent::Move, MOUSE_POINTER_ID,
                                   pos2D, rayPickResult.intersection,
@@ -777,7 +764,12 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event) {
 }
 
 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;
     }
         
@@ -791,8 +783,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;
@@ -802,7 +795,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);
 }
 
@@ -811,32 +804,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);
 }
@@ -850,7 +821,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) {
@@ -861,9 +834,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; 
     }
@@ -963,7 +936,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);
@@ -1058,3 +1035,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..1b1d46d50c 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,6 +108,14 @@ 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);
@@ -130,7 +146,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 +158,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 +183,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 +257,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..ea514d3181 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@@ -10,64 +10,61 @@
 //
 
 
-#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) {
+
+
+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 +74,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 +95,294 @@ 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) {
+    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::update(const ScenePointer& scene, Transaction& transaction) {
+    if (!isValidRenderItem()) {
+        return;
+    }
+
+    if (!needsUpdate()) {
+        return;
+    }
+
+    doUpdate(scene, transaction, _entity);
+}
+
+//
+// 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 needs to have update called
+bool EntityRenderer::needsUpdate() const {
+    return needsUpdateFromEntity(_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::doRenderUpdateAsynchronous(const EntityItemPointer& entity) {
+    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..56cb39252f 100644
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@@ -18,115 +18,191 @@
 #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);
+
+    virtual void update(const ScenePointer& scene, Transaction& transaction);
+
+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;
+
+    // Returns true if the item in question needs to have update called
+    virtual bool needsUpdate() const;
+
+    // Returns true if the item in question needs to have update called because of changes in the entity
+    virtual bool needsUpdateFromEntity(const EntityItemPointer& entity) const { return false; }
+
+    // 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);
+
+    virtual void doUpdate(const ScenePointer& scene, Transaction& transaction, 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;
+
     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 };
+    quint64 _fadeStartTime{ usecTimestampNow() };
+    bool _isFading{ _entitiesShouldFadeFunction() };
+    bool _prevIsTransparent { false };
+    Transform _modelTransform;
+    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 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::needsUpdateFromEntity;
+    // Returns true if the item in question needs to have update called because of changes in the entity
+    virtual bool needsUpdateFromEntity(const EntityItemPointer& entity) const override final {
+        if (Parent::needsUpdateFromEntity(entity)) {
+            return true;
+        }
+        return needsUpdateFromTypedEntity(_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 doUpdate(const ScenePointer& scene, Transaction& transaction, const EntityItemPointer& entity) override final {
+        Parent::doUpdate(scene, transaction, entity);
+        doUpdateTyped(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 bool needsUpdateFromTypedEntity(const TypedEntityPointer& entity) const { return false; }
+    virtual void doUpdateTyped(const ScenePointer& scene, Transaction& transaction, 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..ca6ad5a32b 100644
--- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
@@ -9,57 +9,52 @@
 //  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;
     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 911fdf4184..d1e47fd906 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -9,30 +9,55 @@
 //  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()) };
@@ -41,73 +66,21 @@ EntityItemPointer RenderableModelEntityItem::factory(const EntityItemID& entityI
 }
 
 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"
@@ -120,488 +93,122 @@ 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() {
+    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());
+    model->setScaleToFit(true, getDimensions());
+    model->setSnapModelToRegistrationPoint(true, getRegistrationPoint());
+    model->setRotation(getRotation());
+    model->setTranslation(getPosition());
     {
-        PerformanceTimer perfTimer("_model->simulate");
-        _model->simulate(0.0f);
+        PerformanceTimer perfTimer("model->simulate");
+        model->simulate(0.0f);
     }
     _needsInitialSimulation = false;
 }
 
-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;
+void RenderableModelEntityItem::autoResizeJointArrays() {
+    ModelPointer model = getModel();
+    if (model && model->isLoaded() && !_needsInitialSimulation) {
+        resizeJointArrays(model->getJointStateCount());
     }
 }
 
-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::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 {
+    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 (isMovingRelativeToParent() || 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 false;
 }
 
 void RenderableModelEntityItem::updateModelBounds() {
-    if (!hasModel() || !_model) {
-        return;
-    }
-    if (!_dimensionsInitialized || !_model->isActive()) {
-        return;
-    }
-
-    bool movingOrAnimating = isMovingRelativeToParent() || isAnimatingSomething();
-    glm::vec3 dimensions = getDimensions();
-    bool success;
-    auto transform = getTransform(success);
-
-    if (movingOrAnimating ||
-         _needsInitialSimulation ||
-         _needsJointSimulation ||
-         _model->getTranslation() != transform.getTranslation() ||
-         _model->getScaleToFitDimensions() != dimensions ||
-         _model->getRotation() != transform.getRotation() ||
-         _model->getRegistrationPoint() != getRegistrationPoint()) {
+    if (needsUpdateModelBounds()) {
         doInitialModelSimulation();
         _needsJointSimulation = false;
     }
 }
 
 
-// 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();
-    }
-
-    // this simple logic should say we set showingEntityHighlight to true whenever we are in marketplace mode and we have a marketplace id, or
-    // whenever we are not set to none and shouldHighlight is true.
-    bool showingEntityHighlight = ((bool)(args->_outlineFlags & (int)RenderArgs::RENDER_OUTLINE_MARKETPLACE_MODE) && getMarketplaceID().length() != 0) ||
-                                  (args->_outlineFlags != RenderArgs::RENDER_OUTLINE_NONE && getShouldHighlight());
-    if (showingEntityHighlight) {
-        static glm::vec4 yellowColor(1.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, yellowColor);
-        }
-    }
-
-    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);
+        }
     }
 
 
@@ -610,20 +217,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);
 }
 
@@ -654,59 +262,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();
+                    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;
 }
@@ -717,12 +313,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();
@@ -798,27 +395,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));
@@ -826,7 +423,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 {
@@ -842,7 +439,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;
@@ -1056,7 +653,8 @@ void RenderableModelEntityItem::setCollisionShape(const btCollisionShape* shape)
 }
 
 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));
     }
 
@@ -1064,11 +662,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();
@@ -1076,9 +675,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;
         }
     }
@@ -1086,9 +686,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;
         }
     }
@@ -1096,10 +697,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);
@@ -1125,10 +727,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) {
@@ -1155,9 +758,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;
         }
     }
@@ -1165,9 +769,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;
         }
     }
@@ -1175,34 +780,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;
@@ -1228,45 +837,25 @@ void RenderableModelEntityItem::setJointTranslationsSet(const QVector<bool>& tra
     _needsJointSimulation = true;
 }
 
-
 void RenderableModelEntityItem::locationChanged(bool tellPhysics) {
     PerformanceTimer pertTimer("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);
@@ -1275,14 +864,456 @@ 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;
+            }
+        }
+    });
+}
+
+bool RenderableModelEntityItem::isAnimatingSomething() const {
+    return !getAnimationURL().isEmpty() && getAnimationIsPlaying() && getAnimationFPS() != 0.0f;
+}
+
+using namespace render;
+using namespace render::entities;
+
+ItemKey ModelEntityRenderer::getKey() {
+    return ItemKey::Builder().withTypeMeta();
+}
+
+uint32_t ModelEntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) { 
+    if (_model) {
+        auto metaSubItems = _model->fetchRenderItemIDs();
+        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::needsUpdate() const {
+    ModelPointer model;
+    withReadLock([&] {
+        model = _model;
+    });
+
+    if (_modelJustLoaded) {
+        return true;
+    }
+
+    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;
+        }
+    }
+    return Parent::needsUpdate();
+}
+
+bool ModelEntityRenderer::needsUpdateFromTypedEntity(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::doUpdateTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) {
+    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(); });
+        }
+        return;
+    }
+
+    _modelJustLoaded = false;
+    // Check for addition
+    if (_hasModel && !(bool)_model) {
+        model = std::make_shared<Model>(nullptr, entity.get());
+        connect(model.get(), &Model::setURLFinished, this, &ModelEntityRenderer::handleModelLoaded);
+        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;
+        }
+    }
+
+    if (entity->needsUpdateModelBounds()) {
+        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);
+    }
+
+    //entity->doInitialModelSimulation();
+    if (model->needsFixupInScene()) {
+        model->removeFromScene(scene, transaction);
+        render::Item::Status::Getters statusGetters;
+        makeStatusGetters(entity, statusGetters);
+        model->addToScene(scene, transaction, statusGetters);
+    }
+
+    // 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();
+    }
+
+    // make a copy of the animation properites
+    auto newAnimationProperties = entity->getAnimationProperties();
+    if (newAnimationProperties != _renderAnimationProperties) {
+        withWriteLock([&] {
+            _renderAnimationProperties = newAnimationProperties;
+            _currentFrame = _renderAnimationProperties.getCurrentFrame();
+        });
+    }
+
+    if (_animating) {
+        if (!jointsMapped()) {
+            mapJoints(entity, model->getJointNames());
+        }
+        animate(entity);
+    }
+}
+
+void ModelEntityRenderer::handleModelLoaded(bool success) {
+    if (success) {
+        _modelJustLoaded = true;
+    }
+}
+
+// NOTE: this only renders the "meta" portion of the Model, namely it renders debugging items
+void ModelEntityRenderer::doRender(RenderArgs* args) {
+    PROFILE_RANGE(render_detail, "MetaModelRender");
+    PerformanceTimer perfTimer("RMEIrender");
+
+    ModelPointer model;
+    withReadLock([&]{
+        model = _model;
+    });
+
+    if (_model && _model->didVisualGeometryRequestFail()) {
+        static glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f);
+        gpu::Batch& batch = *args->_batch;
+        batch.setModelTransform(_modelTransform); // 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();
+
+#if 0
+    // 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 = _entity->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);
+        }
+    }
+#endif
+}
+
+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()) {
@@ -1294,15 +1325,7 @@ void RenderableModelEntityItem::mapJoints(const QStringList& modelJointNames) {
                 _jointMapping[i] = animationJointNames.indexOf(modelJointNames[i]);
             }
             _jointMappingCompleted = true;
-            _jointMappingURL = _animationProperties.getURL();
         }
     }
 }
 
-bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
-    if (!_model || !_model->isLoaded()) {
-        return false;
-    }
-    BLOCKING_INVOKE_METHOD(_model.get(), "getMeshes", Q_RETURN_ARG(MeshProxyList, result));
-    return !result.isEmpty();
-}
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.h b/libraries/entities-renderer/src/RenderableModelEntityItem.h
index a5ba7bedda..ad0afeee0a 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.h
@@ -12,58 +12,68 @@
 #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 {
+    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,66 +99,91 @@ 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(); }
-
-    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;
-    }
-
     bool getMeshes(MeshProxyList& result) override;
 
 private:
-    QVariantMap parseTexturesToMap(QString textures);
-    void remapTextures();
+    bool needsUpdateModelBounds() const;
+    bool isAnimatingSomething() const;
+    void autoResizeJointArrays();
+    void copyAnimationJointDataToModel();
 
     void getCollisionGeometryResource();
     GeometryResource::Pointer _compoundShapeResource;
-    ModelPointer _model = nullptr;
-    bool _needsInitialSimulation = true;
-    bool _needsModelReload = true;
-    QSharedPointer<EntityTreeRenderer> _myRenderer;
-    QString _lastTextures;
-    QVariantMap _currentTextures;
+    bool _originalTexturesRead { false };
     QVariantMap _originalTextures;
-    bool _originalTexturesRead = false;
-    bool _dimensionsInitialized = true;
-
-    AnimationPropertyGroup _renderAnimationProperties;
-
-    render::ItemID _myMetaItem{ render::Item::INVALID_ITEM_ID };
-
-    bool getAnimationFrame();
-
+    bool _dimensionsInitialized { true };
     bool _needsJointSimulation { false };
     bool _showCollisionGeometry { 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 needsUpdateFromTypedEntity(const TypedEntityPointer& entity) const override;
+    virtual bool needsUpdate() const override;
+    virtual void doRender(RenderArgs* args) override;
+    virtual void doUpdateTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override;
+
+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 _modelJustLoaded { false };
+    bool _hasModel { false };
+    ::ModelPointer _model;
+    GeometryResource::Pointer _compoundShapeResource;
+    QString _lastTextures;
+    QVariantMap _currentTextures;
+    AnimationPropertyGroup _renderAnimationProperties;
+    int _lastKnownCurrentFrame { -1 };
+#ifdef MODEL_ENTITY_USE_FADE_EFFECT
+    bool _hasTransitioned{ false };
+#endif
+
+    bool _needsJointSimulation{ false };
+    bool _showCollisionGeometry{ 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 };
+
+private slots:
+    void handleModelLoaded(bool success);
 };
 
+} } // namespace 
+
 #endif // hifi_RenderableModelEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
index a3c0d9877e..3328076911 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
@@ -8,163 +8,30 @@
 //  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 <render/ShapePipeline.h>
-#include <StencilMaskPass.h>
-#include <AbstractViewStateInterface.h>
-#include "EntitiesRendererLogging.h"
-
 #include "RenderableParticleEffectEntityItem.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;
 
-    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);
-        }
-    }
-
-    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);
-    }
-
-    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 {
-
-        gpu::Batch& batch = *args->_batch;
-
-        if (_texture) {
-            batch.setResourceTexture(0, _texture);
-        } else {
-            batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
-        }
-
-        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;
-    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);
-        }
-    }
-    template <>
-    const ShapeKey shapeGetShapeKey(const ParticlePayloadData::Pointer& payload) {
-        return render::ShapeKey::Builder().withCustom(ParticlePayloadData::CUSTOM_PIPELINE_NUMBER).withTranslucent().build();
-    }
-}
-
-uint8_t ParticlePayloadData::CUSTOM_PIPELINE_NUMBER = 0;
-
-std::weak_ptr<gpu::Pipeline> ParticlePayloadData::_texturedPipeline;
-
-render::ShapePipelinePointer ParticlePayloadData::shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key) {
+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);
+            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));
@@ -173,154 +40,291 @@ render::ShapePipelinePointer ParticlePayloadData::shapePipelineFactory(const ren
         auto program = gpu::Shader::createProgram(vertShader, fragShader);
         _texturedPipeline = texturedPipeline = gpu::Pipeline::create(program, state);
     }
-    
+
     return std::make_shared<render::ShapePipeline>(texturedPipeline, nullptr, nullptr, nullptr);
 }
 
-EntityItemPointer RenderableParticleEffectEntityItem::factory(const EntityItemID& entityID,
-                                                              const EntityItemProperties& properties) {
-    auto entity = std::make_shared<RenderableParticleEffectEntityItem>(entityID);
-    entity->setProperties(properties);
-
-    // As we create the first ParticuleSystem entity, let s register its special shapePIpeline factory:
-    ParticlePayloadData::registerShapePipeline();
-
-    return entity;
-}
-
-RenderableParticleEffectEntityItem::RenderableParticleEffectEntityItem(const EntityItemID& entityItemID) :
-    ParticleEffectEntityItem(entityItemID) {
-}
-
-bool RenderableParticleEffectEntityItem::addToScene(const EntityItemPointer& self,
-                                                    const render::ScenePointer& scene,
-                                                    render::Transaction& transaction) {
-    _scene = scene;
-    _renderItemId = _scene->allocateID();
-    auto particlePayloadData = std::make_shared<ParticlePayloadData>();
-    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);
+struct GpuParticle {
+    GpuParticle(const glm::vec3& xyzIn, const glm::vec2& uvIn) : xyz(xyzIn), uv(uvIn) {}
+    glm::vec3 xyz; // Position
+    glm::vec2 uv; // Lifetime + seed
 };
 
-void RenderableParticleEffectEntityItem::update(const quint64& now) {
-    ParticleEffectEntityItem::update(now);
+using GpuParticles = std::vector<GpuParticle>;
 
-    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;
-    }
+ParticleEffectEntityRenderer::ParticleEffectEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
+    ParticleUniforms uniforms;
+    _uniformBuffer = std::make_shared<Buffer>(sizeof(ParticleUniforms), (const gpu::Byte*) &uniforms);
 
-    updateRenderItem();
+    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);
+    });
 }
 
-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);
-        });
+bool ParticleEffectEntityRenderer::needsRenderUpdateFromTypedEntity(const TypedEntityPointer& entity) const {
+    entity->checkAndMaybeUpdateQueryAACube();
         
-        _scene->enqueueTransaction(transaction);
-        return;
+    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";
+        }
     }
     
-    using ParticleUniforms = ParticlePayloadData::ParticleUniforms;
-    using ParticlePrimitive = ParticlePayloadData::ParticlePrimitive;
-    using ParticlePrimitives = ParticlePayloadData::ParticlePrimitives;
+    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 ParticleEffectEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
     // 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));
+    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;
     }
 
-    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);
-    }
+    // 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;
 
-    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());
+    } 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
 
-        // Update transform and bounds
-        payload.setModelTransform(transform);
-        payload.setBound(bounds);
+        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());
 
-        if (_texture && _texture->isLoaded()) {
-            payload.setTexture(_texture->getGPUTexture());
+        float azimuth;
+        if (azimuthFinish >= azimuthStart) {
+            azimuth = azimuthStart + (azimuthFinish - azimuthStart) *  randFloat();
         } else {
-            payload.setTexture(nullptr);
+            azimuth = azimuthStart + (TWO_PI + azimuthFinish - azimuthStart) * randFloat();
         }
-    });
 
-    _scene->enqueueTransaction(transaction);
+        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 RenderableParticleEffectEntityItem::notifyBoundChanged() {
-    if (!render::Item::isValidID(_renderItemId)) {
+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()) {
+        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 = _modelTransform;
+        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 b0d7e1c920..be2641c0c9 100644
--- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h
@@ -11,37 +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;
 
-    render::ScenePointer _scene;
-    render::ItemID _renderItemId{ render::Item::INVALID_ITEM_ID };
-    
-    NetworkTexturePointer _texture;
+    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..8c1a6318f9 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,233 @@
 #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));
+    });
+
     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()
+    );
+}
 
-        _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);
+        }
+    }
+
+    if (!_texture || _texture->getURL() != entityTextures) {
+        _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();
+    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 (pointsChanged || strokeWidthsChanged || normalsChanged) {
+        _empty = std::min(_lastPoints.size(), std::min(_lastNormals.size(), _lastStrokeWidths.size())) < 2;
+        if (!_empty) {
+            updateGeometry(updateVertices(_lastPoints, _lastNormals, _lastStrokeWidths));
+        }
+    }
+}
+
+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) {
     // 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);
+    float uCoordInc = 1.0f / size;
+    float uCoord = 0.0f;
+    int finalIndex = size - 1;
+    glm::vec3 binormal;
+    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);
 
-        tangent = _points.at(i);
+        // 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;
 
-        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;
+            // 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;
+
+        const auto v1 = point + binormal;
+        const auto v2 = point - binormal;
+        vertices.emplace_back(v1, normal, vec2(uCoord, 0.0f));
+        vertices.emplace_back(v2, normal, vec2(uCoord, 1.0f));
+        uCoord += uCoordInc;
     }
 
-    // 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;
-
-
+    return vertices;
 }
 
-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();
-        }
-    }
-
-}
-
-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);
 
+    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);
-};
+}
diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
index 8a62a761e0..610ee53cf7 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@@ -12,47 +12,52 @@
 #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) : position(position), normal(normal), uv(uv) {}
+        vec3 position;
+        vec3 normal;
+        vec2 uv;
+    };
+
+    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);
+
+    Transform _polylineTransform;
+    QVector<glm::vec3> _lastPoints;
+    QVector<glm::vec3> _lastNormals;
+    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;
 };
 
+} } // namespace 
 
 #endif // hifi_RenderablePolyLineEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
index 6687d4e721..4c254980c4 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,6 +72,10 @@
 #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"
 
@@ -104,35 +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) };
     entity->setProperties(properties);
-    std::static_pointer_cast<RenderablePolyVoxEntityItem>(entity)->initializePolyVox();
-
-    // As we create the first Polyvox entity, let's register its special shapePipeline factory:
-    PolyVoxPayload::registerShapePipeline();
-
+    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,209 +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 (!_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;
-
-    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 = args->_shapePipeline->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);
-}
-
-uint8_t PolyVoxPayload::CUSTOM_PIPELINE_NUMBER = 0;
-
-std::shared_ptr<gpu::Pipeline> PolyVoxPayload::_pipeline;
-std::shared_ptr<gpu::Pipeline> PolyVoxPayload::_wireframePipeline;
-
-render::ShapePipelinePointer PolyVoxPayload::shapePipelineFactory(const render::ShapePlumber& plumber, const render::ShapeKey& key) {
-   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"), PolyVoxPayload::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 (key.isWireframe()) {    
-        return std::make_shared<render::ShapePipeline>(_wireframePipeline, nullptr, nullptr, nullptr);
-    } else {
-        return std::make_shared<render::ShapePipeline>(_pipeline, nullptr, nullptr, nullptr);
-    }
-}
-
-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);
-        }
-    }
-
-   template <> const ShapeKey shapeGetShapeKey(const PolyVoxPayload::Pointer& payload) {
-        return ShapeKey::Builder().withCustom(PolyVoxPayload::CUSTOM_PIPELINE_NUMBER).build();
-   }
-}
-
-
-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
@@ -925,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;
     }
 
@@ -1027,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++;
@@ -1069,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;
@@ -1082,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);
@@ -1097,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;
     });
 }
@@ -1143,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;
         }
 
@@ -1224,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();
                     }
@@ -1239,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();
                     }
@@ -1254,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();
@@ -1368,6 +1149,8 @@ void RenderablePolyVoxEntityItem::setMesh(model::MeshPointer mesh) {
     if (neighborsNeedUpdate) {
         bonkNeighbors();
     }
+
+    somethingChangedNotification();
 }
 
 void RenderablePolyVoxEntityItem::computeShapeInfoWorker() {
@@ -1440,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;
@@ -1629,19 +1416,6 @@ void RenderablePolyVoxEntityItem::bonkNeighbors() {
     }
 }
 
-void RenderablePolyVoxEntityItem::locationChanged(bool tellPhysics) {
-    EntityItem::locationChanged(tellPhysics);
-    if (!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;
@@ -1671,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 8f20a7a298..fc12a2b5ee 100644
--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h
@@ -19,77 +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:
+namespace render { namespace entities {
+class PolyVoxEntityRenderer;
+} } 
 
-    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);
-        }
-    }
-    
-    static const int MATERIAL_GPU_SLOT = 3;
-    static std::shared_ptr<gpu::Pipeline> _pipeline;
-    static std::shared_ptr<gpu::Pipeline> _wireframePipeline;
+class RenderablePolyVoxEntityItem : public PolyVoxEntityItem {
+    friend class render::entities::PolyVoxEntityRenderer;
 
-    PolyVoxPayload(EntityItemPointer owner) : _owner(owner), _bounds(AABox()) { }
-    typedef render::Payload<PolyVoxPayload> Payload;
-    typedef Payload::DataPointer Pointer;
-
-    EntityItemPointer _owner;
-    AABox _bounds;
-};
-
-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);
-   template <> const ShapeKey shapeGetShapeKey(const PolyVoxPayload::Pointer& payload);
-}
-
-
-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;
@@ -100,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;
@@ -148,59 +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;
-
-    render::ItemID _myItem{ render::Item::INVALID_ITEM_ID };
-
-    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;
@@ -208,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 3f9497741f..8fcf2c090d 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,6 +19,13 @@
 #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;
@@ -41,173 +47,118 @@ static std::array<GeometryCache::Shape, entity::NUM_SHAPES> MAPPING { {
     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);
-}
-
-EntityItemPointer RenderableShapeEntityItem::boxFactory(const EntityItemID& entityID, const EntityItemProperties& properties) {
-    auto result = baseFactory(entityID, properties);
-    result->setShape(entity::Cube);
-    return result;
-}
-
-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);
-        }
-    }
-}
-
-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 RenderableShapeEntityItem::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:
-        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::Cylinder: {
-            _collisionShapeType = SHAPE_TYPE_CYLINDER_Y;
-            // TODO WL21389: determine if rotation is axis-aligned
-            //const Transform::Quat & rot = _transform.getRotation();
-
-            // TODO WL21389: some way to tell apart SHAPE_TYPE_CYLINDER_Y, _X, _Z based on rotation and
-            //       hull ( or dimensions, need circular cross section)
-            // Should allow for minor variance along axes?
-
-        }
-        break;
-        case entity::Shape::Triangle:
-        case entity::Shape::Hexagon:
-        case entity::Shape::Octagon:
-        case entity::Shape::Circle:
-        case entity::Shape::Tetrahedron:
-        case entity::Shape::Octahedron:
-        case entity::Shape::Dodecahedron:
-        case entity::Shape::Icosahedron:
-        case entity::Shape::Cone: {
-            //TODO WL21389: SHAPE_TYPE_SIMPLE_HULL and pointCollection (later)
-            _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
-        }
-        break;
-        case entity::Shape::Torus:
-        {
-            // Not in GeometryCache::buildShapes, unsupported.
-            _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
-            //TODO WL21389: SHAPE_TYPE_SIMPLE_HULL and pointCollection (later if desired support)
-        }
-        break;
-        default:{
-            _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
-        }
-        break;
+bool ShapeEntityRenderer::needsRenderUpdate() const {
+    if (_procedural.isEnabled() && _procedural.isFading()) {
+        return true;
     }
 
-    EntityItem::computeShapeInfo(info);
+    return Parent::needsRenderUpdate();
 }
 
-// This value specifes how the shape should be treated by physics calculations.
-ShapeType RenderableShapeEntityItem::getShapeType() const {
-    return _collisionShapeType;
+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;
+    }
+
+    return false;
 }
 
-void RenderableShapeEntityItem::render(RenderArgs* args) {
+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());
+    });
+}
+
+void ShapeEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    if (_procedural.isEnabled() && _procedural.isFading()) {
+        float isFading = Interpolate::calculateFadeRatio(_procedural.getFadeStartTime()) < 1.0f;
+        _procedural.setIsFading(isFading);
+    }
+
+    _shape = entity->getShape();
+    _position = entity->getPosition();
+    _dimensions = entity->getDimensions();
+    _orientation = entity->getOrientation();
+
+    if (_shape == entity::Sphere) {
+        _modelTransform.postScale(SPHERE_ENTITY_SCALE);
+    }
+
+    _modelTransform.postScale(_dimensions);
+}
+
+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 geometryShape = MAPPING[_shape];
+    batch.setModelTransform(_modelTransform); // use a transform with scale, rotation, registration point and translation
+
+    bool proceduralRender = false;
+    glm::vec4 outColor = _color;
+    withReadLock([&] {
+        if (_procedural.isReady()) {
+            _procedural.prepare(batch, _position, _dimensions, _orientation);
+            auto 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]);
+            DependencyManager::get<GeometryCache>()->renderWireShape(batch, geometryShape);
         } else {
-            DependencyManager::get<GeometryCache>()->renderShape(batch, MAPPING[_shape]);
+            DependencyManager::get<GeometryCache>()->renderShape(batch, geometryShape);
         }
     } else {
         // FIXME, support instanced multi-shape rendering using multidraw indirect
-        color.a *= _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
+        _color.a *= _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) : 1.0f;
         auto geometryCache = DependencyManager::get<GeometryCache>();
-        auto pipeline = color.a < 1.0f ? geometryCache->getTransparentShapePipeline() : geometryCache->getOpaqueShapePipeline();
-        
+        auto pipeline = _color.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, _color, pipeline);
         } else {
-            geometryCache->renderSolidShapeInstance(args, batch, MAPPING[_shape], color, pipeline);
+            geometryCache->renderSolidShapeInstance(args, batch, geometryShape, _color, pipeline);
         }
     }
 
-    static const auto triCount = DependencyManager::get<GeometryCache>()->getShapeTriangleCount(MAPPING[_shape]);
+    static const auto triCount = DependencyManager::get<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 d603cdedef..f0af5b917a 100644
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@@ -9,39 +9,35 @@
 #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;
-
-    virtual void computeShapeInfo(ShapeInfo& info) override;
-    ShapeType getShapeType() const 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;
 
-    //! 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 };
-
-    SIMPLE_RENDERABLE();
+    Procedural _procedural;
+    QString _lastUserData;
+    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..b4c64aed6f 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,16 @@ 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()) {
+    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 +110,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 ba8e0c18e7..0561fa5130 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -8,28 +8,31 @@
 
 #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 +43,163 @@ 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() {
+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;
+    }
+
+    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) {
+    // 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();
+
+    glm::vec2 windowSize = getWindowSize(entity);
+    _webSurface->resize(QSize(windowSize.x, windowSize.y));
+}
+
+void WebEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    Parent::doRenderUpdateAsynchronousTyped(entity);
+    _modelTransform.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;
+    batch.setModelTransform(_modelTransform);
+    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 resultWithReadLock<bool>([&] { 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,72 +211,106 @@ bool RenderableWebEntityItem::buildWebSurface() {
             }
         });
     };
-    _webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), deleter);
+
+    {
+        QSharedPointer<OffscreenQmlSurface> webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), deleter);
+        webSurface->create();
+        withWriteLock([&] {
+            _webSurface = webSurface;
+        });
+    }
 
     // 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);
+        if (entityItemID == entity->getID()) {
+            handlePointerEvent(entity, event);
         }
     };
 
     auto renderer = DependencyManager::get<EntityTreeRenderer>();
-    _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) {
+    QObject::connect(renderer.data(), &EntityTreeRenderer::mousePressOnEntity, this, forwardPointerEvent);
+    QObject::connect(renderer.data(), &EntityTreeRenderer::mouseReleaseOnEntity, this, forwardPointerEvent);
+    QObject::connect(renderer.data(), &EntityTreeRenderer::mouseMoveOnEntity, this, forwardPointerEvent);
+    QObject::connect(renderer.data(), &EntityTreeRenderer::hoverLeaveEntity, this,
+        [=](const EntityItemID& entityItemID, const PointerEvent& event) {
+        if (this->_pressed && entity->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);
+            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);
+                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();
+        auto renderer = DependencyManager::get<EntityTreeRenderer>();
+        if (renderer) {
+            QObject::disconnect(renderer.data(), &EntityTreeRenderer::mousePressOnEntity, this, nullptr);
+            QObject::disconnect(renderer.data(), &EntityTreeRenderer::mouseReleaseOnEntity, this, nullptr);
+            QObject::disconnect(renderer.data(), &EntityTreeRenderer::mouseMoveOnEntity, this, nullptr);
+            QObject::disconnect(renderer.data(), &EntityTreeRenderer::hoverLeaveEntity, this, nullptr);
+        }
+        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;
@@ -174,142 +321,43 @@ glm::vec2 RenderableWebEntityItem::getWindowSize() const {
     return dims;
 }
 
-void RenderableWebEntityItem::render(RenderArgs* args) {
-    checkFading();
+void WebEntityRenderer::loadSourceURL() {
+    withWriteLock([&] {
+        const QUrl sourceUrl(_lastSourceUrl);
+        if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
+            _lastSourceUrl.toLower().endsWith(".htm") || _lastSourceUrl.toLower().endsWith(".html")) {
+            _contentType = htmlContent;
+            _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "qml/controls/"));
 
-    #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) {
-        if (!buildWebSurface()) {
-            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);
-    if (sourceUrl.scheme() == "http" || sourceUrl.scheme() == "https" ||
-        _sourceUrl.toLower().endsWith(".htm") || _sourceUrl.toLower().endsWith(".html")) {
-        _contentType = htmlContent;
-        _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "qml/controls/"));
-
-        // We special case YouTube URLs since we know they are videos that we should play with at least 30 FPS.
-        if (sourceUrl.host().endsWith("youtube.com", Qt::CaseInsensitive)) {
-            _webSurface->setMaxFps(YOUTUBE_MAX_FPS);
-        } else {
-            _webSurface->setMaxFps(DEFAULT_MAX_FPS);
-        }
-
-        _webSurface->load("WebEntityView.qml");
-        _webSurface->getRootItem()->setProperty("url", _sourceUrl);
-        _webSurface->getSurfaceContext()->setContextProperty("desktop", QVariant());
-
-    } else {
-        _contentType = qmlContent;
-        _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath()));
-        _webSurface->load(_sourceUrl, [&](QQmlContext* context, QObject* obj) {});
-
-        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);
+            // We special case YouTube URLs since we know they are videos that we should play with at least 30 FPS.
+            if (sourceUrl.host().endsWith("youtube.com", Qt::CaseInsensitive)) {
+                _webSurface->setMaxFps(YOUTUBE_MAX_FPS);
+            } else {
+                _webSurface->setMaxFps(DEFAULT_MAX_FPS);
             }
-        });
-    }
+
+            _webSurface->load("WebEntityView.qml", [this](QQmlContext* context, QObject* item) {
+                item->setProperty("url", _lastSourceUrl);
+            });
+        } else {
+            _contentType = qmlContent;
+            _webSurface->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath()));
+            _webSurface->load(_lastSourceUrl);
+            if (_webSurface->getRootItem() && _webSurface->getRootItem()->objectName() == "tabletRoot") {
+                auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+                tabletScriptingInterface->setQmlTabletRoot("com.highfidelity.interface.tablet.system", _webSurface.data());
+            }
+        }
+    });
 }
 
-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 TypedEntityPointer& entity, const PointerEvent& event) {
     // Ignore mouse interaction if we're locked
-    if (getLocked() || !_webSurface) {
+    if (entity->getLocked() || !_webSurface) {
         return;
     }
 
-    glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * _dpi);
+    glm::vec2 windowPos = event.getPos2D() * (METERS_TO_INCHES * entity->getDPI());
     QPointF windowPoint(windowPos.x, windowPos.y);
     if (event.getType() == PointerEvent::Move) {
         // Forward a mouse move event to webSurface
@@ -328,19 +376,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;
@@ -362,71 +410,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 a2318081b6..a67eb39670 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.h
@@ -9,76 +9,66 @@
 #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> {
+    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;
+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 doRenderUpdateAsynchronousTyped(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:
+    void onTimeout();
+    bool buildWebSurface(const TypedEntityPointer& entity);
+    void destroyWebSurface();
+    bool hasWebSurface();
+    void loadSourceURL();
+    glm::vec2 getWindowSize(const TypedEntityPointer& entity) const;
+    void handlePointerEvent(const TypedEntityPointer& entity, const PointerEvent& event);
 
 private:
-    bool buildWebSurface();
-    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;
 
+    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;
+    QTimer _timer;
+    uint64_t _lastRenderTime { 0 };
 };
 
+} } // 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 eda304ef91..caf9cae341 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
@@ -15,435 +15,35 @@
 
 #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);
         }
         if (!LightStage::isIndexInvalid(_ambientIndex)) {
-            _stage->removeLight(_ambientIndex); 
-             
+            _stage->removeLight(_ambientIndex);
+
         }
     }
 
@@ -454,105 +54,37 @@ RenderableZoneEntityItemMeta::~RenderableZoneEntityItemMeta() {
     }
 }
 
-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);
@@ -564,7 +96,7 @@ void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
     }
 
     { // Sun 
-        // Need an update ?
+      // Need an update ?
         if (_needSunUpdate) {
             // Do we need to allocate the light in the stage ?
             if (LightStage::isIndexInvalid(_sunIndex)) {
@@ -604,7 +136,7 @@ void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
         }
     }
 
-    if (isVisible()) {
+    if (_visible) {
         // FInally, push the light visible in the frame
         // THe directional key light for sure
         _stage->_currentFrame.pushSunLight(_sunIndex);
@@ -620,3 +152,289 @@ void RenderableZoneEntityItemMeta::render(RenderArgs* args) {
         }
     }
 }
+
+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();
+    entity->resetRenderingPropertiesChanged();
+    _lastPosition = entity->getPosition();
+    _lastRotation = entity->getRotation();
+    _lastDimensions = entity->getDimensions();
+
+    _keyLightProperties = entity->getKeyLightProperties();
+    _stageProperties = entity->getStageProperties();
+    _skyboxProperties = entity->getSkyboxProperties();
+
+
+#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);
+    }
+}
+
+void ZoneEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
+    if (entity->getShapeType() == SHAPE_TYPE_SPHERE) {
+        _modelTransform.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->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::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::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..80fe393f48 100644
--- a/libraries/entities-renderer/src/RenderableZoneEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.h
@@ -12,9 +12,104 @@
 #ifndef hifi_RenderableZoneEntityItem_h
 #define hifi_RenderableZoneEntityItem_h
 
-#include <Model.h>
 #include <ZoneEntityItem.h>
+#include <model/Skybox.h>
+#include <model/Stage.h>
+#include <LightStage.h>
+#include <BackgroundStage.h>
+#include <TextureCache.h>
 #include "RenderableEntityItem.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 updateKeyBackgroundFromEntity(const TypedEntityPointer& entity);
+    void updateAmbientMap();
+    void updateSkyboxMap();
+    void setAmbientURL(const QString& ambientUrl);
+    void setSkyboxURL(const QString& skyboxUrl);
+    void setBackgroundMode(BackgroundMode 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(); }
+
+
+    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>() };
+    BackgroundMode _backgroundMode{ BACKGROUND_MODE_INHERIT };
+
+    indexed_container::Index _sunIndex{ LightStage::INVALID_INDEX };
+    indexed_container::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 };
+
+    KeyLightPropertyGroup _keyLightProperties;
+    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;
+};
+
+} } // namespace 
+
+#if 0
 
 class NetworkGeometry;
 class KeyLightPayload;
@@ -23,54 +118,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..ccf2057e09 100644
--- a/libraries/entities-renderer/src/paintStroke.slf
+++ b/libraries/entities-renderer/src/paintStroke.slf
@@ -38,7 +38,7 @@ 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,
         vec3(0.01, 0.01, 0.01),
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..322d69da16 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,3 +1,4 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
+include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 link_hifi_libraries(shared networking octree avatars)
diff --git a/libraries/entities/src/AddEntityOperator.cpp b/libraries/entities/src/AddEntityOperator.cpp
index 78d986f538..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);
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/DiffTraversal.cpp b/libraries/entities/src/DiffTraversal.cpp
new file mode 100644
index 0000000000..2f9423daa3
--- /dev/null
+++ b/libraries/entities/src/DiffTraversal.cpp
@@ -0,0 +1,252 @@
+//
+//  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..c26e48ae5f
--- /dev/null
+++ b/libraries/entities/src/DiffTraversal.h
@@ -0,0 +1,85 @@
+//
+//  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/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index c4136a0430..58b8dd22bf 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -13,6 +13,10 @@
 
 #include <QtCore/QObject>
 #include <QtEndian>
+#include <QJsonDocument>
+#include <openssl/rsa.h>  // see comments for DEBUG_CERT
+#include <openssl/pem.h>
+#include <openssl/x509.h>
 
 #include <glm/gtx/transform.hpp>
 
@@ -32,56 +36,20 @@
 #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; };
 
 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;
@@ -132,8 +100,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_SHOULD_HIGHLIGHT;
+    requestedProperties += PROP_EDITION_NUMBER;
+    requestedProperties += PROP_ENTITY_INSTANCE_NUMBER;
+    requestedProperties += PROP_CERTIFICATE_ID;
+
     requestedProperties += PROP_NAME;
     requestedProperties += PROP_HREF;
     requestedProperties += PROP_DESCRIPTION;
@@ -278,8 +257,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_SHOULD_HIGHLIGHT, getShouldHighlight());
+        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());
@@ -830,9 +820,16 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_MARKETPLACE_ID) {
         READ_ENTITY_PROPERTY(PROP_MARKETPLACE_ID, QString, setMarketplaceID);
     }
-
-    if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_SHOULD_HIGHLIGHT) {
-        READ_ENTITY_PROPERTY(PROP_SHOULD_HIGHLIGHT, bool, setShouldHighlight);
+    if (args.bitstreamVersion >= VERSION_ENTITIES_HAS_CERTIFICATE_PROPERTIES) {
+        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);
@@ -1251,7 +1248,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);
@@ -1346,7 +1355,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);
@@ -1412,7 +1433,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;
 }
@@ -1421,7 +1442,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.
@@ -1549,6 +1574,107 @@ float EntityItem::getRadius() const {
     return 0.5f * glm::length(getDimensions());
 }
 
+// Checking Certifiable Properties
+#define ADD_STRING_PROPERTY(n, N) if (!propertySet.get##N().isEmpty()) json[#n] = propertySet.get##N()
+#define ADD_ENUM_PROPERTY(n, N) json[#n] = propertySet.get##N##AsString()
+#define ADD_INT_PROPERTY(n, N) if (propertySet.get##N() != 0) json[#n] = (propertySet.get##N() == (quint32) -1) ? -1.0 : ((double) propertySet.get##N())
+QByteArray EntityItem::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;
+    EntityItemProperties propertySet = getProperties(); // Note: neither EntityItem nor EntityitemProperties "properties" are QObject "properties"!
+    // It is important that this be reproducible in the same order each time. Since we also generate these on the server, we do it alphabetically
+    // to help maintainence in two different code bases.
+    if (!propertySet.getAnimation().getURL().isEmpty()) {
+        json["animation.url"] = propertySet.getAnimation().getURL();
+    }
+    ADD_STRING_PROPERTY(collisionSoundURL, CollisionSoundURL);
+    ADD_STRING_PROPERTY(compoundShapeURL, CompoundShapeURL);
+    ADD_INT_PROPERTY(editionNumber, EditionNumber);
+    ADD_INT_PROPERTY(entityInstanceNumber, EntityInstanceNumber);
+    ADD_STRING_PROPERTY(itemArtist, ItemArtist);
+    ADD_STRING_PROPERTY(itemCategories, ItemCategories);
+    ADD_STRING_PROPERTY(itemDescription, ItemDescription);
+    ADD_STRING_PROPERTY(itemLicense, 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(propertySet.getType());
+
+    return QJsonDocument(json).toJson(QJsonDocument::Compact);
+}
+QByteArray EntityItem::getStaticCertificateHash() const {
+    return QCryptographicHash::hash(getStaticCertificateJSON(), QCryptographicHash::Sha256);
+}
+
+#ifdef DEBUG_CERT
+QString EntityItem::computeCertificateID() {
+    // Until the marketplace generates it, compute and answer the certificateID here.
+    // Does not set it, as that will have to be done from script engine in order to update server, etc.
+    const auto hash = getStaticCertificateHash();
+    const auto text = reinterpret_cast<const unsigned char*>(hash.constData());
+    const unsigned int textLength = hash.length();
+
+    const char privateKey[] = "-----BEGIN RSA PRIVATE KEY-----\n\
+MIIBOQIBAAJBALCoBiDAZOClO26tC5pd7JikBL61WIgpAqbcNnrV/TcG6LPI7Zbi\n\
+MjdUixmTNvYMRZH3Wlqtl2IKG1W68y3stKECAwEAAQJABvOlwhYwIhL+gr12jm2R\n\
+yPPzZ9nVEQ6kFxLlZfIT09119fd6OU1X5d4sHWfMfSIEgjwQIDS3ZU1kY3XKo87X\n\
+zQIhAOPHlYa1OC7BLhaTouy68qIU2vCKLP8mt4S31/TT0UOnAiEAxor6gU6yupTQ\n\
+yuyV3yHvr5LkZKBGqhjmOTmDfgtX7ncCIChGbgX3nQuHVOLhD/nTxHssPNozVGl5\n\
+KxHof+LmYSYZAiB4U+yEh9SsXdq40W/3fpLMPuNq1PRezJ5jGidGMcvF+wIgUNec\n\
+3Kg2U+CVZr8/bDT/vXRrsKj1zfobYuvbfVH02QY=\n\
+-----END RSA PRIVATE KEY-----";
+    BIO* bio = BIO_new_mem_buf((void*)privateKey, sizeof(privateKey));
+    RSA* rsa = PEM_read_bio_RSAPrivateKey(bio, NULL, NULL, NULL);
+
+    QByteArray signature(RSA_size(rsa), 0);
+    unsigned int signatureLength = 0;
+    const int signOK = RSA_sign(NID_sha256, text, textLength, reinterpret_cast<unsigned char*>(signature.data()), &signatureLength, rsa);
+    BIO_free(bio);
+    RSA_free(rsa);
+    if (!signOK) {
+        qCWarning(entities) << "Unable to compute signature for" << getName() << getEntityItemID();
+        return "";
+    }
+    return signature.toBase64();
+#endif
+}
+
+bool EntityItem::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 auto signatureBytes = QByteArray::fromBase64(getCertificateID().toLatin1());
+    const auto signature = reinterpret_cast<const unsigned char*>(signatureBytes.constData());
+    const unsigned int signatureLength = signatureBytes.length();
+
+    const auto hash = getStaticCertificateHash();
+    const auto text = reinterpret_cast<const unsigned char*>(hash.constData());
+    const unsigned int textLength = hash.length();
+    
+    // After DEBUG_CERT ends, we will get/cache this once from the marketplace when needed, and it likely won't be RSA.
+    const char publicKey[] = "-----BEGIN PUBLIC KEY-----\n\
+MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALCoBiDAZOClO26tC5pd7JikBL61WIgp\n\
+AqbcNnrV/TcG6LPI7ZbiMjdUixmTNvYMRZH3Wlqtl2IKG1W68y3stKECAwEAAQ==\n\
+-----END PUBLIC KEY-----";
+    BIO *bio = BIO_new_mem_buf((void*)publicKey, sizeof(publicKey));
+    EVP_PKEY* evp_key = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL);
+    RSA* rsa = EVP_PKEY_get1_RSA(evp_key);
+    bool answer = RSA_verify(NID_sha256, text, textLength, signature, signatureLength, rsa);
+    BIO_free(bio);
+    RSA_free(rsa);
+    EVP_PKEY_free(evp_key);
+    return answer;
+}
+
 void EntityItem::adjustShapeInfoByRegistration(ShapeInfo& info) const {
     if (_registrationPoint != ENTITY_ITEM_DEFAULT_REGISTRATION_POINT) {
         glm::mat4 scale = glm::scale(getDimensions());
@@ -1610,13 +1736,17 @@ 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());
         }
@@ -2060,7 +2190,7 @@ bool EntityItem::removeActionInternal(const QUuid& actionID, EntitySimulationPoi
     _previouslyDeletedActions.insert(actionID, usecTimestampNow());
     if (_objectActions.contains(actionID)) {
         if (!simulation) {
-        EntityTreeElementPointer element = _element; // use local copy of _element for logic below
+            EntityTreeElementPointer element = _element; // use local copy of _element for logic below
             EntityTreePointer entityTree = element ? element->getTree() : nullptr;
             simulation = entityTree ? entityTree->getSimulation() : nullptr;
         }
@@ -2331,11 +2461,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 {
@@ -2795,33 +2927,33 @@ void EntityItem::setUserData(const QString& 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;
-    });
-}
-
-bool EntityItem::getShouldHighlight() const {
-    bool result;
-    withReadLock([&] {
-        result = _shouldHighlight;
-    });
-    return result;
-}
-
-void EntityItem::setShouldHighlight(const bool value) {
-    withWriteLock([&] {
-        _shouldHighlight = 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 result;
@@ -2852,3 +2984,25 @@ 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);
+        }
+    });
+}
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 36ac6ba1cc..c26f1694a9 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>
@@ -37,6 +36,9 @@
 #include "SimulationFlags.h"
 #include "EntityDynamicInterface.h"
 
+// FIXME: The server-side marketplace will soon create the certificateID. At that point, all of the DEBUG_CERT stuff will go away.
+#define DEBUG_CERT 1
+
 class EntitySimulation;
 class EntityTreeElement;
 class EntityTreeElementExtraEncodeData;
@@ -60,13 +62,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 +80,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 +102,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 +183,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;
@@ -262,7 +256,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; }
@@ -313,11 +307,33 @@ 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);
-
-    bool getShouldHighlight() const;
-    void setShouldHighlight(const bool value);
+    quint32 getEditionNumber() const;
+    void setEditionNumber(const quint32&);
+    quint32 getEntityInstanceNumber() const;
+    void setEntityInstanceNumber(const quint32&);
+    QString getCertificateID() const;
+    void setCertificateID(const QString& value);
+    QByteArray getStaticCertificateJSON() const;
+    QByteArray getStaticCertificateHash() const;
+    bool verifyStaticCertificateProperties();
+#ifdef DEBUG_CERT
+    QString computeCertificateID();
+#endif
 
     // TODO: get rid of users of getRadius()...
     float getRadius() const;
@@ -325,7 +341,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;
 
@@ -447,18 +463,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; }
@@ -470,7 +479,15 @@ 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);
+
 protected:
+    QHash<ChangeHandlerId, ChangeHandlerCallback> _changeHandlers;
+
+    void somethingChangedNotification();
 
     void setSimulated(bool simulated) { _simulated = simulated; }
 
@@ -479,18 +496,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;
@@ -499,20 +517,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
 
@@ -524,22 +542,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;
     bool _shouldHighlight { false };
-    QString _name;
+    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).
@@ -557,12 +587,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);
@@ -606,9 +636,6 @@ protected:
     quint64 _lastUpdatedAngularVelocityTimestamp { 0 };
     quint64 _lastUpdatedAccelerationTimestamp { 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 1bd75f78d4..007c5dcc6c 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -288,8 +288,19 @@ 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_SHOULD_HIGHLIGHT, shouldHighlight);
+    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_SOURCE_URL, sourceUrl);
@@ -406,8 +417,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_SHOULD_HIGHLIGHT, shouldHighlight);
+    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);
 
@@ -673,7 +695,19 @@ 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);
 
@@ -811,7 +845,19 @@ 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);
 
@@ -983,8 +1029,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_SHOULD_HIGHLIGHT, ShouldHighlight, shouldHighlight, bool);
+        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);
@@ -1036,6 +1093,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);
@@ -1336,12 +1394,22 @@ 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_SHOULD_HIGHLIGHT, properties.getShouldHighlight());
             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) {
@@ -1635,13 +1703,23 @@ 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_SHOULD_HIGHLIGHT, bool, setShouldHighlight);
     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;
 }
 
@@ -1750,8 +1828,17 @@ void EntityItemProperties::markAllChanged() {
     //_alphaStartChanged = true;
     //_alphaFinishChanged = true;
 
+    // Certifiable Properties
+    _itemNameChanged = true;
+    _itemDescriptionChanged = true;
+    _itemCategoriesChanged = true;
+    _itemArtistChanged = true;
+    _itemLicenseChanged = true;
+    _limitedRunChanged = true;
     _marketplaceIDChanged = true;
-    _shouldHighlightChanged = true;
+    _editionNumberChanged = true;
+    _entityInstanceNumberChanged = true;
+    _certificateIDChanged = true;
 
     _keyLight.markAllChanged();
 
@@ -2058,9 +2145,39 @@ 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";
     }
diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h
index 8c636addb5..1f5b4a4660 100644
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@@ -120,14 +120,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);
@@ -150,28 +150,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_REF(PROP_SHOULD_HIGHLIGHT, ShouldHighlight, shouldHighlight, bool, ENTITY_ITEM_DEFAULT_SHOULD_HIGHLIGHT);
+    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);
@@ -204,6 +202,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);
@@ -427,7 +437,19 @@ 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, VoxelVolumeSize, voxelVolumeSize, "");
     DEBUG_PROPERTY_IF_CHANGED(debug, properties, VoxelData, voxelData, "");
diff --git a/libraries/entities/src/EntityItemPropertiesDefaults.h b/libraries/entities/src/EntityItemPropertiesDefaults.h
index 43d0e33ba6..ab5d1d8094 100644
--- a/libraries/entities/src/EntityItemPropertiesDefaults.h
+++ b/libraries/entities/src/EntityItemPropertiesDefaults.h
@@ -26,10 +26,20 @@ const glm::vec3 ENTITY_ITEM_HALF_VEC3 = glm::vec3(0.5f);
 
 const bool ENTITY_ITEM_DEFAULT_LOCKED = false;
 const QString ENTITY_ITEM_DEFAULT_USER_DATA = QString("");
-const QString ENTITY_ITEM_DEFAULT_MARKETPLACE_ID = QString("");
-const bool ENTITY_ITEM_DEFAULT_SHOULD_HIGHLIGHT = false;
 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 9600d0d4fe..c03630f8bf 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -40,6 +40,7 @@ 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,
@@ -78,7 +79,6 @@ enum EntityPropertyList {
 
     PROP_COMPOUND_SHAPE_URL, // used by Model + zones entities
     PROP_MARKETPLACE_ID, // all entities
-    PROP_SHOULD_HIGHLIGHT, // all entities
     PROP_ACCELERATION, // all entities
     PROP_SIMULATION_OWNER, // formerly known as PROP_SIMULATOR_ID
     PROP_NAME, // all entities
@@ -187,7 +187,19 @@ 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,
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // ATTENTION: add new properties to end of list just ABOVE this line
     PROP_AFTER_LAST_ITEM,
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index e21c9581e1..f5117dddc0 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -47,6 +47,8 @@ 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);
 }
 
@@ -76,6 +78,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();
@@ -539,7 +551,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;
 }
@@ -659,31 +671,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
@@ -743,7 +761,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));
         }
@@ -1686,16 +1704,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) {
@@ -1757,3 +1765,31 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI
     }
     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->verifyStaticCertificateProperties();
+            }
+        });
+    }
+    return result;
+}
+
+#ifdef DEBUG_CERT
+QString EntityScriptingInterface::computeCertificateID(const QUuid& entityID) {
+    QString result { "" };
+    if (_entityTree) {
+        _entityTree->withReadLock([&] {
+            EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(entityID));
+            if (entity) {
+                result = entity->computeCertificateID();
+            }
+        });
+    }
+    return result;
+}
+#endif
\ No newline at end of file
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 575528fa78..989d3dd89d 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
@@ -215,12 +227,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 +241,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 +273,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 +306,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);
@@ -332,12 +361,10 @@ public slots:
 
     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,12 +386,19 @@ public slots:
      */
     Q_INVOKABLE glm::mat4 getEntityLocalTransform(const QUuid& entityID);
 
+    Q_INVOKABLE bool verifyStaticCertificateProperties(const QUuid& entityID);
+#ifdef DEBUG_CERT
+    Q_INVOKABLE QString computeCertificateID(const QUuid& entityID);
+#endif
+
 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);
@@ -390,7 +424,7 @@ 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);
     };
@@ -412,7 +446,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..2e330fdcc5 100644
--- a/libraries/entities/src/EntitySimulation.cpp
+++ b/libraries/entities/src/EntitySimulation.cpp
@@ -141,7 +141,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()) {
@@ -280,24 +280,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 f17b991b69..bf37a08386 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -22,7 +22,6 @@
 #include "VariantMapToScriptValue.h"
 
 #include "AddEntityOperator.h"
-#include "MovingEntitiesOperator.h"
 #include "UpdateEntityOperator.h"
 #include "QVariantGLM.h"
 #include "EntitiesLogging.h"
@@ -107,6 +106,111 @@ void EntityTree::eraseAllOctreeElements(bool createNewRoot) {
     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) {
@@ -193,7 +297,9 @@ bool EntityTree::updateEntity(EntityItemPointer entity, const EntityItemProperti
                 }
                 UpdateEntityOperator theOperator(getThisPointer(), containingElement, entity, queryCube);
                 recurseTreeWithOperator(&theOperator);
-                entity->setProperties(tempProperties);
+                if (entity->setProperties(tempProperties)) {
+                    emit editingEntityPointer(entity);
+                }
                 _isDirty = true;
             }
         }
@@ -268,7 +374,9 @@ bool EntityTree::updateEntity(EntityItemPointer entity, const EntityItemProperti
         }
         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;
@@ -350,7 +458,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;
     }
 
@@ -442,6 +551,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);
@@ -450,6 +560,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);
@@ -499,6 +613,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) {
@@ -590,7 +705,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)) {
@@ -1076,7 +1191,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) {
@@ -1135,7 +1251,7 @@ 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++;
@@ -1248,7 +1364,7 @@ void EntityTree::entityChanged(EntityItemPointer entity) {
 
 
 void EntityTree::fixupNeedsParentFixups() {
-    MovingEntitiesOperator moveOperator(getThisPointer());
+    MovingEntitiesOperator moveOperator;
 
     QWriteLocker locker(&_needsParentFixupLock);
 
@@ -1324,14 +1440,21 @@ 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) {
     fixupNeedsParentFixups();
-    if (_simulation) {
+    if (simulate && _simulation) {
         withWriteLock([&] {
             _simulation->updateEntities();
             VectorOfEntities pendingDeletes;
@@ -1665,7 +1788,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();
@@ -1847,16 +1970,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 efb8cf81ba..d0448f438a 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,6 +81,10 @@ 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; }
@@ -109,7 +114,9 @@ public:
     virtual bool versionHasSVOfileBreaks(PacketVersion thisVersion) const override
                     { return thisVersion >= VERSION_ENTITIES_HAS_FILE_BREAKS; }
 
-    virtual void update() override;
+    virtual void update() override { update(true); }
+
+    void update(bool simulate);
 
     // The newer API...
     void postAddEntity(EntityItemPointer entityItem);
@@ -252,6 +259,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);
 
@@ -259,12 +267,11 @@ public:
 
     static const float DEFAULT_MAX_TMP_ENTITY_LIFETIME;
 
-public slots:
-    void callLoader(EntityItemID entityID);
-
 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);
@@ -347,6 +354,9 @@ protected:
     bool filterProperties(EntityItemPointer& existingEntity, EntityItemProperties& propertiesIn, EntityItemProperties& propertiesOut, bool& wasChanged, FilterType filterType);
     bool _hasEntityEditFilter{ false };
     QStringList _entityScriptSourceWhitelist;
+
+    MovingEntitiesOperator _entityMover;
+    QHash<EntityItemID, EntityItemPointer> _entitiesToAdd;
 };
 
 #endif // hifi_EntityTree_h
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 487bf60f61..0c33855a61 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
@@ -893,6 +893,7 @@ void EntityTreeElement::cleanupEntities() {
         }
         _entityItems.clear();
     });
+    bumpChangedContent();
 }
 
 bool EntityTreeElement::removeEntityWithEntityItemID(const EntityItemID& id) {
@@ -906,6 +907,7 @@ bool EntityTreeElement::removeEntityWithEntityItemID(const EntityItemID& id) {
                 // NOTE: only EntityTreeElement should ever be changing the value of entity->_element
                 entity->_element = NULL;
                 _entityItems.removeAt(i);
+                bumpChangedContent();
                 break;
             }
         }
@@ -922,144 +924,16 @@ bool EntityTreeElement::removeEntityItem(EntityItemPointer entity) {
         // 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) {
-                                // if the currentContainingElement is non-null, remove the entity from it
-                                if (currentContainingElement) {
-                                    currentContainingElement->removeEntityItem(entityItem);
-                                }
-                                addEntityItem(entityItem);
-                            }
-                        }
-                    }
-
-                    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())) {
-                            _myTree->addEntityMapEntry(entityItem);
-                            addEntityItem(entityItem); // add this new entity to this elements entities
-                            entityItemID = entityItem->getEntityItemID();
-                            _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) {
@@ -1068,6 +942,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..c7fb80c330 100644
--- a/libraries/entities/src/EntityTreeElement.h
+++ b/libraries/entities/src/EntityTreeElement.h
@@ -21,11 +21,12 @@
 #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>;
 
 class EntityTreeUpdateArgs {
 public:
@@ -173,7 +174,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;
@@ -238,10 +238,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/LightEntityItem.cpp b/libraries/entities/src/LightEntityItem.cpp
index c59c4b90e3..ce530400ef 100644
--- a/libraries/entities/src/LightEntityItem.cpp
+++ b/libraries/entities/src/LightEntityItem.cpp
@@ -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
@@ -224,13 +238,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 +316,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..8d133126ab 100644
--- a/libraries/entities/src/LineEntityItem.cpp
+++ b/libraries/entities/src/LineEntityItem.cpp
@@ -32,10 +32,7 @@ EntityItemPointer LineEntityItem::factory(const EntityItemID& entityID, const En
 }
 
 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;
+    });
+}
\ No newline at end of file
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..14813a68fe 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -33,9 +33,6 @@ EntityItemPointer ModelEntityItem::factory(const EntityItemID& entityID, const E
 
 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;
@@ -135,10 +132,13 @@ int ModelEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     if (args.bitstreamVersion < VERSION_ENTITIES_ANIMATION_PROPERTIES_GROUP) {
         READ_ENTITY_PROPERTY(PROP_ANIMATION_SETTINGS, QString, setAnimationSettings);
     } else {
-        // 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);
+        int bytesFromAnimation;
+        withWriteLock([&] {
+            // Note: since we've associated our _animationProperties with our _animationLoop, the readEntitySubclassDataFromBuffer()
+            // will automatically read into the animation loop
+            bytesFromAnimation = _animationProperties.readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
+                propertyFlags, overwriteLocalData, animationPropertiesChanged);
+        });
 
         bytesRead += bytesFromAnimation;
         dataAt += bytesFromAnimation;
@@ -191,8 +191,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 +205,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 +215,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 +248,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 +294,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 +334,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 +357,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 +438,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 +451,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 +465,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 +478,140 @@ 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);
+    });
+}
+
+bool ModelEntityItem::getAnimationLoop() const { 
+    return resultWithReadLock<bool>([&] {
+        return _animationProperties.getLoop();
+    });
+}
+
+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();
+    });
+}
+
+float ModelEntityItem::getAnimationFPS() const { 
+    return resultWithReadLock<float>([&] {
+        return _animationProperties.getFPS();
+    });
+}
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index 0c6132e211..7efb493735 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,53 @@ 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);
+    bool getAnimationLoop() const;
 
-    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;
+    float getAnimationFPS() const;
 
     static const QString DEFAULT_TEXTURES;
     const QString getTextures() const;
@@ -116,16 +116,22 @@ 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;
     QVector<bool> getJointTranslationsSet() const;
+    bool isAnimatingSomething() const;
 
 private:
     void setAnimationSettings(const QString& value); // only called for old bitstream format
     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 +141,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 42e5a2ece5..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) {
@@ -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
     //
@@ -200,6 +192,8 @@ bool MovingEntitiesOperator::preRecursion(const OctreeElementPointer& element) {
                         oldElement->removeEntityItem(details.entity);
                     }
                     entityTreeElement->addEntityItem(details.entity);
+                } else {
+                    entityTreeElement->bumpChangedContent();
                 }
                 _foundNewCount++;
                 //details.newFound = true; // TODO: would be nice to add this optimization
@@ -230,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 
@@ -286,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..c6616f8cd3 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.cpp
+++ b/libraries/entities/src/ParticleEffectEntityItem.cpp
@@ -40,58 +40,110 @@
 #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) {
@@ -100,199 +152,204 @@ EntityItemPointer ParticleEffectEntityItem::factory(const EntityItemID& entityID
     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,7 +464,6 @@ 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.
@@ -414,7 +484,7 @@ int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
         // 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);
@@ -548,205 +618,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..ad9686bdf2 100644
--- a/libraries/entities/src/PolyLineEntityItem.cpp
+++ b/libraries/entities/src/PolyLineEntityItem.cpp
@@ -31,17 +31,7 @@ EntityItemPointer PolyLineEntityItem::factory(const EntityItemID& entityID, cons
     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;
 }
 
@@ -92,13 +82,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;
 }
 
@@ -141,23 +130,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,
diff --git a/libraries/entities/src/PolyLineEntityItem.h b/libraries/entities/src/PolyLineEntityItem.h
index ed161762fc..2219229269 100644
--- a/libraries/entities/src/PolyLineEntityItem.h
+++ b/libraries/entities/src/PolyLineEntityItem.h
@@ -74,6 +74,14 @@ class PolyLineEntityItem : public EntityItem {
 
     virtual ShapeType getShapeType() const override { return SHAPE_TYPE_NONE; }
 
+    bool pointsChanged() const { return _pointsChanged; } 
+    bool normalsChanged() const { return _normalsChanged; }
+    bool strokeWidthsChanged() const { return _strokeWidthsChanged; }
+    bool texturesChanged() const { return _texturesChangedFlag; }
+    void resetTexturesChanged() { _texturesChangedFlag = false; }
+    void resetPolyLineChanged() { _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,16 +89,21 @@ 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 _strokeWidthsChanged { true };
     QVector<glm::vec3> _points;
     QVector<glm::vec3> _normals;
     QVector<float> _strokeWidths;
diff --git a/libraries/entities/src/PolyVoxEntityItem.cpp b/libraries/entities/src/PolyVoxEntityItem.cpp
index b5500da798..daf7ca3f79 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;
@@ -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 eb1bed503c..586344ee81 100644
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@@ -223,6 +223,84 @@ void ShapeEntityItem::debugDump() const {
     qCDebug(entities) << "           position:" << debugTreeVector(getPosition());
     qCDebug(entities) << "         dimensions:" << debugTreeVector(getDimensions());
     qCDebug(entities) << "      getLastEdited:" << debugTime(getLastEdited(), now);
-	qCDebug(entities) << "SHAPE EntityItem Ptr:" << this;
+    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:
+        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::Cylinder:
+            {
+                _collisionShapeType = SHAPE_TYPE_CYLINDER_Y;
+                // TODO WL21389: determine if rotation is axis-aligned
+                //const Transform::Quat & rot = _transform.getRotation();
+
+                // TODO WL21389: some way to tell apart SHAPE_TYPE_CYLINDER_Y, _X, _Z based on rotation and
+                //       hull ( or dimensions, need circular cross section)
+                // Should allow for minor variance along axes?
+
+            }
+            break;
+        case entity::Shape::Triangle:
+        case entity::Shape::Hexagon:
+        case entity::Shape::Octagon:
+        case entity::Shape::Circle:
+        case entity::Shape::Tetrahedron:
+        case entity::Shape::Octahedron:
+        case entity::Shape::Dodecahedron:
+        case entity::Shape::Icosahedron:
+        case entity::Shape::Cone:
+            {
+                //TODO WL21389: SHAPE_TYPE_SIMPLE_HULL and pointCollection (later)
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+            break;
+        case entity::Shape::Torus:
+            {
+                // Not in GeometryCache::buildShapes, unsupported.
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+                //TODO WL21389: SHAPE_TYPE_SIMPLE_HULL and pointCollection (later if desired support)
+            }
+            break;
+        default:
+            {
+                _collisionShapeType = SHAPE_TYPE_ELLIPSOID;
+            }
+            break;
+    }
+
+    EntityItem::computeShapeInfo(info);
+}
+
+// This value specifes 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 60fcfd628a..a20cecb60b 100644
--- a/libraries/entities/src/ShapeEntityItem.h
+++ b/libraries/entities/src/ShapeEntityItem.h
@@ -94,11 +94,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/TextEntityItem.cpp b/libraries/entities/src/TextEntityItem.cpp
index 1d8cb50a4b..3ade5879c5 100644
--- a/libraries/entities/src/TextEntityItem.cpp
+++ b/libraries/entities/src/TextEntityItem.cpp
@@ -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 7a5c87187a..fa7e5ca38f 100644
--- a/libraries/entities/src/UpdateEntityOperator.cpp
+++ b/libraries/entities/src/UpdateEntityOperator.cpp
@@ -173,6 +173,8 @@ bool UpdateEntityOperator::preRecursion(const OctreeElementPointer& element) {
                 if (oldElement != _containingElement) {
                     qCDebug(entities) << "WARNING entity moved during UpdateEntityOperator recursion";
                     _containingElement->removeEntityItem(_existingEntity);
+                } else {
+                    _containingElement->bumpChangedContent();
                 }
 
                 if (_wantDebug) {
@@ -211,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) {
diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp
index 61c6c8d80e..9595f2959c 100644
--- a/libraries/entities/src/WebEntityItem.cpp
+++ b/libraries/entities/src/WebEntityItem.cpp
@@ -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..88e4f3c9e6 100644
--- a/libraries/entities/src/ZoneEntityItem.cpp
+++ b/libraries/entities/src/ZoneEntityItem.cpp
@@ -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,7 +60,10 @@ 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);
@@ -88,8 +93,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);
 
@@ -101,11 +108,13 @@ bool ZoneEntityItem::setSubClassProperties(const EntityItemProperties& propertie
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(ghostingAllowed, setGhostingAllowed);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(filterURL, setFilterURL);
 
-    _skyboxPropertiesChanged = _skyboxProperties.setProperties(properties);
+    // Contains a QString property, must be synchronized
+    withWriteLock([&] {
+        _skyboxPropertiesChanged = _skyboxProperties.setProperties(properties);
+    });
 
     somethingChanged = somethingChanged || _keyLightPropertiesChanged || _stagePropertiesChanged || _skyboxPropertiesChanged;
 
-
     return somethingChanged;
 }
 
@@ -116,8 +125,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 +145,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;
@@ -150,13 +166,18 @@ 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 += 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;
@@ -194,16 +215,6 @@ void ZoneEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
     APPEND_ENTITY_PROPERTY(PROP_FILTER_URL, getFilterURL());
 }
 
-void ZoneEntityItem::somethingChangedNotification() {
-    EntityItem::somethingChangedNotification();
-    withWriteLock([&] {
-        _keyLightPropertiesChanged = false;
-        _backgroundPropertiesChanged = false;
-        _stagePropertiesChanged = false;
-        _skyboxPropertiesChanged = false;
-    });
-}
-
 void ZoneEntityItem::debugDump() const {
     quint64 now = usecTimestampNow();
     qCDebug(entities) << "   ZoneEntityItem id:" << getEntityItemID() << "---------------------------------------------";
@@ -273,3 +284,12 @@ QString ZoneEntityItem::getCompoundShapeURL() const {
     });
     return result;
 }
+
+void ZoneEntityItem::resetRenderingPropertiesChanged() {
+    withWriteLock([&] {
+        _keyLightPropertiesChanged = false;
+        _backgroundPropertiesChanged = false;
+        _stagePropertiesChanged = false;
+        _skyboxPropertiesChanged = false;
+    });
+}
diff --git a/libraries/entities/src/ZoneEntityItem.h b/libraries/entities/src/ZoneEntityItem.h
index bcb690f60e..c3be53599c 100644
--- a/libraries/entities/src/ZoneEntityItem.h
+++ b/libraries/entities/src/ZoneEntityItem.h
@@ -34,11 +34,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 +55,20 @@ 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; }
+    SkyboxPropertyGroup getSkyboxProperties() const { return resultWithReadLock<SkyboxPropertyGroup>([&] { return _skyboxProperties; }); }
     const StagePropertyGroup& getStageProperties() const { return _stageProperties; }
 
     bool getFlyingAllowed() const { return _flyingAllowed; }
@@ -83,6 +78,13 @@ public:
     QString getFilterURL() const;
     void setFilterURL(const QString url); 
 
+    bool keyLightPropertiesChanged() const { return _keyLightPropertiesChanged; }
+    bool backgroundPropertiesChanged() const { return _backgroundPropertiesChanged; }
+    bool stagePropertiesChanged() const { return _stagePropertiesChanged; }
+    bool skyboxPropertiesChanged() const { return _skyboxPropertiesChanged; }
+
+    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,
@@ -113,8 +115,6 @@ protected:
     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 _skyboxPropertiesChanged { false };
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/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 3099782588..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;
@@ -125,7 +130,7 @@ glm::vec3 OBJTokenizer::getVec3() {
 }
 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.
+    //    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();
@@ -168,7 +173,7 @@ void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID) {
 }
 
 // OBJFace
-//	NOTE (trent, 7/20/17): The vertexColors vector being passed-in isn't necessary here, but I'm just
+//    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;
@@ -544,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.
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 9a32871590..fb250833cf 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -22,7 +22,7 @@ public:
     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;
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/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 eac74fbdf9..f138244fa2 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackend.cpp
@@ -455,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/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/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/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/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-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/Buffer.h b/libraries/gpu/src/gpu/Buffer.h
index c5df94235c..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>;
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/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/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..69872906e3 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&)>;
@@ -32,6 +32,8 @@ namespace gpu {
         Mat4 pose;
         /// The collection of batches which make up the frame
         Batches batches;
+        /// Single batch containing overlays to be drawn in the composite framebuffer
+        Batch postCompositeBatch;
         /// The main thread updates to buffers that are applicable for this frame.
         BufferUpdates bufferUpdates;
         /// The destination framebuffer in which the results will be placed
diff --git a/libraries/gpu/src/gpu/Framebuffer.cpp b/libraries/gpu/src/gpu/Framebuffer.cpp
index b49c681889..f1257e7c83 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;
diff --git a/libraries/gpu/src/gpu/Framebuffer.h b/libraries/gpu/src/gpu/Framebuffer.h
index a65aaf765b..b3a500d68f 100755
--- a/libraries/gpu/src/gpu/Framebuffer.h
+++ b/libraries/gpu/src/gpu/Framebuffer.h
@@ -132,7 +132,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 {};
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/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/Transform.slh b/libraries/gpu/src/gpu/Transform.slh
index b786222198..9feca4a3c9 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;
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..b4b5bdeae1 100644
--- a/libraries/image/src/image/Image.cpp
+++ b/libraries/image/src/image/Image.cpp
@@ -11,7 +11,8 @@
 
 #include "Image.h"
 
-#include <nvtt/nvtt.h>
+#include <QtCore/QtGlobal>
+
 
 #include <QUrl>
 #include <QImage>
@@ -22,19 +23,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 +42,11 @@ bool DEV_DECIMATE_TEXTURES = false;
 std::atomic<size_t> DECIMATED_TEXTURE_COUNT{ 0 };
 std::atomic<size_t> RECTIFIED_TEXTURE_COUNT{ 0 };
 
+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))) {
@@ -99,59 +104,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 +175,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 +183,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 +191,31 @@ 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);
 }
 
-
-gpu::TexturePointer processImage(const QByteArray& content, const std::string& filename, int maxNumPixels, TextureUsage::Type textureType) {
+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,7 +265,7 @@ 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;
 }
@@ -292,6 +302,7 @@ QImage processSourceImage(const QImage& srcImage, bool cubemap) {
     return srcImage;
 }
 
+#if defined(NVTT_API)
 struct MyOutputHandler : public nvtt::OutputHandler {
     MyOutputHandler(gpu::Texture* texture, int face) : _texture(texture), _face(face) {}
 
@@ -330,8 +341,9 @@ struct MyErrorHandler : public nvtt::ErrorHandler {
         qCWarning(imagelogging) << "Texture compression error:" << nvtt::errorString(e);
     }
 };
+#endif
 
-void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
+void generateMips(gpu::Texture* texture, QImage& image, const std::atomic<bool>& abortProcessing = false, int face = -1) {
 #if CPU_MIPMAPS
     PROFILE_RANGE(resource_parse, "generateMips");
 
@@ -447,10 +459,29 @@ void generateMips(gpu::Texture* texture, QImage& image, int face = -1) {
     MyErrorHandler errorHandler;
     outputOptions.setErrorHandler(&errorHandler);
 
+    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;
+                }
+            }
+        }
+    };
+
+    SequentialTaskDispatcher dispatcher(abortProcessing);
     nvtt::Compressor compressor;
+    compressor.setTaskDispatcher(&dispatcher);
     compressor.process(inputOptions, compressionOptions, outputOptions);
 #else
-    texture->autoGenerateMips(-1);
+    texture->setAutoGenerateMips(true);
 #endif
 }
 
@@ -481,7 +512,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 +561,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 +637,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 +663,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 +699,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;  
@@ -926,7 +961,9 @@ 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) {
+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;
@@ -985,7 +1022,7 @@ 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
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/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/midi/src/Midi.h b/libraries/midi/src/Midi.h
index 0ffa27986d..013ec056e3 100644
--- a/libraries/midi/src/Midi.h
+++ b/libraries/midi/src/Midi.h
@@ -66,7 +66,7 @@ Q_INVOKABLE void thruModeEnable(bool enable);
 
 public:
     Midi();
-	virtual ~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..2756334a1a 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -77,6 +77,8 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
                 texdir += '/';
             }
             _textureBaseUrl = resolveTextureBaseUrl(url, _url.resolved(texdir));
+        } else {
+            _textureBaseUrl = _effectiveBaseURL;
         }
 
         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,9 @@ private:
 };
 
 void GeometryDefinitionResource::downloadFinished(const QByteArray& data) {
-    QThreadPool::globalInstance()->start(new GeometryReader(_self, _url, _mapping, data, _combineParts));
+    _url = _effectiveBaseURL;
+    _textureBaseUrl = _effectiveBaseURL;
+    QThreadPool::globalInstance()->start(new GeometryReader(_self, _effectiveBaseURL, _mapping, data, _combineParts));
 }
 
 void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxGeometry) {
@@ -456,7 +460,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 85bde4c2f1..5d8f840c85 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>
@@ -189,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) {
@@ -257,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,
@@ -291,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) {
@@ -420,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) {
@@ -519,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;
@@ -608,7 +632,7 @@ void NetworkTexture::ktxMipRequestFinished() {
             finishedLoading(false);
         }
     } else {
-        if (handleFailedRequest(result)) {
+        if (Resource::handleFailedRequest(result)) {
             _ktxResourceState = PENDING_MIP_REQUEST;
         } else {
             _ktxResourceState = FAILED_TO_LOAD;
@@ -979,6 +1003,7 @@ NetworkTexturePointer TextureCache::getResourceTexture(QUrl resourceTextureUrl)
         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;
             }
@@ -992,6 +1017,7 @@ NetworkTexturePointer TextureCache::getResourceTexture(QUrl 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;
             }
@@ -1009,14 +1035,18 @@ const gpu::FramebufferPointer& TextureCache::getHmdPreviewFramebuffer(int width,
 }
 
 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();
-    emit spectatorCameraFramebufferReset();
+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 f5a0ec5215..1102694f86 100644
--- a/libraries/model-networking/src/model-networking/TextureCache.h
+++ b/libraries/model-networking/src/model-networking/TextureCache.h
@@ -75,6 +75,8 @@ protected:
 
     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,12 +167,13 @@ 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& getSpectatorCameraFramebuffer();
-    void resetSpectatorCameraFramebuffer(int width, int height);
     const gpu::FramebufferPointer& getHmdPreviewFramebuffer(int width, int height);
+    const gpu::FramebufferPointer& getSpectatorCameraFramebuffer();
+    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();
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/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/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 588df71e41..4030e2101b 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -29,11 +29,15 @@
 #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";
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index cb0b620a54..6fdfc5a42b 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -59,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();
@@ -185,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);
 
@@ -585,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());
 
diff --git a/libraries/networking/src/AssetClient.h b/libraries/networking/src/AssetClient.h
index 3f6602b76b..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;
 
@@ -56,6 +57,7 @@ public:
     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 a41283cc0d..2dc22a9337 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;
     });
@@ -187,7 +202,7 @@ void AssetResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytes
     emit progress(bytesReceived, bytesTotal);
 
     auto now = p_high_resolution_clock::now();
-	
+    
     // Recording ATP bytes downloaded in stats
     DependencyManager::get<StatTracker>()->updateStat(STAT_ATP_RESOURCE_TOTAL_BYTES, bytesReceived);
 
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/HTTPResourceRequest.cpp b/libraries/networking/src/HTTPResourceRequest.cpp
index c6d0370a70..edba520bd5 100644
--- a/libraries/networking/src/HTTPResourceRequest.cpp
+++ b/libraries/networking/src/HTTPResourceRequest.cpp
@@ -201,11 +201,11 @@ void HTTPResourceRequest::onDownloadProgress(qint64 bytesReceived, qint64 bytesT
     _sendTimer->start();
 
     emit progress(bytesReceived, bytesTotal);
-	
+    
     // Recording HTTP bytes downloaded in stats
     DependencyManager::get<StatTracker>()->updateStat(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..b582198139 100644
--- a/libraries/networking/src/HifiSockAddr.h
+++ b/libraries/networking/src/HifiSockAddr.h
@@ -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 e03ec5e771..574ec7f054 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -159,6 +159,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 +175,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 +210,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) {
@@ -252,7 +264,7 @@ 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);
 
@@ -294,14 +306,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 (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 +335,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;
 
@@ -660,7 +676,11 @@ SharedNodePointer LimitedNodeList::addOrUpdateNode(const QUuid& uuid, NodeType_t
         }
 
         // insert the new node and release our read lock
+#ifdef Q_OS_ANDROID
+        _nodeHash.insert(UUIDNodePair(newNode->getUUID(), newNodePointer));
+#else
         _nodeHash.emplace(newNode->getUUID(), newNodePointer);
+#endif
         readLocker.unlock();
 
         qCDebug(networking) << "Added" << *newNode;
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 5d602cc0c0..994f91db19 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -113,9 +113,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);
 
@@ -285,7 +288,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);
 
@@ -327,8 +332,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();
@@ -350,7 +358,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/Node.h b/libraries/networking/src/Node.h
index 4d09f077bd..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);
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 48e5c8a62c..fcf369f786 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -809,7 +809,7 @@ void NodeList::sendIgnoreRadiusStateToNode(const SharedNodePointer& destinationN
 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 {
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/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index fbdfa4b87a..a3ac995bcf 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -687,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();
@@ -731,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/ResourceRequest.cpp b/libraries/networking/src/ResourceRequest.cpp
index aeeab2232a..f028535e2f 100644
--- a/libraries/networking/src/ResourceRequest.cpp
+++ b/libraries/networking/src/ResourceRequest.cpp
@@ -36,6 +36,7 @@ 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";
     }
 }
diff --git a/libraries/networking/src/ResourceRequest.h b/libraries/networking/src/ResourceRequest.h
index 3ee86025a2..cf852c1e1b 100644
--- a/libraries/networking/src/ResourceRequest.h
+++ b/libraries/networking/src/ResourceRequest.h
@@ -57,7 +57,8 @@ public:
         AccessDenied,
         InvalidByteRange,
         InvalidURL,
-        NotFound
+        NotFound,
+        RedirectFail
     };
     Q_ENUM(Result)
 
@@ -66,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; }
@@ -84,9 +87,11 @@ protected:
     virtual void doSend() = 0;
 
     QUrl _url;
+    QUrl _relativePathURL;
     State _state { NotStarted };
     Result _result;
     QByteArray _data;
+    bool _failOnRedirect { false };
     bool _cacheEnabled { true };
     bool _loadedFromCache { false };
     ByteRange _byteRange;
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 241ccaf5d6..2f3f65c90b 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -30,18 +30,21 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::EntityEdit:
         case PacketType::EntityData:
         case PacketType::EntityPhysics:
-            return VERSION_ENTITIES_HAS_SHOULD_HIGHLIGHT;
+            return VERSION_ENTITIES_HAS_CERTIFICATE_PROPERTIES;
         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::AvatarIdentityLookAtSnapping);
         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:
@@ -65,7 +68,6 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::MicrophoneAudioWithEcho:
         case PacketType::AudioStreamStats:
             return static_cast<PacketVersion>(AudioVersion::HighDynamicRangeVolume);
-
         default:
             return 17;
     }
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index e2304e62f7..122be60870 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -121,6 +121,8 @@ public:
         ReplicatedAvatarIdentity,
         ReplicatedKillAvatar,
         ReplicatedBulkAvatarData,
+        OctreeFileReplacementFromUrl,
+        ChallengeOwnership,
         NUM_PACKET_TYPE
     };
 
@@ -139,11 +141,16 @@ public:
 
     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;
+            << 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;
     }
 
@@ -258,6 +265,9 @@ const PacketVersion VERSION_ENTITIES_ZONE_FILTERS = 68;
 const PacketVersion VERSION_ENTITIES_HINGE_CONSTRAINT = 69;
 const PacketVersion VERSION_ENTITIES_BULLET_DYNAMICS = 70;
 const PacketVersion VERSION_ENTITIES_HAS_SHOULD_HIGHLIGHT = 71;
+const PacketVersion VERSION_ENTITIES_HAS_HIGHLIGHT_SCRIPTING_INTERFACE = 72;
+const PacketVersion VERSION_ENTITIES_ANIMATION_ALLOW_TRANSLATION_PROPERTIES = 73;
+const PacketVersion VERSION_ENTITIES_HAS_CERTIFICATE_PROPERTIES = 74;
 
 enum class EntityQueryPacketVersion: PacketVersion {
     JSONFilter = 18,
@@ -266,7 +276,8 @@ enum class EntityQueryPacketVersion: PacketVersion {
 
 enum class AssetServerPacketVersion: PacketVersion {
     VegasCongestionControl = 19,
-    RangeRequestSupport
+    RangeRequestSupport,
+    RedirectedMappings
 };
 
 enum class AvatarMixerPacketVersion : PacketVersion {
@@ -287,7 +298,8 @@ enum class AvatarMixerPacketVersion : PacketVersion {
     AvatarIdentitySequenceId,
     MannequinDefaultAvatar,
     AvatarIdentitySequenceFront,
-    IsReplicatedInAvatarIdentity
+    IsReplicatedInAvatarIdentity,
+    AvatarIdentityLookAtSnapping,
 };
 
 enum class DomainConnectRequestVersion : PacketVersion {
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index cceecaeed9..ad16a97bf6 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -431,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;
@@ -925,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;
         }
@@ -1152,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);
@@ -1174,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
@@ -1185,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];
 
@@ -1276,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);
 
@@ -1441,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];
 
@@ -1638,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);
@@ -1715,7 +1713,7 @@ bool Octree::readFromURL(const QString& urlString) {
 }
 
 
-bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID) {
+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;
@@ -1732,14 +1730,14 @@ bool Octree::readFromStream(unsigned long streamLength, QDataStream& inputStream
 }
 
 
-bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStream) {
+bool Octree::readSVOFromStream(uint64_t streamLength, QDataStream& inputStream) {
     qWarning() << "SVO file format depricated. Support for reading SVO files is no longer support and will be removed soon.";
 
     bool fileOk = false;
 
     PacketVersion gotVersion = 0;
 
-    unsigned long headerLength = 0; // bytes in the header
+    uint64_t headerLength = 0; // bytes in the header
 
     bool wantImportProgress = true;
 
@@ -1751,14 +1749,14 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
     if (getWantSVOfileVersions()) {
 
         // read just enough of the file to parse the header...
-        const unsigned long HEADER_LENGTH = sizeof(int) + sizeof(PacketVersion);
+        const uint64_t 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;
+        uint64_t  dataLength = HEADER_LENGTH;
 
         // if so, read the first byte of the file and see if it matches the expected version code
         int intPacketType;
@@ -1804,7 +1802,7 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
         if (!hasBufferBreaks) {
 
             // read the entire file into a buffer, WHAT!? Why not.
-            unsigned long dataLength = streamLength - headerLength;
+            uint64_t dataLength = streamLength - headerLength;
             unsigned char* entireFileDataSection = new unsigned char[dataLength];
             inputStream.readRawData((char*)entireFileDataSection, dataLength);
 
@@ -1819,9 +1817,9 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
         } else {
 
 
-            unsigned long dataLength = streamLength - headerLength;
-            unsigned long remainingLength = dataLength;
-            const unsigned long MAX_CHUNK_LENGTH = MAX_OCTREE_PACKET_SIZE * 2;
+            uint64_t dataLength = streamLength - headerLength;
+            uint64_t remainingLength = dataLength;
+            const uint64_t MAX_CHUNK_LENGTH = MAX_OCTREE_PACKET_SIZE * 2;
             unsigned char* fileChunk = new unsigned char[MAX_CHUNK_LENGTH];
 
             while (remainingLength > 0) {
@@ -1847,7 +1845,7 @@ bool Octree::readSVOFromStream(unsigned long streamLength, QDataStream& inputStr
                 remainingLength -= chunkLength;
 
                 unsigned char* dataAt = fileChunk;
-                unsigned long  dataLength = chunkLength;
+                uint64_t  dataLength = chunkLength;
 
                 ReadBitstreamToTreeParams args(NO_EXISTS_BITS, NULL, 0,
                                                     SharedNodePointer(), wantImportProgress, gotVersion);
@@ -1887,7 +1885,7 @@ QJsonDocument addMarketplaceIDToDocumentEntities(QJsonDocument& doc, const QStri
 
 const int READ_JSON_BUFFER_SIZE = 2048;
 
-bool Octree::readJSONFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID /*=""*/) {
+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.
 
@@ -1982,14 +1980,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 38454d20b5..a2df5f44e5 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;
 
@@ -231,7 +233,7 @@ 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());
 
@@ -301,13 +303,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, const QString& marketplaceID="");
-    bool readSVOFromStream(unsigned long streamLength, QDataStream& inputStream);
-    bool readJSONFromStream(unsigned long streamLength, QDataStream& inputStream, const QString& marketplaceID="");
+    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..493dfdcff5 100644
--- a/libraries/octree/src/OctreePacketData.cpp
+++ b/libraries/octree/src/OctreePacketData.cpp
@@ -582,9 +582,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 +596,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 {
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..81a63a696c 100644
--- a/libraries/octree/src/OctreeQuery.h
+++ b/libraries/octree/src/OctreeQuery.h
@@ -89,14 +89,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..c26b4ce77b 100644
--- a/libraries/octree/src/OctreeQueryNode.cpp
+++ b/libraries/octree/src/OctreeQueryNode.cpp
@@ -182,6 +182,7 @@ bool OctreeQueryNode::updateCurrentViewFrustum() {
                                                              getCameraAspectRatio(),
                                                              getCameraNearClip(),
                                                              getCameraFarClip()));
+            newestViewFrustum.calculate();
         }
         
         
@@ -189,7 +190,6 @@ bool OctreeQueryNode::updateCurrentViewFrustum() {
             QMutexLocker viewLocker(&_viewMutex);
             if (!newestViewFrustum.isVerySimilar(_currentViewFrustum)) {
                 _currentViewFrustum = newestViewFrustum;
-                _currentViewFrustum.calculate();
                 currentViewFrustumChanged = true;
             }
         }
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 9a7abc4e98..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 (_rigidBody) {
-        _rigidBody->setGravity(_gravity * _currentUp);
+        _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 f02dcee8f6..7c84017758 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());
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/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 97174b2216..18dfd2317e 100644
--- a/libraries/physics/src/ShapeFactory.cpp
+++ b/libraries/physics/src/ShapeFactory.cpp
@@ -325,7 +325,9 @@ const btCollisionShape* ShapeFactory::createShapeFromInfo(const ShapeInfo& info)
             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;
diff --git a/libraries/plugins/src/plugins/DisplayPlugin.h b/libraries/plugins/src/plugins/DisplayPlugin.h
index 9e18ee534d..d3054c9bd8 100644
--- a/libraries/plugins/src/plugins/DisplayPlugin.h
+++ b/libraries/plugins/src/plugins/DisplayPlugin.h
@@ -109,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; }
@@ -183,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; }
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/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/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/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index 2b5fdc1d74..b0488867e9 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -420,7 +420,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());
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 5f2acff16f..658eab7210 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -18,13 +18,16 @@
 #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"
 
@@ -37,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"
 
@@ -56,9 +60,11 @@ 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);
@@ -447,34 +453,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());
-            },
-            nullptr
-        );
-    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());
-            },
-            nullptr
-        );
-    GeometryCache::_simpleWirePipeline =
-        std::make_shared<render::ShapePipeline>(getSimplePipeline(false, false, true, true), nullptr,
-        [](const render::ShapePipeline&, gpu::Batch& batch, RenderArgs* args) {}, nullptr);
 }
 
 GeometryCache::~GeometryCache() {
@@ -514,9 +550,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) {
@@ -529,6 +602,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);
@@ -541,6 +619,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);
 }
@@ -1639,8 +1743,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;
     }
@@ -1720,7 +1828,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);
@@ -1770,6 +1878,8 @@ public:
         IS_CULLED_FLAG,
         IS_UNLIT_FLAG,
         HAS_DEPTH_BIAS_FLAG,
+        IS_FADING_FLAG,
+        IS_ANTIALIASED_FLAG,
 
         NUM_FLAGS,
     };
@@ -1780,6 +1890,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;
 
@@ -1790,6 +1902,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;
@@ -1798,9 +1912,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) {}
@@ -1829,48 +1943,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) {
@@ -1879,23 +1973,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);
@@ -1903,6 +1982,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()) {
@@ -1919,13 +2032,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;
@@ -1960,26 +2073,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);
 }
 
@@ -1987,7 +2167,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) {
@@ -2027,5 +2209,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..288ab363f0 100644
--- a/libraries/render-utils/src/GeometryCache.h
+++ b/libraries/render-utils/src/GeometryCache.h
@@ -147,31 +147,48 @@ public:
         NUM_SHAPES,
     };
 
+    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 +203,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,
@@ -416,25 +440,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/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/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/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 f6cb55deed..dc419c03c3 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;
 
@@ -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, state.clusterBuffer);
+
     initCache();
 }
 
@@ -390,10 +399,6 @@ ItemKey ModelMeshPartPayload::getKey() const {
                 builder.withTransparent();
             }
         }
-
-        if (_fadeState != FADE_COMPLETE) {
-            builder.withTransparent();
-        }
     }
     return builder.build();
 }
@@ -465,7 +470,7 @@ ShapeKey ModelMeshPartPayload::getShapeKey() const {
     ShapeKey::Builder builder;
     builder.withMaterial();
 
-    if (isTranslucent || _fadeState != FADE_COMPLETE) {
+    if (isTranslucent) {
         builder.withTranslucent();
     }
     if (hasTangents) {
@@ -510,9 +515,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 +529,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;
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 5d12e60ce3..99c14510b5 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 {
@@ -95,8 +91,6 @@ public:
             const Transform& boundTransform,
             const gpu::BufferPointer& buffer);
 
-    float computeFadeAlpha();
-
     // Render Item interface
     render::ItemKey getKey() const override;
     int getLayer() const;
@@ -122,8 +116,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 42bb91ce94..36f12fb1bf 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -209,11 +209,6 @@ void Model::updateRenderItems() {
         return;
     }
 
-    glm::vec3 scale = getScale();
-    if (_collisionGeometry) {
-        // _collisionGeometry is already scaled
-        scale = glm::vec3(1.0f);
-    }
     _needsUpdateClusterMatrices = true;
     _renderItemsNeedUpdate = false;
 
@@ -221,7 +216,7 @@ 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();
@@ -233,17 +228,19 @@ void Model::updateRenderItems() {
         // We need to update them here so we can correctly update the bounding box.
         self->updateClusterMatrices();
 
+        Transform modelTransform = self->getTransform();
+        Transform physicsTransform = modelTransform;
+        modelTransform.setScale(glm::vec3(1.0f));
+
         uint32_t deleteGeometryCounter = self->_deleteGeometryCounter;
 
         render::Transaction transaction;
         foreach (auto itemID, self->_modelMeshRenderItemsMap.keys()) {
-            transaction.updateItem<ModelMeshPartPayload>(itemID, [deleteGeometryCounter](ModelMeshPartPayload& data) {
+            transaction.updateItem<ModelMeshPartPayload>(itemID, [deleteGeometryCounter, modelTransform](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));
 
                         const Model::MeshState& state = model->getMeshState(data._meshIndex);
                         Transform renderTransform = modelTransform;
@@ -259,11 +256,10 @@ void Model::updateRenderItems() {
         // 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) {
+            transaction.updateItem<MeshPartPayload>(itemID, [physicsTransform, collisionMeshOffset](MeshPartPayload& data) {
                 // update the model transform for this render item.
-                data.updateTransform(modelTransform, collisionMeshOffset);
+                data.updateTransform(physicsTransform, collisionMeshOffset);
             });
         }
 
@@ -1219,6 +1215,7 @@ const render::ItemIDs& Model::fetchRenderItemIDs() const {
 }
 
 void Model::createRenderItemSet() {
+    updateClusterMatrices();
     if (_collisionGeometry) {
         if (_collisionRenderItems.empty()) {
             createCollisionRenderItemSet();
@@ -1269,7 +1266,6 @@ void Model::createVisibleRenderItemSet() {
             shapeID++;
         }
     }
-    computeMeshPartLocalBounds();
 }
 
 void Model::createCollisionRenderItemSet() {
@@ -1311,55 +1307,6 @@ 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;
-}
-
 class CollisionRenderGeometry : public Geometry {
 public:
     CollisionRenderGeometry(model::MeshPointer mesh) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 497346c138..6d338b4598 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -87,7 +87,6 @@ public:
     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);
@@ -116,6 +115,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; }
@@ -267,7 +267,6 @@ signals:
     void setCollisionModelURLFinished(bool success);
 
 protected:
-    bool addedToScene() const { return _addedToScene; }
 
     void setBlendshapeCoefficients(const QVector<float>& coefficients) { _blendshapeCoefficients = coefficients; }
     const QVector<float>& getBlendshapeCoefficients() const { return _blendshapeCoefficients; }
@@ -382,8 +381,8 @@ 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;
 
diff --git a/libraries/render-utils/src/Outline.slf b/libraries/render-utils/src/Outline.slf
new file mode 100644
index 0000000000..68ef870cba
--- /dev/null
+++ b/libraries/render-utils/src/Outline.slf
@@ -0,0 +1,13 @@
+//  Outline.slf
+//  Add outline 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 Outline.slh@>
+<$main(0)$>
diff --git a/libraries/render-utils/src/Outline.slh b/libraries/render-utils/src/Outline.slh
new file mode 100644
index 0000000000..ac56e4c95c
--- /dev/null
+++ b/libraries/render-utils/src/Outline.slh
@@ -0,0 +1,97 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+<!
+//  Outline.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 Outline_shared.slh@>
+
+uniform outlineParamsBuffer {
+	OutlineParameters params;
+};
+
+uniform sampler2D sceneDepthMap;
+uniform sampler2D outlinedDepthMap;
+
+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
+    vec2 halfTexel = getInvWidthHeight() / 2;
+    vec2 texCoord0 = varTexCoord0+halfTexel;
+	float outlinedDepth = texture(outlinedDepthMap, texCoord0).x;
+    float intensity = 0.0;
+
+    if (outlinedDepth < FAR_Z) {
+        // We're not on the far plane so we are on the outlined object, thus no outline to do!
+<@if IS_FILLED@>
+        // But we need to fill the interior
+        float sceneDepth = texture(sceneDepthMap, texCoord0).x;
+        // Transform to linear depth for better precision
+        outlinedDepth = -evalZeyeFromZdb(outlinedDepth);
+        sceneDepth = -evalZeyeFromZdb(sceneDepth);
+
+        // Are we occluded?
+        if (sceneDepth < (outlinedDepth-LINEAR_DEPTH_BIAS)) {
+            intensity = params._fillOpacityOccluded;
+        } else {
+            intensity = params._fillOpacityUnoccluded;
+        }
+<@else@>
+		discard;
+<@endif@>
+    } else {
+        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)
+                    {
+                        outlinedDepth = texture(outlinedDepthMap, uv).x;
+                        intensity += (outlinedDepth < FAR_Z) ? 1.0 : 0.0;
+                        weight += 1.f;
+                    }
+                    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/OutlineEffect.cpp b/libraries/render-utils/src/OutlineEffect.cpp
new file mode 100644
index 0000000000..d5b3b1c3bb
--- /dev/null
+++ b/libraries/render-utils/src/OutlineEffect.cpp
@@ -0,0 +1,371 @@
+//
+//  OutlineEffect.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 "OutlineEffect.h"
+
+#include "GeometryCache.h"
+
+#include <render/FilterTask.h>
+#include <render/SortTask.h>
+
+#include "gpu/Context.h"
+#include "gpu/StandardShaderLib.h"
+
+
+#include "surfaceGeometry_copyDepth_frag.h"
+#include "debug_deferred_buffer_vert.h"
+#include "debug_deferred_buffer_frag.h"
+#include "Outline_frag.h"
+#include "Outline_filled_frag.h"
+
+using namespace render;
+
+extern void initZPassPipelines(ShapePlumber& plumber, gpu::StatePointer state);
+
+OutlineFramebuffer::OutlineFramebuffer() {
+}
+
+void OutlineFramebuffer::update(const gpu::TexturePointer& colorBuffer) {
+    // If the depth buffer or size changed, we need to delete our FBOs and recreate them at the
+    // new correct dimensions.
+    if (_depthTexture) {
+        auto newFrameSize = glm::ivec2(colorBuffer->getDimensions());
+        if (_frameSize != newFrameSize) {
+            _frameSize = newFrameSize;
+            clear();
+        }
+    }
+}
+
+void OutlineFramebuffer::clear() {
+    _depthFramebuffer.reset();
+    _depthTexture.reset();
+}
+
+void OutlineFramebuffer::allocate() {
+    
+    auto width = _frameSize.x;
+    auto height = _frameSize.y;
+    auto format = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::DEPTH);
+
+    _depthTexture = gpu::TexturePointer(gpu::Texture::createRenderBuffer(format, width, height));
+    _depthFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("outlineDepth"));
+    _depthFramebuffer->setDepthStencilBuffer(_depthTexture, format);
+}
+
+gpu::FramebufferPointer OutlineFramebuffer::getDepthFramebuffer() {
+    if (!_depthFramebuffer) {
+        allocate();
+    }
+    return _depthFramebuffer;
+}
+
+gpu::TexturePointer OutlineFramebuffer::getDepthTexture() {
+    if (!_depthTexture) {
+        allocate();
+    }
+    return _depthTexture;
+}
+
+void DrawOutlineDepth::run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& output) {
+    assert(renderContext->args);
+    assert(renderContext->args->hasViewFrustum());
+    auto& inShapes = inputs.get0();
+    auto& deferredFrameBuffer = inputs.get1();
+
+    if (!inShapes.empty()) {
+        RenderArgs* args = renderContext->args;
+        ShapeKey::Builder defaultKeyBuilder;
+
+        if (!_outlineFramebuffer) {
+            _outlineFramebuffer = std::make_shared<OutlineFramebuffer>();
+        }
+        _outlineFramebuffer->update(deferredFrameBuffer->getDeferredColorTexture());
+
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            args->_batch = &batch;
+
+            batch.setFramebuffer(_outlineFramebuffer->getDepthFramebuffer());
+            // Clear it
+            batch.clearFramebuffer(
+                gpu::Framebuffer::BUFFER_DEPTH,
+                vec4(vec3(1.0, 1.0, 1.0), 0.0), 1.0, 0, false);
+
+            // Setup camera, projection and viewport for all items
+            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);
+
+            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->_shapePipeline = shadowPipeline;
+            batch.setPipeline(shadowPipeline->pipeline);
+            for (auto items : inShapes) {
+                if (items.first.isSkinned()) {
+                    skinnedShapeKeys.push_back(items.first);
+                }
+                else {
+                    renderItems(renderContext, items.second);
+                }
+            }
+
+            // Reiterate to render the skinned
+            args->_shapePipeline = shadowSkinnedPipeline;
+            batch.setPipeline(shadowSkinnedPipeline->pipeline);
+            for (const auto& key : skinnedShapeKeys) {
+                renderItems(renderContext, inShapes.at(key));
+            }
+
+            args->_shapePipeline = nullptr;
+            args->_batch = nullptr;
+        });
+
+        output = _outlineFramebuffer;
+    } else {
+        output = nullptr;
+    }
+}
+
+DrawOutline::DrawOutline() {
+}
+
+void DrawOutline::configure(const Config& config) {
+    _color = config.color;
+    _blurKernelSize = std::min(10, std::max(2, (int)floorf(config.width*2 + 0.5f)));
+    // Size is in normalized screen height. We decide that for outline width = 1, this is equal to 1/400.
+    _size = config.width / 400.f;
+    _fillOpacityUnoccluded = config.fillOpacityUnoccluded;
+    _fillOpacityOccluded = config.fillOpacityOccluded;
+    _threshold = config.glow ? 1.f : 1e-3f;
+    _intensity = config.intensity * (config.glow ? 2.f : 1.f);
+}
+
+void DrawOutline::run(const render::RenderContextPointer& renderContext, const Inputs& inputs) {
+    auto outlineFrameBuffer = inputs.get1();
+
+    if (outlineFrameBuffer) {
+        auto sceneDepthBuffer = inputs.get2();
+        const auto frameTransform = inputs.get0();
+        auto outlinedDepthTexture = outlineFrameBuffer->getDepthTexture();
+        auto destinationFrameBuffer = inputs.get3();
+        auto framebufferSize = glm::ivec2(outlinedDepthTexture->getDimensions());
+
+        if (!_primaryWithoutDepthBuffer || framebufferSize!=_frameBufferSize) {
+            // Failing to recreate this frame buffer when the screen has been resized creates a bug on Mac
+            _primaryWithoutDepthBuffer = gpu::FramebufferPointer(gpu::Framebuffer::create("primaryWithoutDepth"));
+            _primaryWithoutDepthBuffer->setRenderBuffer(0, destinationFrameBuffer->getRenderBuffer(0));
+            _frameBufferSize = framebufferSize;
+        }
+
+        if (sceneDepthBuffer) {
+            const auto OPACITY_EPSILON = 5e-3f;
+            auto pipeline = getPipeline(_fillOpacityUnoccluded>OPACITY_EPSILON || _fillOpacityOccluded>OPACITY_EPSILON);
+            auto args = renderContext->args;
+            {
+                auto& configuration = _configuration.edit();
+                configuration._color = _color;
+                configuration._intensity = _intensity;
+                configuration._fillOpacityUnoccluded = _fillOpacityUnoccluded;
+                configuration._fillOpacityOccluded = _fillOpacityOccluded;
+                configuration._threshold = _threshold;
+                configuration._blurKernelSize = _blurKernelSize;
+                configuration._size.x = _size * _frameBufferSize.y / _frameBufferSize.x;
+                configuration._size.y = _size;
+            }
+
+            gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+                batch.enableStereo(false);
+                batch.setFramebuffer(_primaryWithoutDepthBuffer);
+
+                batch.setViewportTransform(args->_viewport);
+                batch.setProjectionTransform(glm::mat4());
+                batch.resetViewTransform();
+                batch.setModelTransform(gpu::Framebuffer::evalSubregionTexcoordTransform(_frameBufferSize, args->_viewport));
+                batch.setPipeline(pipeline);
+
+                batch.setUniformBuffer(OUTLINE_PARAMS_SLOT, _configuration);
+                batch.setUniformBuffer(FRAME_TRANSFORM_SLOT, frameTransform->getFrameTransformBuffer());
+                batch.setResourceTexture(SCENE_DEPTH_SLOT, sceneDepthBuffer->getPrimaryDepthTexture());
+                batch.setResourceTexture(OUTLINED_DEPTH_SLOT, outlinedDepthTexture);
+                batch.draw(gpu::TRIANGLE_STRIP, 4);
+
+                // Restore previous frame buffer
+                batch.setFramebuffer(destinationFrameBuffer);
+            });
+        }
+    }
+}
+
+const gpu::PipelinePointer& DrawOutline::getPipeline(bool isFilled) {
+    if (!_pipeline) {
+        auto vs = gpu::StandardShaderLib::getDrawViewportQuadTransformTexcoordVS();
+        auto ps = gpu::Shader::createPixel(std::string(Outline_frag));
+        gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding("outlineParamsBuffer", OUTLINE_PARAMS_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("deferredFrameTransformBuffer", FRAME_TRANSFORM_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("sceneDepthMap", SCENE_DEPTH_SLOT));
+        slotBindings.insert(gpu::Shader::Binding("outlinedDepthMap", OUTLINED_DEPTH_SLOT));
+        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::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
+        _pipeline = gpu::Pipeline::create(program, state);
+
+        ps = gpu::Shader::createPixel(std::string(Outline_filled_frag));
+        program = gpu::Shader::createProgram(vs, ps);
+        gpu::Shader::makeProgram(*program, slotBindings);
+        _pipelineFilled = gpu::Pipeline::create(program, state);
+    }
+    return isFilled ? _pipelineFilled : _pipeline;
+}
+
+DebugOutline::DebugOutline() {
+    _geometryId = DependencyManager::get<GeometryCache>()->allocateID();
+}
+
+DebugOutline::~DebugOutline() {
+    auto geometryCache = DependencyManager::get<GeometryCache>();
+    if (geometryCache) {
+        geometryCache->releaseID(_geometryId);
+    }
+}
+
+void DebugOutline::configure(const Config& config) {
+    _isDisplayDepthEnabled = config.viewOutlinedDepth;
+}
+
+void DebugOutline::run(const render::RenderContextPointer& renderContext, const Inputs& input) {
+    const auto outlineFramebuffer = input;
+
+    if (_isDisplayDepthEnabled && outlineFramebuffer) {
+        assert(renderContext->args);
+        assert(renderContext->args->hasViewFrustum());
+        RenderArgs* args = renderContext->args;
+
+        gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
+            batch.enableStereo(false);
+            batch.setViewportTransform(args->_viewport);
+
+            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());
+
+            batch.setPipeline(getDebugPipeline());
+            batch.setResourceTexture(0, outlineFramebuffer->getDepthTexture());
+
+            const glm::vec4 color(1.0f, 0.5f, 0.2f, 1.0f);
+            const glm::vec2 bottomLeft(-1.0f, -1.0f);
+            const glm::vec2 topRight(1.0f, 1.0f);
+            geometryBuffer->renderQuad(batch, bottomLeft, topRight, color, _geometryId);
+
+            batch.setResourceTexture(0, nullptr);
+        });
+    }
+}
+
+const gpu::PipelinePointer& DebugOutline::getDebugPipeline() {
+    if (!_debugPipeline) {
+        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");
+        static const std::string DEFAULT_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 bakedFragmentShader = FRAGMENT_SHADER;
+        bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(), DEFAULT_DEPTH_SHADER);
+
+        static const auto vs = gpu::Shader::createVertex(VERTEX_SHADER);
+        const auto ps = gpu::Shader::createPixel(bakedFragmentShader);
+        const auto program = gpu::Shader::createProgram(vs, ps);
+
+        gpu::Shader::BindingSet slotBindings;
+        slotBindings.insert(gpu::Shader::Binding("depthMap", 0));
+        gpu::Shader::makeProgram(*program, slotBindings);
+
+        auto state = std::make_shared<gpu::State>();
+        state->setDepthTest(gpu::State::DepthTest(false));
+        _debugPipeline = gpu::Pipeline::create(program, state);
+    }
+
+    return _debugPipeline;
+}
+
+DrawOutlineTask::DrawOutlineTask() {
+
+}
+
+void DrawOutlineTask::configure(const Config& config) {
+
+}
+
+void DrawOutlineTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs) {
+    const auto input = inputs.get<Inputs>();
+    const auto selectedMetas = inputs.getN<Inputs>(0);
+    const auto shapePlumber = input.get1();
+    const auto sceneFrameBuffer = inputs.getN<Inputs>(2);
+    const auto primaryFramebuffer = inputs.getN<Inputs>(3);
+    const auto deferredFrameTransform = inputs.getN<Inputs>(4);
+
+    // Prepare the ShapePipeline
+    ShapePlumberPointer shapePlumberZPass = std::make_shared<ShapePlumber>();
+    {
+        auto state = std::make_shared<gpu::State>();
+        state->setDepthTest(true, true, gpu::LESS_EQUAL);
+        state->setColorWriteMask(false, false, false, false);
+
+        initZPassPipelines(*shapePlumberZPass, state);
+    }
+
+    const auto outlinedItemIDs = task.addJob<render::MetaToSubItems>("OutlineMetaToSubItemIDs", selectedMetas);
+    const auto outlinedItems = task.addJob<render::IDsToBounds>("OutlineMetaToSubItems", outlinedItemIDs, true);
+
+    // Sort
+    const auto sortedPipelines = task.addJob<render::PipelineSortShapes>("OutlinePipelineSort", outlinedItems);
+    const auto sortedShapes = task.addJob<render::DepthSortShapes>("OutlineDepthSort", sortedPipelines);
+
+    // Draw depth of outlined objects in separate buffer
+    const auto drawOutlineDepthInputs = DrawOutlineDepth::Inputs(sortedShapes, sceneFrameBuffer).asVarying();
+    const auto outlinedFrameBuffer = task.addJob<DrawOutlineDepth>("OutlineDepth", drawOutlineDepthInputs, shapePlumberZPass);
+
+    // Draw outline
+    const auto drawOutlineInputs = DrawOutline::Inputs(deferredFrameTransform, outlinedFrameBuffer, sceneFrameBuffer, primaryFramebuffer).asVarying();
+    task.addJob<DrawOutline>("OutlineEffect", drawOutlineInputs);
+
+    // Debug outline
+    task.addJob<DebugOutline>("OutlineDebug", outlinedFrameBuffer);
+}
diff --git a/libraries/render-utils/src/OutlineEffect.h b/libraries/render-utils/src/OutlineEffect.h
new file mode 100644
index 0000000000..f88092429f
--- /dev/null
+++ b/libraries/render-utils/src/OutlineEffect.h
@@ -0,0 +1,183 @@
+//
+//  OutlineEffect.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_OutlineEffect_h
+#define hifi_render_utils_OutlineEffect_h
+
+#include <render/Engine.h>
+#include "DeferredFramebuffer.h"
+#include "DeferredFrameTransform.h"
+
+class OutlineFramebuffer {
+public:
+    OutlineFramebuffer();
+
+    gpu::FramebufferPointer getDepthFramebuffer();
+    gpu::TexturePointer getDepthTexture();
+
+    // Update the source framebuffer size which will drive the allocation of all the other resources.
+    void update(const gpu::TexturePointer& colorBuffer);
+    const glm::ivec2& getSourceFrameSize() const { return _frameSize; }
+
+protected:
+
+    void clear();
+    void allocate();
+
+    gpu::FramebufferPointer _depthFramebuffer;
+    gpu::TexturePointer _depthTexture;
+
+    glm::ivec2 _frameSize;
+};
+
+using OutlineFramebufferPointer = std::shared_ptr<OutlineFramebuffer>;
+
+class DrawOutlineDepth {
+public:
+
+    using Inputs = render::VaryingSet2<render::ShapeBounds, DeferredFramebufferPointer>;
+    // Output will contain outlined objects only z-depth texture and the input primary buffer but without the primary depth buffer
+    using Outputs = OutlineFramebufferPointer;
+    using JobModel = render::Job::ModelIO<DrawOutlineDepth, Inputs, Outputs>;
+
+    DrawOutlineDepth(render::ShapePlumberPointer shapePlumber) : _shapePlumber{ shapePlumber } {}
+
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs, Outputs& output);
+
+protected:
+
+    render::ShapePlumberPointer _shapePlumber;
+    OutlineFramebufferPointer _outlineFramebuffer;
+};
+
+class DrawOutlineConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(bool glow MEMBER glow NOTIFY dirty)
+        Q_PROPERTY(float width MEMBER width NOTIFY dirty)
+        Q_PROPERTY(float intensity MEMBER intensity NOTIFY dirty)
+        Q_PROPERTY(float colorR READ getColorR WRITE setColorR NOTIFY dirty)
+        Q_PROPERTY(float colorG READ getColorG WRITE setColorG NOTIFY dirty)
+        Q_PROPERTY(float colorB READ getColorB WRITE setColorB NOTIFY dirty)
+        Q_PROPERTY(float fillOpacityUnoccluded MEMBER fillOpacityUnoccluded NOTIFY dirty)
+        Q_PROPERTY(float fillOpacityOccluded MEMBER fillOpacityOccluded NOTIFY dirty)
+
+public:
+
+    void setColorR(float value) { color.r = value; emit dirty(); }
+    float getColorR() const { return color.r; }
+
+    void setColorG(float value) { color.g = value; emit dirty(); }
+    float getColorG() const { return color.g; }
+
+    void setColorB(float value) { color.b = value; emit dirty(); }
+    float getColorB() const { return color.b; }
+
+    glm::vec3 color{ 1.f, 0.7f, 0.2f };
+    float width{ 2.0f };
+    float intensity{ 0.9f };
+    float fillOpacityUnoccluded{ 0.0f };
+    float fillOpacityOccluded{ 0.0f };
+    bool glow{ false };
+
+signals:
+    void dirty();
+};
+
+class DrawOutline {
+public:
+    using Inputs = render::VaryingSet4<DeferredFrameTransformPointer, OutlineFramebufferPointer, DeferredFramebufferPointer, gpu::FramebufferPointer>;
+    using Config = DrawOutlineConfig;
+    using JobModel = render::Job::ModelI<DrawOutline, Inputs, Config>;
+
+    DrawOutline();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+
+    enum {
+        SCENE_DEPTH_SLOT = 0,
+        OUTLINED_DEPTH_SLOT,
+
+        OUTLINE_PARAMS_SLOT = 0,
+        FRAME_TRANSFORM_SLOT
+    };
+
+#include "Outline_shared.slh"
+
+    using OutlineConfigurationBuffer = gpu::StructBuffer<OutlineParameters>;
+
+    const gpu::PipelinePointer& getPipeline(bool isFilled);
+
+    gpu::FramebufferPointer _primaryWithoutDepthBuffer;
+    glm::ivec2 _frameBufferSize {0, 0};
+    gpu::PipelinePointer _pipeline;
+    gpu::PipelinePointer _pipelineFilled;
+    OutlineConfigurationBuffer _configuration;
+    glm::vec3 _color;
+    float _size;
+    int _blurKernelSize;
+    float _intensity;
+    float _fillOpacityUnoccluded;
+    float _fillOpacityOccluded;
+    float _threshold;
+};
+
+class DebugOutlineConfig : public render::Job::Config {
+    Q_OBJECT
+        Q_PROPERTY(bool viewOutlinedDepth MEMBER viewOutlinedDepth NOTIFY dirty)
+
+public:
+
+    bool viewOutlinedDepth{ false };
+
+signals:
+    void dirty();
+};
+
+class DebugOutline {
+public:
+    using Inputs = OutlineFramebufferPointer;
+    using Config = DebugOutlineConfig;
+    using JobModel = render::Job::ModelI<DebugOutline, Inputs, Config>;
+
+    DebugOutline();
+    ~DebugOutline();
+
+    void configure(const Config& config);
+    void run(const render::RenderContextPointer& renderContext, const Inputs& inputs);
+
+private:
+
+    const gpu::PipelinePointer& getDebugPipeline();
+
+    gpu::PipelinePointer _debugPipeline;
+    int _geometryId{ 0 };
+    bool _isDisplayDepthEnabled{ false };
+};
+
+class DrawOutlineTask {
+public:
+    using Inputs = render::VaryingSet5<render::ItemBounds, render::ShapePlumberPointer, DeferredFramebufferPointer, gpu::FramebufferPointer, DeferredFrameTransformPointer>;
+    using Config = render::Task::Config;
+    using JobModel = render::Task::ModelI<DrawOutlineTask, Inputs, Config>;
+
+    DrawOutlineTask();
+
+    void configure(const Config& config);
+    void build(JobModel& task, const render::Varying& inputs, render::Varying& outputs);
+
+};
+
+#endif // hifi_render_utils_OutlineEffect_h
+
+
diff --git a/libraries/render-utils/src/Outline_filled.slf b/libraries/render-utils/src/Outline_filled.slf
new file mode 100644
index 0000000000..aaa3396bac
--- /dev/null
+++ b/libraries/render-utils/src/Outline_filled.slf
@@ -0,0 +1,13 @@
+//  Outline_filled.slf
+//  Add outline 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 Outline.slh@>
+<$main(1)$>
diff --git a/libraries/render-utils/src/Outline_shared.slh b/libraries/render-utils/src/Outline_shared.slh
new file mode 100644
index 0000000000..902bbd20ad
--- /dev/null
+++ b/libraries/render-utils/src/Outline_shared.slh
@@ -0,0 +1,28 @@
+// glsl / C++ compatible source as interface for Outline
+#ifdef __cplusplus
+#   define VEC2 glm::vec2
+#   define VEC3 glm::vec3
+#else
+#   define VEC2 vec2
+#   define VEC3 vec3
+#endif
+
+struct OutlineParameters
+{
+	VEC3 _color;
+    float _intensity;
+
+    VEC2 _size;
+    float _fillOpacityUnoccluded;
+    float _fillOpacityOccluded;
+
+    float _threshold;
+    int _blurKernelSize;
+    float padding2;
+    float padding3;
+};
+
+// <@if 1@>
+// Trigger Scribe include 
+// <@endif@> <!def that !> 
+//
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 20c999019b..85df1ee8de 100644
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -34,39 +34,48 @@
 #include "FramebufferCache.h"
 #include "TextureCache.h"
 #include "ZoneRenderer.h"
+#include "FadeEffect.h"
 
 #include "AmbientOcclusionEffect.h"
 #include "AntialiasingEffect.h"
 #include "ToneMappingEffect.h"
 #include "SubsurfaceScattering.h"
+#include "OutlineEffect.h"
 
 #include <gpu/StandardShaderLib.h>
 
 
 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)
+{
+}
 
 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 +86,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);
@@ -85,8 +94,17 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     // draw a stencil mask in hidden regions of the framebuffer.
     task.addJob<PrepareStencil>("PrepareStencil", primaryFramebuffer);
 
+    // Select items that need to be outlined
+    const auto selectionName = "contextOverlayHighlightList";
+    const auto selectMetaInput = SelectItems::Inputs(metas, Varying()).asVarying();
+    const auto selectedMetas = task.addJob<SelectItems>("PassTestMetaSelection", selectMetaInput, selectionName);
+    const auto selectMetaAndOpaqueInput = SelectItems::Inputs(opaques, selectedMetas).asVarying();
+    const auto selectedMetasAndOpaques = task.addJob<SelectItems>("PassTestOpaqueSelection", selectMetaAndOpaqueInput, selectionName);
+    const auto selectItemInput = SelectItems::Inputs(transparents, selectedMetasAndOpaques).asVarying();
+    const auto selectedItems = task.addJob<SelectItems>("PassTestTransparentSelection", selectItemInput, selectionName);
+
     // 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 +113,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 +129,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 +143,13 @@ 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);
     
     
     // 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).asVarying();
     
     task.addJob<RenderDeferred>("RenderDeferred", deferredLightingInputs);
 
@@ -139,21 +157,26 @@ 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
     {
-        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 toneAndPostRangeTimer = task.addJob<BeginGPURangeTimer>("BeginToneAndPostRangeTimer", "PostToneOverlaysAntialiasing");
 
     // 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);
 
+    const auto outlineRangeTimer = task.addJob<BeginGPURangeTimer>("BeginOutlineRangeTimer", "Outline");
+    const auto outlineInputs = DrawOutlineTask::Inputs(selectedItems, shapePlumber, deferredFramebuffer, primaryFramebuffer, deferredFrameTransform).asVarying();
+    task.addJob<DrawOutlineTask>("DrawOutline", outlineInputs);
+    task.addJob<EndGPURangeTimer>("EndOutlineRangeTimer", outlineRangeTimer);
+
     { // DEbug the bounds of the rendered items, still look at the zbuffer
         task.addJob<DrawBounds>("DrawMetaBounds", metas);
         task.addJob<DrawBounds>("DrawOpaqueBounds", opaques);
@@ -164,16 +187,16 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     }
 
     // Overlays
-    const auto overlayOpaquesInputs = DrawOverlay3D::Inputs(overlayOpaques, lightingModel).hasVarying();
-    const auto overlayTransparentsInputs = DrawOverlay3D::Inputs(overlayTransparents, lightingModel).hasVarying();
+    const auto overlayOpaquesInputs = DrawOverlay3D::Inputs(overlayOpaques, lightingModel).asVarying();
+    const auto overlayTransparentsInputs = DrawOverlay3D::Inputs(overlayTransparents, lightingModel).asVarying();
     task.addJob<DrawOverlay3D>("DrawOverlay3DOpaque", overlayOpaquesInputs, true);
     task.addJob<DrawOverlay3D>("DrawOverlay3DTransparent", overlayTransparentsInputs, false);
 
-    { // DEbug the bounds of the rendered OVERLAY items, still look at the zbuffer
+    { // Debug the bounds of the rendered Overlay items, still look at the zbuffer
         task.addJob<DrawBounds>("DrawOverlayOpaqueBounds", overlayOpaques);
         task.addJob<DrawBounds>("DrawOverlayTransparentBounds", overlayTransparents);
     }
-    
+
      // Debugging stages
     {
         // Debugging Deferred buffer job
@@ -181,10 +204,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
@@ -202,16 +225,14 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
         }
 
         task.addJob<DebugZoneLighting>("DrawZoneStack", deferredFrameTransform);
+        
+        // Render.getConfig("RenderMainView.DrawSelectionBounds").enabled = true
+        task.addJob<DrawBounds>("DrawSelectionBounds", selectedItems);
     }
 
-
     // 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);
-
     task.addJob<EndGPURangeTimer>("ToneAndPostRangeTimer", toneAndPostRangeTimer);
 
     // Blit!
@@ -269,6 +290,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 +332,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 +380,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);
             });
         }
 
diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h
index fd7c5eb23b..865849b579 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,7 @@ public:
 protected:
     render::ShapePlumberPointer _shapePlumber;
     int _maxDrawn; // initialized by Config
-    bool _opaquePass{ true };
+    bool _opaquePass { true };
 };
 
 class Blit {
@@ -163,14 +162,34 @@ public:
     void run(const render::RenderContextPointer& renderContext, const gpu::FramebufferPointer& srcFramebuffer);
 };
 
+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);
+
 };
 
 #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 03a2a4f9b1..d32857bc65 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -22,14 +22,10 @@
 #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"
-
 using namespace render;
 
+extern void initZPassPipelines(ShapePlumber& plumber, gpu::StatePointer state);
+
 void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
                           const render::ShapeBounds& inShapes) {
     assert(renderContext->args);
@@ -46,6 +42,8 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
     const auto& fbo = shadow->framebuffer;
 
     RenderArgs* args = renderContext->args;
+    ShapeKey::Builder defaultKeyBuilder;
+
     gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
         args->_batch = &batch;
         batch.enableStereo(false);
@@ -62,8 +60,8 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
         batch.setProjectionTransform(shadow->getProjection());
         batch.setViewTransform(shadow->getView(), false);
 
-        auto shadowPipeline = _shapePlumber->pickPipeline(args, ShapeKey());
-        auto shadowSkinnedPipeline = _shapePlumber->pickPipeline(args, ShapeKey::Builder().withSkinned());
+        auto shadowPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder);
+        auto shadowSkinnedPipeline = _shapePlumber->pickPipeline(args, defaultKeyBuilder.withSkinned());
 
         std::vector<ShapeKey> skinnedShapeKeys{};
 
@@ -100,19 +98,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");
diff --git a/libraries/render-utils/src/StencilMaskPass.cpp b/libraries/render-utils/src/StencilMaskPass.cpp
index 2d4efc0573..0e0d8b56b3 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
 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, 0xFF, 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..ddbf4a7ac0 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 testNoAA(gpu::State& state);
     static void testMask(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.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/UpdateSceneTask.cpp b/libraries/render-utils/src/UpdateSceneTask.cpp
index 2daee5fb5a..0e0c3f087b 100644
--- a/libraries/render-utils/src/UpdateSceneTask.cpp
+++ b/libraries/render-utils/src/UpdateSceneTask.cpp
@@ -13,11 +13,13 @@
 #include <render/SceneTask.h>
 #include "LightStage.h"
 #include "BackgroundStage.h"
+#include <render/TransitionStage.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<render::TransitionStageSetup>("TransitionStageSetup");
 
     task.addJob<DefaultLightingSetup>("DefaultLightingSetup");
 
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..73e14bd319 100644
--- a/libraries/render-utils/src/glowLine.slf
+++ b/libraries/render-utils/src/glowLine.slf
@@ -9,7 +9,8 @@
 //  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;
 
@@ -17,10 +18,10 @@ 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..fd3a85d254 100644
--- a/libraries/render-utils/src/glowLine.slv
+++ b/libraries/render-utils/src/glowLine.slv
@@ -18,7 +18,9 @@ layout(std140) uniform lineData {
     vec4 color;
 };
 
-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;
@@ -45,11 +47,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/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/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/render-utils/src/model_shadow_fade.slv b/libraries/render-utils/src/model_shadow_fade.slv
new file mode 100644
index 0000000000..8762f1dd90
--- /dev/null
+++ b/libraries/render-utils/src/model_shadow_fade.slv
@@ -0,0 +1,29 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  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()$>
+
+out vec4 _worldPosition;
+
+void main(void) {
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
+    <$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 6a91081c95..7070a4def5 100644
--- a/libraries/render/src/render/Args.h
+++ b/libraries/render/src/render/Args.h
@@ -63,12 +63,6 @@ namespace render {
     public:
         enum RenderMode { DEFAULT_RENDER_MODE, SHADOW_RENDER_MODE, DIFFUSE_RENDER_MODE, NORMAL_RENDER_MODE, MIRROR_RENDER_MODE, SECONDARY_CAMERA_RENDER_MODE };
         enum DisplayMode { MONO, STEREO_MONITOR, STEREO_HMD };
-        enum OutlineFlags {
-            RENDER_OUTLINE_NONE = 0,
-            RENDER_OUTLINE_WIREFRAMES = 1,
-            RENDER_OUTLINE_MARKETPLACE_MODE = 2,
-            RENDER_OUTLINE_SHADER = 4
-        };
         enum DebugFlags {
             RENDER_DEBUG_NONE = 0,
             RENDER_DEBUG_HULLS = 1
@@ -115,13 +109,15 @@ namespace render {
         int _boundaryLevelAdjust { 0 };
         RenderMode _renderMode { DEFAULT_RENDER_MODE };
         DisplayMode _displayMode { MONO };
-        OutlineFlags _outlineFlags{ RENDER_OUTLINE_NONE };
         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 };
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 a3175ffdec..710507bd79 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"
 
@@ -42,25 +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->_shapePipeline = shapeContext->pickPipeline(args, key);
         if (args->_shapePipeline) {
             args->_shapePipeline->prepareShapeItem(args, key, item);
             item.render(args);
-        } 
+        }
         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);
@@ -85,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());
@@ -100,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;
             }
         }
@@ -111,18 +119,22 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
     for (auto& pipelineKey : sortedPipelines) {
         auto& bucket = sortedShapes[pipelineKey];
         args->_shapePipeline = shapeContext->pickPipeline(args, pipelineKey);
-        if (!args->_shapePipeline) {            
+        if (!args->_shapePipeline) {
             continue;
         }
+        args->_itemShapeKey = pipelineKey._flags.to_ulong();
         for (auto& item : bucket) {
             args->_shapePipeline->prepareShapeItem(args, pipelineKey, item);
             item.render(args);
         }
     }
     args->_shapePipeline = nullptr;
-    for (auto& item : ownPipelineBucket) {
+    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) {
@@ -176,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) {
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..e0298c2a44 100644
--- a/libraries/render/src/render/FilterTask.cpp
+++ b/libraries/render/src/render/FilterTask.cpp
@@ -28,7 +28,7 @@ void FilterLayeredItems::run(const RenderContextPointer& renderContext, const It
     outItems.clear();
 
     // 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);
@@ -51,13 +51,20 @@ void SliceItems::run(const RenderContextPointer& renderContext, const ItemBounds
 
 }
 
-void SelectItems::run(const RenderContextPointer& renderContext, const ItemBounds& inItems, ItemBounds& outItems) {
+void SelectItems::run(const RenderContextPointer& renderContext, const Inputs& inputs, ItemBounds& outItems) {
     auto selection = renderContext->_scene->getSelection(_name);
     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)) {
@@ -111,3 +118,21 @@ void MetaToSubItems::run(const RenderContextPointer& renderContext, const ItemBo
     }
 }
 
+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);
+
+            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..1e023a8bb9 100644
--- a/libraries/render/src/render/FilterTask.h
+++ b/libraries/render/src/render/FilterTask.h
@@ -113,22 +113,23 @@ namespace render {
     // Keep items belonging to the job selection
     class SelectItems {
     public:
-        using JobModel = Job::ModelIO<SelectItems, ItemBounds, ItemBounds>;
+        using Inputs = VaryingSet2<ItemBounds, ItemBounds>;
+        using JobModel = Job::ModelIO<SelectItems, Inputs, ItemBounds>;
         
         std::string _name;
         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 +143,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/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..f0fbbb1973 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;
@@ -78,3 +83,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..96faf9719e 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;
@@ -368,7 +363,7 @@ public:
     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 +371,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 +435,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 +487,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/Scene.cpp b/libraries/render/src/render/Scene.cpp
index b8f93c52c3..714be2a8c6 100644
--- a/libraries/render/src/render/Scene.cpp
+++ b/libraries/render/src/render/Scene.cpp
@@ -13,13 +13,13 @@
 #include <numeric>
 #include <gpu/Batch.h>
 #include "Logging.h"
+#include "TransitionStage.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,9 +30,24 @@ 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) {
@@ -41,11 +56,12 @@ void Transaction::resetSelection(const Selection& selection) {
 
 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());
 }
 
 
@@ -82,16 +98,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 +150,59 @@ 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);
     }
 }
 
-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 +215,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 +236,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,10 +258,107 @@ void Scene::updateItems(const ItemIDs& ids, UpdateFunctors& functors) {
                 _masterNonspatialSet.insert(updateID);
             }
         }
+    }
+}
 
+void Scene::transitionItems(const Transaction::TransitionAdds& transactions) {
+    auto transitionStage = getStage<TransitionStage>(TransitionStage::getName());
 
-        // next loop
-        updateFunctor++;
+    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::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);
     }
 }
 
@@ -227,8 +373,8 @@ Selection Scene::getSelection(const Selection::Name& name) const {
     }
 }
 
-void Scene::resetSelections(const Selections& selections) {
-    for (auto selection : selections) {
+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..fef2077897 100644
--- a/libraries/render/src/render/Scene.h
+++ b/libraries/render/src/render/Scene.h
@@ -16,10 +16,12 @@
 #include "SpatialTree.h"
 #include "Stage.h"
 #include "Selection.h"
+#include "Transition.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 +33,23 @@ class Engine;
 // of updating the scene before it s rendered.
 // 
 class Transaction {
+    friend class Scene;
 public:
+
+    typedef std::function<void(ItemID, const Transition*)> TransitionQueryFunc;
+
     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));
@@ -54,15 +66,31 @@ public:
     // 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 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>;
+
+    Resets _resetItems;
+    Removes _removedItems;
+    Updates _updatedItems;
+    TransitionAdds _addedTransitions;
+    TransitionQueries _queriedTransitions;
+    TransitionReApplies _reAppliedTransitions;
+    SelectionResets _resetSelections;
 };
 typedef std::queue<Transaction> TransactionQueue;
 
@@ -89,6 +117,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();
 
@@ -123,14 +154,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 +181,20 @@ 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 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 c83c0b44fc..762b7712d7 100644
--- a/libraries/render/src/render/ShapePipeline.cpp
+++ b/libraries/render/src/render/ShapePipeline.cpp
@@ -85,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);
 
@@ -103,7 +105,9 @@ 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, itemSetter);
@@ -117,7 +121,7 @@ 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 try things to solve that
         if (_missingKeys.find(key) == _missingKeys.end()) {
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index 13daac2db7..f0749504eb 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -36,6 +36,7 @@ public:
         DEPTH_BIAS,
         WIREFRAME,
         NO_CULL_FACE,
+        FADE,
 
         OWN_PIPELINE,
         INVALID,
@@ -83,6 +84,7 @@ 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); }
@@ -143,6 +145,9 @@ 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); }
 
@@ -170,6 +175,7 @@ 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]; }
@@ -209,6 +215,7 @@ inline QDebug operator<<(QDebug debug, const ShapeKey& key) {
                 << "isDepthBiased:" << key.isDepthBiased()
                 << "isWireframe:" << key.isWireframe()
                 << "isCullFace:" << key.isCullFace()
+                << "isFaded:" << key.isFaded()
                 << "]";
         }
     } else {
@@ -230,6 +237,7 @@ public:
             LIGHTING_MODEL,
             LIGHT,
             LIGHT_AMBIENT_BUFFER,
+            FADE_PARAMETERS,
         };
 
         enum MAP {
@@ -241,6 +249,7 @@ public:
             OCCLUSION,
             SCATTERING,
             LIGHT_AMBIENT,
+            FADE_MASK,
         };
     };
 
@@ -259,6 +268,8 @@ public:
         int lightBufferUnit;
         int lightAmbientBufferUnit;
         int lightAmbientMapUnit;
+        int fadeMaskTextureUnit;
+        int fadeParameterBufferUnit;
     };
     using LocationsPointer = std::shared_ptr<Locations>;
 
@@ -266,7 +277,7 @@ public:
 
     using ItemSetter = std::function<void(const ShapePipeline&, render::Args*, const render::Item&)>;
 
-    ShapePipeline(gpu::PipelinePointer pipeline, LocationsPointer locations, BatchSetter batchSetter, ItemSetter itemSetter) :
+    ShapePipeline(gpu::PipelinePointer pipeline, LocationsPointer locations, BatchSetter batchSetter = nullptr, ItemSetter itemSetter = nullptr) :
         pipeline(pipeline),
         locations(locations),
         _batchSetter(batchSetter),
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..33ef829c64
--- /dev/null
+++ b/libraries/render/src/render/TransitionStage.cpp
@@ -0,0 +1,42 @@
+#include "TransitionStage.h"
+
+#include <algorithm>
+
+using namespace render;
+
+std::string TransitionStage::_name("Transition");
+
+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..226d531d8b
--- /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{ indexed_container::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/Task.h b/libraries/render/src/task/Task.h
index f76ba92546..e99b33305c 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());
diff --git a/libraries/render/src/task/Varying.h b/libraries/render/src/task/Varying.h
index 50f4acd414..9ce234061e 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,7 +289,7 @@ 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)); }
 };
 
     
@@ -281,6 +301,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/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/FileScriptingInterface.cpp b/libraries/script-engine/src/FileScriptingInterface.cpp
index 5f2460be78..68a141ad97 100644
--- a/libraries/script-engine/src/FileScriptingInterface.cpp
+++ b/libraries/script-engine/src/FileScriptingInterface.cpp
@@ -32,10 +32,11 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent
     // nothing for now
 }
 
-void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip) {
+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;
     if (!isZip) {
         tempDir.remove(fileName);
@@ -52,14 +53,17 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool
     }
 
     QStringList fileList = unzipFile(path, tempDir);
-    QString filename = QUrl::fromLocalFile(fileList.first()).toString();
     
-    if (filename != "") {
-        qCDebug(scriptengine) << "File to upload: " + filename;
+    if (!fileList.isEmpty()) {
+        qCDebug(scriptengine) << "File to upload: " + fileList.first();
     } else {
         qCDebug(scriptengine) << "Unzip failed";
     }
-    emit unzipResult(path, fileList, autoAdd, isZip);
+
+    if (path.contains("vr.google.com/downloads")) {
+        isZip = true;
+    }
+    emit unzipResult(path, fileList, autoAdd, isZip, isBlocks);
 
 }
 
diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h
index 4069e7cc78..e4c27dbf7f 100644
--- a/libraries/script-engine/src/FileScriptingInterface.h
+++ b/libraries/script-engine/src/FileScriptingInterface.h
@@ -24,11 +24,11 @@ public:
 
 public slots:
     QString convertUrlToPath(QUrl url);
-    void runUnzip(QString path, QUrl url, bool autoAdd, bool isZip);
+    void runUnzip(QString path, QUrl url, bool autoAdd, bool isZip, bool isBlocks);
     QString getTempDir();
 
 signals:
-    void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip);
+    void unzipResult(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks);
 
 private:
     bool isTempDir(QString tempDir);
diff --git a/libraries/script-engine/src/RecordingScriptingInterface.cpp b/libraries/script-engine/src/RecordingScriptingInterface.cpp
index b51e9cd529..55895e31a4 100644
--- a/libraries/script-engine/src/RecordingScriptingInterface.cpp
+++ b/libraries/script-engine/src/RecordingScriptingInterface.cpp
@@ -54,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);
 
@@ -69,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);
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/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 8b8eed02fd..a2dac7ed43 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -97,6 +97,9 @@ static const bool HIFI_AUTOREFRESH_FILE_SCRIPTS { true };
 Q_DECLARE_METATYPE(QScriptEngine::FunctionSignature)
 int functionSignatureMetaID = qRegisterMetaType<QScriptEngine::FunctionSignature>();
 
+Q_DECLARE_METATYPE(ScriptEnginePointer)
+int scriptEnginePointerMetaID = qRegisterMetaType<ScriptEnginePointer>();
+
 Q_LOGGING_CATEGORY(scriptengineScript, "hifi.scriptengine.script")
 
 static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
@@ -153,6 +156,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(),
@@ -160,10 +172,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
@@ -208,22 +220,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()));
     }
 }
 
@@ -294,7 +293,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();
@@ -503,7 +502,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();
@@ -516,7 +516,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
@@ -539,11 +540,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) {
@@ -693,7 +694,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);
@@ -1178,7 +1179,7 @@ void ScriptEngine::run() {
         }
     }
 
-    emit finished(_fileNameString, this);
+    emit finished(_fileNameString, qSharedPointerCast<ScriptEngine>(sharedFromThis()));
 
     _isRunning = false;
     emit runningStateChanged();
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 7c473a305b..7109e0f582 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -53,6 +53,8 @@ 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;
+
 class CallbackData {
 public:
     QScriptValue function;
@@ -242,7 +244,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 +330,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 57b04eeb82..6cfa678652 100644
--- a/libraries/script-engine/src/ScriptEngines.cpp
+++ b/libraries/script-engine/src/ScriptEngines.cpp
@@ -137,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
@@ -161,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
@@ -187,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....";
 }
@@ -369,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;
@@ -417,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);
                 });
             }
@@ -449,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 };
-        BLOCKING_INVOKE_METHOD(this, "loadScript", 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),
@@ -479,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);
@@ -500,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);
@@ -516,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);
 
@@ -532,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);
     });
 
@@ -558,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/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/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/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/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 4ae907eb3b..6b9718fbb8 100644
--- a/libraries/shared/src/GeometryUtil.cpp
+++ b/libraries/shared/src/GeometryUtil.cpp
@@ -17,6 +17,7 @@
 #include <glm/gtx/quaternion.hpp>
 
 #include "NumericalConstants.h"
+#include "GLMHelpers.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
@@ -657,3 +658,150 @@ bool findPlaneFromPoints(const glm::vec3* points, size_t numPoints, glm::vec3& p
     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 a5ee67748b..eb9424d938 100644
--- a/libraries/shared/src/GeometryUtil.h
+++ b/libraries/shared/src/GeometryUtil.h
@@ -13,6 +13,7 @@
 #define hifi_GeometryUtil_h
 
 #include <glm/glm.hpp>
+#include <vector>
 
 glm::vec3 computeVectorFromPointToSegment(const glm::vec3& point, const glm::vec3& start, const glm::vec3& end);
 
@@ -166,4 +167,10 @@ private:
 // 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/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/PathUtils.cpp b/libraries/shared/src/PathUtils.cpp
index 0636411f51..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,7 +18,6 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QUrl>
-#include "PathUtils.h"
 #include <QtCore/QStandardPaths>
 #include <mutex> // std::once
 #include "shared/GlobalAppProperties.h"
@@ -54,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) {
@@ -92,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 3cb3cd3b63..8c4bcf2394 100644
--- a/libraries/shared/src/PathUtils.h
+++ b/libraries/shared/src/PathUtils.h
@@ -14,6 +14,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
+#include <QtCore/QDir>
 
 #include "DependencyManager.h"
 
@@ -36,6 +37,8 @@ public:
     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/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 6fa2cb9b1f..a243a6d58d 100644
--- a/libraries/shared/src/Preferences.h
+++ b/libraries/shared/src/Preferences.h
@@ -257,12 +257,12 @@ public:
 };
 
 class SpinnerSliderPreference : public FloatPreference {
-	Q_OBJECT
+    Q_OBJECT
 public:
-	SpinnerSliderPreference(const QString& category, const QString& name, Getter getter, Setter setter)
-		: FloatPreference(category, name, getter, setter) { }
+    SpinnerSliderPreference(const QString& category, const QString& name, Getter getter, Setter setter)
+        : FloatPreference(category, name, getter, setter) { }
 
-	Type getType() override { return SpinnerSlider; }
+    Type getType() override { return SpinnerSlider; }
 };
 
 class IntSpinnerPreference : public IntPreference {
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 341a4cb101..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);
diff --git a/libraries/shared/src/SpatiallyNestable.cpp b/libraries/shared/src/SpatiallyNestable.cpp
index fc189c5e3e..8ea38f5f13 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;
 }
@@ -155,7 +156,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 +179,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 +213,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 +279,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 +620,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 +658,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 +819,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 +827,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 +835,6 @@ void SpatiallyNestable::setLocalScale(const glm::vec3& scale) {
     }
 
     bool changed = false;
-    // TODO: scale
     _transformLock.withWriteLock([&] {
         if (_transform.getScale() != scale) {
             _transform.setScale(scale);
@@ -904,6 +878,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 +891,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();
     }
 }
 
@@ -962,12 +967,12 @@ bool SpatiallyNestable::checkAndMaybeUpdateQueryAACube() {
                 _queryAACube = maxAACube;
             }
 
-            getThisPointer()->forEachDescendant([&](SpatiallyNestablePointer descendant) {
+            forEachDescendant([&](const SpatiallyNestablePointer& descendant) {
                 bool childSuccess;
                 AACube descendantAACube = descendant->getQueryAACube(childSuccess);
                 if (childSuccess) {
                     if (_queryAACube.contains(descendantAACube)) {
-                        return;
+                        return ;
                     }
                     _queryAACube += descendantAACube.getMinimumPoint();
                     _queryAACube += descendantAACube.getMaximumPoint();
@@ -995,10 +1000,13 @@ bool SpatiallyNestable::queryAACubeNeedsUpdate() const {
 
     // make sure children are still in their boxes, also.
     bool childNeedsUpdate = false;
-    getThisPointer()->forEachDescendant([&](SpatiallyNestablePointer descendant) {
+    forEachDescendantTest([&](const SpatiallyNestablePointer& descendant) {
         if (!childNeedsUpdate && descendant->queryAACubeNeedsUpdate()) {
             childNeedsUpdate = true;
+            // Don't recurse further
+            return false;
         }
+        return true;
     });
     return childNeedsUpdate;
 }
@@ -1014,7 +1022,7 @@ void SpatiallyNestable::updateQueryAACube() {
         _queryAACube = maxAACube;
     }
 
-    getThisPointer()->forEachDescendant([&](SpatiallyNestablePointer descendant) {
+    forEachDescendant([&](const SpatiallyNestablePointer& descendant) {
         bool success;
         AACube descendantAACube = descendant->getQueryAACube(success);
         if (success) {
@@ -1164,3 +1172,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 78a014d7c1..b6be4dc056 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;
@@ -111,17 +115,18 @@ public:
     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;
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..316fcb2f04 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;
@@ -170,7 +171,6 @@ protected:
     };
     typedef std::bitset<NUM_FLAGS> Flags;
 
-
     // TRS
     Quat _rotation;
     Vec3 _scale;
@@ -202,6 +202,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);
diff --git a/libraries/shared/src/ViewFrustum.cpp b/libraries/shared/src/ViewFrustum.cpp
index 7e4f64686b..978221e167 100644
--- a/libraries/shared/src/ViewFrustum.cpp
+++ b/libraries/shared/src/ViewFrustum.cpp
@@ -56,16 +56,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 +161,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 +321,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) {
diff --git a/libraries/shared/src/ViewFrustum.h b/libraries/shared/src/ViewFrustum.h
index 221b0b5a07..d1b88fb2a5 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;
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 c7b943f0dd..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);
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/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/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/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/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/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 106574ff4f..8eb4989ab6 100644
--- a/libraries/ui/src/CursorManager.cpp
+++ b/libraries/ui/src/CursorManager.cpp
@@ -24,13 +24,6 @@ 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", },
@@ -38,7 +31,7 @@ namespace Cursor {
         { Icon::ARROW, "ARROW", },
         { Icon::RETICLE, "RETICLE", },
     };
-    QMap<uint16_t, QString> Manager::ICONS;
+
     static uint16_t _customIconId = Icon::USER_BASE;
 
     Manager::Manager() {
@@ -62,8 +55,8 @@ namespace Cursor {
     }
 
     Manager& Manager::instance() {
-        static Manager instance;
-        return instance;
+        static QSharedPointer<Manager> instance = DependencyManager::get<Cursor::Manager>();
+        return *instance;
     }
 
     QList<uint16_t> Manager::registeredIcons() const {
@@ -76,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 2a92cc7f45..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>
 
@@ -39,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:
@@ -52,12 +61,13 @@ namespace Cursor {
         QList<uint16_t> registeredIcons() const;
         const QString& getIconImage(uint16_t icon);
 
-        static QMap<uint16_t, QString> ICONS;
         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 135729653e..297ed9ca50 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -91,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);
@@ -129,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) {
@@ -145,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
 
@@ -204,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);
     }
 };
@@ -263,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);
@@ -271,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 {
@@ -296,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);
     }
@@ -349,6 +371,31 @@ 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;
@@ -364,6 +411,24 @@ 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;
@@ -384,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) {
@@ -554,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() {
@@ -601,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);
     }
 };
@@ -638,6 +723,35 @@ QString OffscreenUi::fileDialog(const QVariantMap& properties) {
     return result.toUrl().toLocalFile();
 }
 
+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;
@@ -660,6 +774,28 @@ 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;
@@ -684,6 +820,30 @@ 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;
@@ -706,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
@@ -733,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);
     }
@@ -770,6 +973,39 @@ 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()) {
@@ -793,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;
@@ -837,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/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/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 2012ebbe30..6cf8a927ff 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>
@@ -43,7 +44,6 @@
 
 #include "types/FileTypeProfile.h"
 #include "types/HFWebEngineProfile.h"
-#include "types/HFTabletWebEngineProfile.h"
 #include "types/SoundEffect.h"
 
 #include "Logging.h"
@@ -185,7 +185,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);
@@ -211,12 +211,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);
     }
 };
 
@@ -297,6 +297,7 @@ private:
 };
 
 
+
 #define SINGLE_QML_ENGINE 0
 
 #if SINGLE_QML_ENGINE
@@ -305,6 +306,9 @@ 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());
@@ -328,7 +332,6 @@ void initializeQmlEngine(QQmlEngine* engine, QQuickWindow* window) {
     }
     rootContext->setContextProperty("FileTypeProfile", new FileTypeProfile(rootContext));
     rootContext->setContextProperty("HFWebEngineProfile", new HFWebEngineProfile(rootContext));
-    rootContext->setContextProperty("HFTabletWebEngineProfile", new HFTabletWebEngineProfile(rootContext));
     rootContext->setContextProperty("Paths", DependencyManager::get<PathUtils>().data());
 }
 
@@ -374,6 +377,15 @@ void releaseEngine(QQmlEngine* engine) {
 #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() {
     _canvas->makeCurrent();
 
@@ -395,9 +407,9 @@ void OffscreenQmlSurface::cleanup() {
 }
 
 void OffscreenQmlSurface::render() {
-#ifdef HIFI_ENABLE_NSIGHT_DEBUG
-    return;
-#endif
+    if (nsightActive()) {
+        return;
+    }
     if (_paused) {
         return;
     }
@@ -456,8 +468,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;
@@ -488,7 +500,7 @@ void OffscreenQmlSurface::onAboutToQuit() {
     QObject::disconnect(&_updateTimer);
 }
 
-void OffscreenQmlSurface::create(QOpenGLContext* shareContext) {
+void OffscreenQmlSurface::create() {
     qCDebug(uiLogging) << "Building QML surface";
 
     _renderControl = new QMyQuickRenderControl();
@@ -509,15 +521,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()));
@@ -527,11 +546,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,
@@ -626,7 +640,7 @@ 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, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback) {
     if (QThread::currentThread() != thread()) {
         qCWarning(uiLogging) << "Called load on a non-surface thread";
     }
@@ -646,38 +660,37 @@ 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);
+            [this, qmlComponent, targetContext, onQmlLoadedCallback](QQmlComponent::Status) {
+            finishQmlLoad(qmlComponent, targetContext, onQmlLoadedCallback);
         });
-        return nullptr;
+        return;
     }
 
-    return finishQmlLoad(qmlComponent, targetContext, f);
+    finishQmlLoad(qmlComponent, targetContext, onQmlLoadedCallback);
 }
 
-QObject* OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> f) {
-    return load(qmlSource, true, f);
+void OffscreenQmlSurface::loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> 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, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback) {
+    load(qmlSource, false, 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, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback) {
     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()) {
@@ -687,11 +700,24 @@ 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) {
+        onQmlLoadedCallback(qmlContext, newObject);
+    }
 
     QObject* eventBridge = qmlContext->contextProperty("eventBridge").value<QObject*>();
     if (qmlContext != _qmlContext && eventBridge && eventBridge != this) {
@@ -703,29 +729,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)));
@@ -734,7 +751,8 @@ 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
+    onQmlLoadedCallback(qmlContext, newObject);
 }
 
 void OffscreenQmlSurface::updateQuick() {
@@ -809,7 +827,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());
             }
@@ -914,7 +932,7 @@ void OffscreenQmlSurface::focusDestroyed(QObject *obj) {
 }
 
 void OffscreenQmlSurface::onFocusObjectChanged(QObject* object) {
-    QQuickItem* item = dynamic_cast<QQuickItem*>(object);
+    QQuickItem* item = static_cast<QQuickItem*>(object);
     if (!item) {
         setFocusText(false);
         _currentFocusItem = nullptr;
@@ -969,8 +987,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();
 
@@ -1001,6 +1019,10 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key) {
 }
 
 void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool numeric) {
+#if Q_OS_ANDROID
+    return;
+#endif
+
     if (!object) {
         return;
     }
@@ -1061,4 +1083,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 54f27e3b1f..990f81848d 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.h
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.h
@@ -39,20 +39,22 @@ class OffscreenQmlSurface : public QObject {
     Q_OBJECT
     Q_PROPERTY(bool focusText READ isFocusText NOTIFY focusTextChanged)
 public:
+    static void setSharedContext(QOpenGLContext* context);
+
     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, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback = [](QQmlContext*, QObject*) {});
+    Q_INVOKABLE void loadInNewContext(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback = [](QQmlContext*, QObject*) {});
+    Q_INVOKABLE void load(const QUrl& qmlSource, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback = [](QQmlContext*, QObject*) {});
+    Q_INVOKABLE void load(const QString& qmlSourceFile, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback = [](QQmlContext*, QObject*) {}) {
+        return load(QUrl(qmlSourceFile), onQmlLoadedCallback);
     }
     void clearCache();
     void setMaxFps(uint8_t maxFps) { _maxFps = maxFps; }
@@ -77,7 +79,7 @@ public:
     bool eventFilter(QObject* originalDestination, QEvent* event) override;
 
     void setKeyboardRaised(QObject* object, bool raised, bool numeric = false);
-    Q_INVOKABLE void synthesizeKeyPress(QString key);
+    Q_INVOKABLE void synthesizeKeyPress(QString key, QObject* targetOverride = nullptr);
 
     using TextureAndFence = std::pair<uint32_t, void*>;
     // Checks to see if a new texture is available.  If one is, the function returns true and 
@@ -116,7 +118,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, std::function<void(QQmlContext*, QObject*)> onQmlLoadedCallback);
     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/TabletScriptingInterface.cpp b/libraries/ui/src/ui/TabletScriptingInterface.cpp
index 984d743ebf..4e625c2494 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.cpp
+++ b/libraries/ui/src/ui/TabletScriptingInterface.cpp
@@ -26,6 +26,8 @@
 // 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";
+
 
 TabletScriptingInterface::TabletScriptingInterface() {
 }
@@ -425,6 +427,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)));
+        }
     }
 }
 
@@ -444,6 +449,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";
     }
@@ -470,9 +478,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;
     }
 
@@ -492,6 +500,10 @@ void TabletProxy::loadQMLSource(const QVariant& path) {
         }
         _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";
     }
@@ -523,6 +535,9 @@ 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";
     }
@@ -599,14 +614,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;
     }
 
@@ -619,8 +637,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;
diff --git a/libraries/ui/src/ui/TabletScriptingInterface.h b/libraries/ui/src/ui/TabletScriptingInterface.h
index af38cb9351..386bce45a8 100644
--- a/libraries/ui/src/ui/TabletScriptingInterface.h
+++ b/libraries/ui/src/ui/TabletScriptingInterface.h
@@ -42,6 +42,7 @@ class TabletScriptingInterface : public QObject, public Dependency {
 public:
     TabletScriptingInterface();
     ~TabletScriptingInterface();
+    static const QString QML;
 
     void setToolbarScriptingInterface(ToolbarScriptingInterface* toolbarScriptingInterface) { _toolbarScriptingInterface = toolbarScriptingInterface; }
 
@@ -122,9 +123,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);
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..f9686d2311 100644
--- a/libraries/ui/src/ui/types/RequestFilters.cpp
+++ b/libraries/ui/src/ui/types/RequestFilters.cpp
@@ -13,6 +13,7 @@
 #include "NetworkingConstants.h"
 
 #include <QtCore/QDebug>
+#include <SettingHandle.h>
 
 #include "AccountManager.h"
 
@@ -42,7 +43,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 +55,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/plugins/hifiSdl2/src/SDL2Manager.cpp b/plugins/hifiSdl2/src/SDL2Manager.cpp
index 021cb4dfec..a5376af24e 100644
--- a/plugins/hifiSdl2/src/SDL2Manager.cpp
+++ b/plugins/hifiSdl2/src/SDL2Manager.cpp
@@ -54,49 +54,6 @@ SDL_JoystickID SDL2Manager::getInstanceId(SDL_GameController* controller) {
 }
 
 void SDL2Manager::init() {
-    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";
-    }
 }
 
 QStringList SDL2Manager::getSubdeviceNames() {
@@ -110,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);
diff --git a/plugins/hifiSixense/CMakeLists.txt b/plugins/hifiSixense/CMakeLists.txt
index 58aeb6c88f..55880584a8 100644
--- a/plugins/hifiSixense/CMakeLists.txt
+++ b/plugins/hifiSixense/CMakeLists.txt
@@ -6,11 +6,13 @@
 #  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
 #
 
-# FIXME if we want to re-enable this, we need to fix the mechanism for installing the 
+# 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
-#if (NOT ANDROID)
-#  set(TARGET_NAME hifiSixense)
-#  setup_hifi_plugin(Script Qml Widgets)
-#  link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
-#  target_sixense()
-#endif ()
+# 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)
+  link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
+  target_sixense()
+endif ()
diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp
index 0df504dfa2..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;
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/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/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index b31f55edeb..96ad19f46b 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -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);
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/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index 5a1c23839e..430dc193a3 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -375,7 +375,7 @@ void ViveControllerManager::InputDevice::update(float deltaTime, const controlle
     calibrateFromHandController(inputCalibrationData);
     calibrateFromUI(inputCalibrationData);
 
-    updateCalibratedLimbs();
+    updateCalibratedLimbs(inputCalibrationData);
     _lastSimPoseData = _nextSimPoseData;
 }
 
@@ -676,40 +676,53 @@ void ViveControllerManager::InputDevice::uncalibrate() {
     _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 puckPostOffset = _pucksPostOffset.find(puckIndex);
-        auto puckPreOffset = _pucksPreOffset.find(puckIndex);
 
-        if (puckPose != _poseStateMap.end()) {
-            if (puckPreOffset != _pucksPreOffset.end() && puckPostOffset != _pucksPostOffset.end()) {
-                return puckPose->second.postTransform(puckPostOffset->second).transform(puckPreOffset->second);
-            } else if (puckPostOffset != _pucksPostOffset.end()) {
-                return puckPose->second.postTransform(puckPostOffset->second);
-            } else if (puckPreOffset != _pucksPreOffset.end()) {
-                return puckPose->second.transform(puckPreOffset->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();
@@ -924,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,
diff --git a/plugins/openvr/src/ViveControllerManager.h b/plugins/openvr/src/ViveControllerManager.h
index 9a7b2cbc93..4a7fcaf85e 100644
--- a/plugins/openvr/src/ViveControllerManager.h
+++ b/plugins/openvr/src/ViveControllerManager.h
@@ -79,10 +79,10 @@ private:
         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);
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 2270118861..f892a5ec78 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",
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/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/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/utilities/render/configSlider/ConfigSlider.qml b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
index 996cf4b34c..021365686a 100644
--- a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
@@ -38,11 +38,12 @@ Item {
     }
 
     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.topMargin: 15
     }
 
     Binding {
@@ -56,7 +57,7 @@ Item {
     Slider {
         id: sliderControl
         stepSize: root.integral ? 1.0 : 0.0
-        width: 150
+        width: root.width-130
         height: 20
         anchors.right: root.right
         anchors.rightMargin: 8
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/debugOutline.js b/scripts/developer/utilities/render/debugOutline.js
new file mode 100644
index 0000000000..e333ab5869
--- /dev/null
+++ b/scripts/developer/utilities/render/debugOutline.js
@@ -0,0 +1,20 @@
+//
+//  debugOutline.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('outline.qml');
+var window = new OverlayWindow({
+    title: 'Outline',
+    source: qml,
+    width: 285, 
+    height: 370,
+});
+window.closed.connect(function() { Script.stop(); });
\ No newline at end of file
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/outline.qml b/scripts/developer/utilities/render/outline.qml
new file mode 100644
index 0000000000..e17f7c1f1c
--- /dev/null
+++ b/scripts/developer/utilities/render/outline.qml
@@ -0,0 +1,119 @@
+//
+//  outline.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.5
+import QtQuick.Controls 1.4
+import "configSlider"
+
+Item {
+    id: root
+    property var debugConfig: Render.getConfig("RenderMainView.OutlineDebug")
+    property var drawConfig: Render.getConfig("RenderMainView.OutlineEffect")
+
+    Column {
+        spacing: 8
+
+        CheckBox {
+            text: "View Outlined Depth"
+            checked: root.debugConfig["viewOutlinedDepth"]
+            onCheckedChanged: {
+                root.debugConfig["viewOutlinedDepth"] = checked;
+            }
+        }
+        CheckBox {
+            text: "Glow"
+            checked: root.drawConfig["glow"]
+            onCheckedChanged: {
+                root.drawConfig["glow"] = checked;
+            }
+        }
+        ConfigSlider {
+            label: "Width"
+            integral: false
+            config: root.drawConfig
+            property: "width"
+            max: 15.0
+            min: 0.0
+            width: 280
+        }  
+        ConfigSlider {
+            label: "Intensity"
+            integral: false
+            config: root.drawConfig
+            property: "intensity"
+            max: 1.0
+            min: 0.0
+            width: 280
+        }  
+
+        GroupBox {
+            title: "Color"
+            width: 280
+            Column {
+                spacing: 8
+
+                ConfigSlider {
+                    label: "Red"
+                    integral: false
+                    config: root.drawConfig
+                    property: "colorR"
+                    max: 1.0
+                    min: 0.0
+                    width: 270
+                }  
+                ConfigSlider {
+                    label: "Green"
+                    integral: false
+                    config: root.drawConfig
+                    property: "colorG"
+                    max: 1.0
+                    min: 0.0
+                    width: 270
+                }  
+                ConfigSlider {
+                    label: "Blue"
+                    integral: false
+                    config: root.drawConfig
+                    property: "colorB"
+                    max: 1.0
+                    min: 0.0
+                    width: 270
+                }
+            }
+        }
+
+        GroupBox {
+            title: "Fill Opacity"
+            width: 280
+            Column {
+                spacing: 8
+
+                ConfigSlider {
+                    label: "Unoccluded"
+                    integral: false
+                    config: root.drawConfig
+                    property: "fillOpacityUnoccluded"
+                    max: 1.0
+                    min: 0.0
+                    width: 270
+                }  
+                ConfigSlider {
+                    label: "Occluded"
+                    integral: false
+                    config: root.drawConfig
+                    property: "fillOpacityOccluded"
+                    max: 1.0
+                    min: 0.0
+                    width: 270
+                }  
+            }
+        }
+    }
+}
diff --git a/scripts/system/away.js b/scripts/system/away.js
index f98408376d..18eb5fa946 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,22 @@ 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 AVATAR_SELF_ID = "{00000000-0000-0000-0000-000000000001}";
+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: AVATAR_SELF_ID,
+    parentJointIndex: CAMERA_MATRIX
 };
 
 var AWAY_INTRO = {
@@ -83,25 +89,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 +102,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 +126,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 +179,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 +242,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 +274,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 +305,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..c3d240f9a5 100644
--- a/scripts/system/bubble.js
+++ b/scripts/system/bubble.js
@@ -27,8 +27,8 @@
         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 },
         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 * MyAvatar.sensorToWorldScale, y: MyAvatar.scale * 0.5 + 0.2 * MyAvatar.sensorToWorldScale, z: 2 * MyAvatar.sensorToWorldScale },
         visible: false,
         ignoreRayIntersection: true
     });
@@ -62,9 +62,17 @@
         }
 
         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 },
+            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 * MyAvatar.sensorToWorldScale, 
+                y: MyAvatar.scale * 0.5 + 0.2 * MyAvatar.sensorToWorldScale, 
+                z: 2 * MyAvatar.sensorToWorldScale 
+            },
             visible: true
         });
         bubbleOverlayTimestamp = Date.now();
@@ -105,11 +113,11 @@
                         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,
-                        y: ((1 - ((BUBBLE_RAISE_ANIMATION_DURATION_MS - delay) / BUBBLE_RAISE_ANIMATION_DURATION_MS)) * MyAvatar.scale * 0.5 + 0.5),
-                        z: 2
+                        x: 2 * MyAvatar.sensorToWorldScale,
+                        y: ((1 - ((BUBBLE_RAISE_ANIMATION_DURATION_MS - delay) / BUBBLE_RAISE_ANIMATION_DURATION_MS)) * MyAvatar.scale * 0.5 + 0.2 * MyAvatar.sensorToWorldScale),
+                        z: 2 * MyAvatar.sensorToWorldScale
                     }
                 });
             } else {
@@ -120,11 +128,11 @@
                         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
+                        x: 2 * MyAvatar.sensorToWorldScale,
+                        y: MyAvatar.scale * 0.5 + 0.2 * MyAvatar.sensorToWorldScale,
+                        z: 2 * MyAvatar.sensorToWorldScale
                     }
                 });
             }
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
new file mode 100644
index 0000000000..7553ca4eeb
--- /dev/null
+++ b/scripts/system/commerce/wallet.js
@@ -0,0 +1,174 @@
+"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");
+
+    // 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;
+            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..9295f50518
--- /dev/null
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -0,0 +1,467 @@
+"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 = true;
+
+    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() {
+            RayPick.setIgnoreOverlays(_this.leftControllerRayPick, [HMD.tabletID]);
+            RayPick.setIgnoreOverlays(_this.rightControllerRayPick, [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.setIgnoreEntities(_this.leftControllerRayPick, this.blacklist);
+            RayPick.setIgnoreEntities(_this.rightControllerRayPick, this.blacklist);
+
+        };
+
+        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: "_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: "_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..3c2794cf96 100644
--- a/scripts/system/controllers/controllerDisplay.js
+++ b/scripts/system/controllers/controllerDisplay.js
@@ -49,6 +49,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 +60,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 +69,7 @@ createControllerDisplay = function(config) {
                     });
                 }
             }
+            */
         },
 
         setLayerForPart: function(partName, layerName) {
@@ -85,12 +88,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,9 +175,9 @@ 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,
+            localPosition: Vec3.multiply(sensorScaleFactor, position),
             parentID: PARENT_ID,
             parentJointIndex: controller.jointIndex,
             ignoreRayIntersection: true
@@ -137,29 +214,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 +236,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 +284,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..4978f225ce
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/equipEntity.js
@@ -0,0 +1,755 @@
+"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, AVATAR_SELF_ID,
+   getControllerJointIndex, NULL_UUID, 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 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);
+    }
+
+    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 === NULL_UUID) {
+                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: AVATAR_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 () {
+            Entities.editEntity(this.targetEntityID, {
+                parentID: NULL_UUID,
+                parentJointIndex: -1
+            });
+
+            var args = [this.hand === RIGHT_HAND ? "right" : "left", MyAvatar.sessionUUID];
+            Entities.callEntityMethod(this.targetEntityID, "releaseEquip", args);
+
+            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.
+                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.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.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);
+
+    this.cleanup = function () {
+        leftEquipEntity.cleanup();
+        rightEquipEntity.cleanup();
+        disableDispatcherModule("LeftEquipEntity");
+        disableDispatcherModule("RightEquipEntity");
+    };
+    Script.scriptEnding.connect(this.cleanup);
+}());
diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
new file mode 100644
index 0000000000..0ef0e67471
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -0,0 +1,593 @@
+"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, NULL_UUID,
+   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,
+   AVATAR_SELF_ID, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC, ensureDynamic,
+   getControllerWorldLocation, projectOntoEntityXYPlane, ContextOverlay, HMD, Reticle, Overlays, isPointingAtUI
+
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var PICK_WITH_HAND_RAY = true;
+
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_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 FarActionGrabEntity(hand) {
+        this.hand = hand;
+        this.grabbedThingID = null;
+        this.actionID = null; // action this script created...
+        this.entityWithContextOverlay = false;
+        this.contextOverlayTimer = 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 SEARCH_SPHERE_SIZE = 0.011;
+            var MIN_SPHERE_SIZE = 0.0005;
+            var radius = Math.max(1.2 * SEARCH_SPHERE_SIZE * this.intersectionDistance, MIN_SPHERE_SIZE) * MyAvatar.sensorToWorldScale;
+            var dim = {x: radius, y: radius, z: radius};
+            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") {
+                var fullEndToEdit = PICK_WITH_HAND_RAY ? this.fullEnd : fullEnd;
+                fullEndToEdit.dimensions = dim;
+                LaserPointers.editRenderState(laserPointerID, mode, { path: fullPath, end: fullEndToEdit });
+                this.contextOverlayTimer = false;
+                this.destroyContextOverlay();
+            } else if (mode === "half") {
+                var halfEndToEdit = PICK_WITH_HAND_RAY ? this.halfEnd : halfEnd;
+                halfEndToEdit.dimensions = dim;
+                LaserPointers.editRenderState(laserPointerID, mode, {path: halfPath, end: halfEndToEdit});
+            }
+            LaserPointers.enableLaserPointer(laserPointerID);
+            LaserPointers.setRenderState(laserPointerID, mode);
+            if (this.distanceHolding || this.distanceRotating) {
+                LaserPointers.setLockEndUUID(laserPointerID, this.grabbedThingID, this.grabbedIsOverlay);
+            } else {
+                LaserPointers.setLockEndUUID(laserPointerID, null, 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 === NULL_UUID) {
+                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);
+
+            this.actionID = null;
+            this.grabbedThingID = 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.updateLaserPointer(controllerData);
+                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"
+                        ]);
+
+                        if (entityID !== this.entityWithContextOverlay) {
+                            this.destroyContextOverlay();
+                        }
+
+                        if (entityIsDistanceGrabbable(targetProps)) {
+                            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.halfEnd = halfEnd;
+        this.fullEnd = fullEnd;
+        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,
+            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..a683044e6e
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/farTrigger.js
@@ -0,0 +1,230 @@
+"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,
+   AVATAR_SELF_ID, DEFAULT_SEARCH_SPHERE_DISTANCE, getGrabbableData
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_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 SEARCH_SPHERE_SIZE = 0.011;
+            var MIN_SPHERE_SIZE = 0.0005;
+            var radius = Math.max(1.2 * SEARCH_SPHERE_SIZE * this.intersectionDistance, MIN_SPHERE_SIZE);
+            var dim = {x: radius, y: radius, z: radius};
+            var mode = "none";
+            if (controllerData.triggerClicks[this.hand]) {
+                mode = "full";
+            } else {
+                mode = "half";
+            }
+
+            var laserPointerID = this.laserPointer;
+            if (mode === "full") {
+                var fullEndToEdit = this.fullEnd;
+                fullEndToEdit.dimensions = dim;
+                LaserPointers.editRenderState(laserPointerID, mode, {path: fullPath, end: fullEndToEdit});
+            } else if (mode === "half") {
+                var halfEndToEdit = this.halfEnd;
+                halfEndToEdit.dimensions = dim;
+                LaserPointers.editRenderState(laserPointerID, mode, {path: halfPath, end: halfEndToEdit});
+            }
+            LaserPointers.enableLaserPointer(laserPointerID);
+            LaserPointers.setRenderState(laserPointerID, 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.halfEnd = halfEnd;
+        this.fullEnd = fullEnd;
+        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,
+            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..912eeccadb
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/hudOverlayPointer.js
@@ -0,0 +1,246 @@
+//
+//  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, NULL_UUID,
+   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,
+   AVATAR_SELF_ID, 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 halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawHUDLayer: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawHUDLayer: 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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawHUDLayer: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        solid: true,
+        color: COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
+        alpha: 0.9,
+        ignoreRayIntersection: true,
+        drawHUDLayer: 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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawHUDLayer: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_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) {
+            var RADIUS = 0.005;
+            var dim = { x: RADIUS, y: RADIUS, z: RADIUS };
+
+            if (this.mode === "full") {
+                this.fullEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: fullPath, end: this.fullEnd});
+            } else if (this.mode === "half") {
+                this.halfEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: halfPath, end: this.halfEnd});
+            }
+
+            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.halfEnd = halfEnd;
+        this.fullEnd = fullEnd;
+        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..cbe64b1870
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/inEditMode.js
@@ -0,0 +1,264 @@
+"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, AVATAR_SELF_ID, 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 halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_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) {
+            var RADIUS = 0.005;
+            var dim = { x: RADIUS, y: RADIUS, z: RADIUS };
+
+            if (this.mode === "full") {
+                this.fullEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: fullPath, end: this.fullEnd});
+            } else if (this.mode === "half") {
+                this.halfEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: halfPath, end: this.halfEnd});
+            }
+
+            LaserPointers.enableLaserPointer(this.laserPointer);
+            LaserPointers.setRenderState(this.laserPointer, this.mode);
+        };
+
+        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.halfEnd = halfEnd;
+        this.fullEnd = fullEnd;
+
+        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,
+            defaultRenderStates: defaultRenderStates
+        });
+
+        LaserPointers.setIgnoreOverlays(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/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..2484067655
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearActionGrabEntity.js
@@ -0,0 +1,260 @@
+"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, NULL_UUID, 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 === NULL_UUID) {
+                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;
+
+            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 != NULL_UUID) {
+                    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..70d91bf1ec
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearParentGrabEntity.js
@@ -0,0 +1,343 @@
+"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, AVATAR_SELF_ID, getControllerJointIndex, NULL_UUID,
+   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 !== 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.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: AVATAR_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] === NULL_UUID || 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);
+            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 == AVATAR_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 = NULL_UUID;
+                                previousParentJointIndex = -1;
+                            }
+                        }
+                        _this.previouslyUnhooked[childID] = now;
+
+                        Entities.editEntity(childID, {
+                            parentID: previousParentID,
+                            parentJointIndex: previousParentJointIndex
+                        });
+                    } else {
+                        Entities.editEntity(childID, { parentID: NULL_UUID });
+                    }
+                });
+            }
+        };
+
+        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 == NULL_UUID) {
+                    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..f9557f685f
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
@@ -0,0 +1,228 @@
+"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, AVATAR_SELF_ID, getControllerJointIndex, NULL_UUID,
+   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 !== 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.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: AVATAR_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 === NULL_UUID || previousParentID === null) && !this.robbed) {
+                Overlays.editOverlay(this.grabbedThingID, {
+                    parentID: NULL_UUID,
+                    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]);
+                }
+            }
+
+            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..7dace85ec4
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/overlayLaserInput.js
@@ -0,0 +1,397 @@
+"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, NULL_UUID, enableDispatcherModule, disableDispatcherModule,
+   makeRunningValues, Messages, Quat, Vec3, makeDispatcherModuleParameters, Overlays, ZERO_VEC, AVATAR_SELF_ID, 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 halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_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) {
+            var RADIUS = 0.005;
+            var dim = { x: RADIUS, y: RADIUS, z: RADIUS };
+
+            if (this.mode === "full") {
+                this.fullEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: fullPath, end: this.fullEnd});
+            } else if (this.mode === "half") {
+                this.halfEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: halfPath, end: this.halfEnd});
+            }
+
+            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.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.halfEnd = halfEnd;
+        this.fullEnd = fullEnd;
+        this.laserPointer = LaserPointers.createLaserPointer({
+            joint: (this.hand === RIGHT_HAND) ? "_CONTROLLER_RIGHTHAND" : "_CONTROLLER_LEFTHAND",
+            filter: RayPick.PICK_OVERLAYS,
+            maxDistance: PICK_MAX_DISTANCE,
+            posOffset: getGrabPointSphereOffset(this.handToController(), true),
+            renderStates: renderStates,
+            faceAvatar: true,
+            defaultRenderStates: defaultRenderStates
+        });
+
+        LaserPointers.setIgnoreOverlays(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..36ed7920dd
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/tabletStylusInput.js
@@ -0,0 +1,494 @@
+"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,
+   NULL_UUID, enableDispatcherModule, disableDispatcherModule, makeRunningValues,
+   Messages, Quat, Vec3, getControllerWorldLocation, makeDispatcherModuleParameters, Overlays, ZERO_VEC,
+   AVATAR_SELF_ID, 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) {
+                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: 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.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.nearGrabWantsToRun = function(controllerData) {
+            var moduleName = this.hand === RIGHT_HAND ? "RightNearParentingGrabOverlay" : "LeftNearParentingGrabOverlay";
+            var module = getEnabledModuleByName(moduleName);
+            var ready = module ? module.isReady(controllerData) : makeRunningValues(false, [], []);
+            return ready.active;
+        };
+
+        this.processStylus = function(controllerData) {
+            this.updateStylusTip();
+
+            if (!this.stylusTip.valid || this.overlayLaserActive(controllerData) || this.nearGrabWantsToRun(controllerData)) {
+                this.pointFinger(false);
+                this.hideStylus();
+                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 !== NULL_UUID &&
+                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 !== NULL_UUID &&
+                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..d2717a1348
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/teleport.js
@@ -0,0 +1,496 @@
+"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, AVATAR_SELF_ID, getControllerJointIndex, NULL_UUID,
+   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,
+            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,
+            centerEndY: false,
+            renderStates: teleportRenderStates
+        });
+        this.teleportRayHeadVisible = LaserPointers.createLaserPointer({
+            joint: "Avatar",
+            filter: RayPick.PICK_ENTITIES,
+            faceAvatar: true,
+            centerEndY: false,
+            renderStates: teleportRenderStates,
+            defaultRenderStates: teleportDefaultRenderStates
+        });
+        this.teleportRayHeadInvisible = LaserPointers.createLaserPointer({
+            joint: "Avatar",
+            filter: RayPick.PICK_ENTITIES | RayPick.PICK_INCLUDE_INVISIBLE,
+            faceAvatar: 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.setIgnoreEntities(this.teleportRayHandVisible, entitiesToIgnore);
+            LaserPointers.setIgnoreEntities(this.teleportRayHandInvisible, entitiesToIgnore);
+            LaserPointers.setIgnoreEntities(this.teleportRayHeadVisible, entitiesToIgnore);
+            LaserPointers.setIgnoreEntities(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..339f248547
--- /dev/null
+++ b/scripts/system/controllers/controllerModules/webEntityLaserInput.js
@@ -0,0 +1,481 @@
+"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, NULL_UUID, enableDispatcherModule, disableDispatcherModule, makeDispatcherModuleParameters,
+   PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
+   AVATAR_SELF_ID, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE, ZERO_VEC, Overlays
+*/
+
+Script.include("/~/system/libraries/controllerDispatcherUtils.js");
+Script.include("/~/system/libraries/controllers.js");
+
+(function() {
+    var halfPath = {
+        type: "line3d",
+        color: COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
+        visible: true,
+        alpha: 1,
+        solid: true,
+        glow: 1.0,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var halfEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_SELF_ID
+    };
+    var fullEnd = {
+        type: "sphere",
+        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,
+        lineWidth: 5,
+        ignoreRayIntersection: true, // always ignore this
+        drawInFront: true, // Even when burried inside of something, show it.
+        parentID: AVATAR_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 !== NULL_UUID) {
+            return Entities.keyboardFocusOverlay === laserTarget;
+        }
+    }
+
+    function setKeyboardFocusOnLaserTarget(laserTarget) {
+        if (laserTarget && laserTarget !== NULL_UUID) {
+            Entities.wantsHandControllerPointerEvents(laserTarget);
+            Overlays.keyboardFocusOverlay = NULL_UUID;
+            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 !== NULL_UUID) {
+            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 !== NULL_UUID) {
+            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 !== NULL_UUID) {
+            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 !== NULL_UUID) {
+            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 !== NULL_UUID) {
+            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) {
+            var RADIUS = 0.005;
+            var dim = { x: RADIUS, y: RADIUS, z: RADIUS };
+
+            if (this.mode === "full") {
+                fullEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: fullPath, end: fullEnd});
+            } else if (this.mode === "half") {
+                halfEnd.dimensions = dim;
+                LaserPointers.editRenderState(this.laserPointer, this.mode, {path: halfPath, end: halfEnd});
+            }
+
+            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,
+            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..2b4bc7e1fb 100644
--- a/scripts/system/controllers/controllerScripts.js
+++ b/scripts/system/controllers/controllerScripts.js
@@ -12,11 +12,26 @@
 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/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/grab.js b/scripts/system/controllers/grab.js
index da8add5117..0e9b8569ae 100644
--- a/scripts/system/controllers/grab.js
+++ b/scripts/system/controllers/grab.js
@@ -197,53 +197,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");
@@ -285,6 +256,21 @@ function Grabber() {
 
     this.liftKey = false; // SHIFT
     this.rotateKey = false; // CONTROL
+
+    this.mouseRayOverlays = RayPick.createRayPick({
+        joint: "Mouse",
+        filter: RayPick.PICK_OVERLAYS,
+        enabled: true
+    });
+    RayPick.setIncludeOverlays(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() {
@@ -320,7 +306,7 @@ Grabber.prototype.computeNewGrabPlane = function() {
 };
 
 Grabber.prototype.pressEvent = function(event) {
-    if (isInEditMode()) {
+    if (isInEditMode() || HMD.active) {
         return;
     }
 
@@ -333,40 +319,42 @@ Grabber.prototype.pressEvent = function(event) {
         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;
+    var isDynamic = Entities.getEntityProperties(pickResults.objectID, "dynamic").dynamic;
     if (!isDynamic) {
         // only grab dynamic 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;
     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
@@ -385,6 +373,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);
@@ -395,8 +384,6 @@ Grabber.prototype.pressEvent = function(event) {
 
     this.computeNewGrabPlane();
 
-    beacon.updatePosition(this.startPosition);
-
     if (!entityIsGrabbedByOther(this.entityID)) {
       this.moveEvent(event);
     }
@@ -414,7 +401,7 @@ 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;
     }
 
@@ -431,7 +418,7 @@ Grabber.prototype.releaseEvent = function(event) {
         }
         this.actionID = null;
 
-        beacon.disable();
+        LaserPointers.setRenderState(this.mouseRayEntities, "");
 
         var args = "mouse";
         Entities.callEntityMethod(this.entityID, "releaseGrab", args);
@@ -460,7 +447,7 @@ Grabber.prototype.moveEvent = function(event) {
     // 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) {
+    if (!this.isGrabbing || HMD.active) {
         return;
     }
     mouse.updateDrag(event);
@@ -471,7 +458,7 @@ 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;
     }
 
@@ -552,7 +539,6 @@ Grabber.prototype.moveEventProcess = function() {
             ttl: ACTION_TTL
         };
 
-        beacon.updatePosition(this.targetPosition);
     }
 
     if (!this.actionID) {
@@ -586,6 +572,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) {
@@ -608,10 +599,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 bd8ab26506..0000000000
--- a/scripts/system/controllers/handControllerGrab.js
+++ /dev/null
@@ -1,4278 +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 hoveredEntityID = false;
-var contextOverlayTimer = false;
-var entityWithContextOverlay = false;
-var contextualHand = -1;
-
-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",
-    exitMethod: "searchExit",
-    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);
-    if (props) {
-        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");
-        if (dimensions.z) {
-            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()) {
-        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 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);
-            if (rayPickInfo.isValid) {
-                this.intersectionDistance = (rayPickInfo.entityID || rayPickInfo.overlayID) ? rayPickInfo.distance : 0;
-                this.searchIndicatorOn(rayPickInfo.searchRay);
-            } else {
-                this.searchIndicatorOff();
-            }
-        } 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;
-        var valid = true
-        if (pickRayOverride) {
-            pickRay = pickRayOverride;
-        } else {
-            var controllerLocation = getControllerWorldLocation(this.handToController(), true);
-            var worldHandPosition = controllerLocation.position;
-            var worldHandRotation = controllerLocation.orientation;
-            valid = !(worldHandPosition === undefined);
-
-            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,
-            isValid: valid
-        };
-
-        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.searchExit = function () {
-        contextualHand = -1;
-        if (hoveredEntityID) {
-            Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
-        }
-        hoveredEntityID = false;
-    };
-
-    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);
-        }
-
-        pointerEvent = {
-            type: "Move",
-            id: this.hand + 1, // 0 is reserved for hardware mouse
-            pos2D: projectOntoEntityXYPlane(rayPickInfo.entityID, rayPickInfo.intersection),
-            pos3D: rayPickInfo.intersection,
-            normal: rayPickInfo.normal,
-            direction: rayPickInfo.searchRay.direction,
-            button: "None"
-        };
-        if (rayPickInfo.entityID) {
-            if (hoveredEntityID !== rayPickInfo.entityID) {
-                if (contextOverlayTimer) {
-                    Script.clearTimeout(contextOverlayTimer);
-                    contextOverlayTimer = false;
-                }
-                if (hoveredEntityID) {
-                    Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
-                }
-                hoveredEntityID = rayPickInfo.entityID;
-                Entities.sendHoverEnterEntity(hoveredEntityID, pointerEvent);
-            }
-
-            // If we already have a context overlay, we don't want to move it to
-            // another entity while we're searching.
-            if (!entityWithContextOverlay && !contextOverlayTimer) {
-                contextOverlayTimer = Script.setTimeout(function () {
-                    if (rayPickInfo.entityID === hoveredEntityID &&
-                        !entityWithContextOverlay &&
-                        contextualHand !== -1 &&
-                        contextOverlayTimer) {
-                        var pointerEvent = {
-                            type: "Move",
-                            id: contextualHand + 1, // 0 is reserved for hardware mouse
-                            pos2D: projectOntoEntityXYPlane(rayPickInfo.entityID, rayPickInfo.intersection),
-                            pos3D: rayPickInfo.intersection,
-                            normal: rayPickInfo.normal,
-                            direction: rayPickInfo.searchRay.direction,
-                            button: "Secondary"
-                        };
-                        if (ContextOverlay.createOrDestroyContextOverlay(rayPickInfo.entityID, pointerEvent)) {
-                            entityWithContextOverlay = rayPickInfo.entityID;
-                            hoveredEntityID = false;
-                        }
-                    }
-                    contextOverlayTimer = false;
-                }, 500);
-                contextualHand = this.hand;
-            }
-        } else {
-            if (hoveredEntityID) {
-                Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
-                hoveredEntityID = false;
-            }
-            if (contextOverlayTimer) {
-                Script.clearTimeout(contextOverlayTimer);
-                contextOverlayTimer = false;
-            }
-        }
-
-        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"
-                };
-
-                if (this.hoverEntity !== entity) {
-                    Entities.sendHoverLeaveEntity(this.hoverEntity, pointerEvent);
-                    this.hoverEntity = entity;
-                    Entities.sendHoverEnterEntity(this.hoverEntity, 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") && 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"
-            };
-
-            if (this.hoverOverlay !== overlay) {
-                Overlays.sendHoverLeaveOverlay(this.hoverOverlay, pointerEvent);
-                this.hoverOverlay = overlay;
-                Overlays.sendHoverEnterOverlay(this.hoverOverlay, 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 (hoveredEntityID) {
-            Entities.sendHoverLeaveEntity(hoveredEntityID, pointerEvent);
-            hoveredEntityID = false;
-        }
-        if (entityWithContextOverlay) {
-            ContextOverlay.destroyContextOverlay(entityWithContextOverlay);
-            entityWithContextOverlay = false;
-        }
-
-        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 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/teleport.js b/scripts/system/controllers/teleport.js
deleted file mode 100644
index 15ba314a1d..0000000000
--- a/scripts/system/controllers/teleport.js
+++ /dev/null
@@ -1,544 +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.
-        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 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/edit.js b/scripts/system/edit.js
index c141c7cd52..346f3626b9 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -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;
                 }
 
@@ -405,9 +415,11 @@ var toolBar = (function () {
             }
         });
 
-        var createButtonIconRsrc = ((Entities.canRez() || Entities.canRezTmp()) ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
+        var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp());
+        var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
         tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
         activeButton = tablet.addButton({
+            captionColorOverride: hasRezPermissions ? "" : "#888888",
             icon: createButtonIconRsrc,
             activeIcon: "icons/tablet-icons/edit-a.svg",
             text: "CREATE",
@@ -431,17 +443,8 @@ var toolBar = (function () {
         });
 
         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() {
@@ -653,7 +656,7 @@ 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);
@@ -789,6 +792,7 @@ function handleDomainChange() {
     var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp());
     createButton.editProperties({
         icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
+        captionColorOverride: (hasRezPermissions ? "" : "#888888"),
     });
 }
 
@@ -1228,7 +1232,7 @@ 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");
     createButton = null;
@@ -1241,6 +1245,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) {
@@ -1458,6 +1463,41 @@ 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
+    Window.openFileChanged.disconnect(onFileOpenChanged);
+    var importURL = null;
+    if (filename !== "") {
+        importURL = "file:///" + filename;
+    }
+    if (importURL) {
+        if (!isActive && (Entities.canRez() && Entities.canRezTmp())) {
+            toolBar.toggle();
+        }
+        importSVO(importURL);
+    }
+}
+
+function onPromptTextChanged(prompt) {
+    Window.promptTextChanged.disconnect(onPromptTextChanged);
+    if (prompt !== "") {
+        if (!isActive && (Entities.canRez() && Entities.canRezTmp())) {
+            toolBar.toggle();
+        }
+        importSVO(prompt);
+    }
+}
+
 function handeMenuEvent(menuItem) {
     if (menuItem === "Allow Selecting of Small Models") {
         allowSmallModels = Menu.isOptionChecked("Allow Selecting of Small Models");
@@ -1475,30 +1515,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(onFileOpenChanged);
+            Window.promptAsync("URL of SVO to import", "");
         }
     } else if (menuItem === "Entity List...") {
         entityListTool.toggleVisible();
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 c9c3dbe493..b9fd7f725c 100644
--- a/scripts/system/hmd.js
+++ b/scripts/system/hmd.js
@@ -68,6 +68,9 @@ function onHmdChanged(isHmd) {
 function onClicked() {
     var isDesktop = Menu.isOptionChecked(desktopMenuItemName);
     Menu.setIsOptionChecked(isDesktop ? headset : desktopMenuItemName, true);
+    if (!isDesktop) {
+        UserActivityLogger.logAction("exit_vr");
+    }
 }
 
 if (headset) {
diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 5ba5568b59..6aacaa5333 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -448,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;
@@ -462,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;
@@ -482,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;
@@ -536,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;
@@ -545,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;
@@ -572,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;
@@ -714,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;
@@ -724,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;
@@ -813,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;
 }
@@ -1154,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 {
@@ -1261,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..43cd281bbd 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,271 @@
 //  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>
+                    </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 +294,315 @@
                     </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>
-                    <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-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>
-            <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>
-                    </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">
-                    </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="column">
-                    <div class="property number">
-                        <label>Animation frame</label>
-                        <input type="number" id="property-model-animation-frame">
-                    </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">
-                    </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>
-            <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>
+            <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>
+                <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 +624,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 +648,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/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index ce2f766946..aad26cc7ba 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -488,6 +488,7 @@ 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");
@@ -553,6 +554,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");
@@ -574,7 +576,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");
@@ -609,6 +612,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");
 
@@ -688,7 +692,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) {
@@ -714,6 +721,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();
@@ -742,6 +750,7 @@ function loaded() {
                         elType.innerHTML = type + " (" + data.selections.length + ")";
                         elTypeIcon.innerHTML = ICON_FOR_TYPE[type];
                         elTypeIcon.style.display = "inline-block";
+                        elPropertiesList.className = '';
 
                         elID.value = "";
 
@@ -758,6 +767,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";
@@ -830,36 +840,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;
@@ -892,48 +925,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);
@@ -946,25 +951,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;
@@ -976,10 +971,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 + ")";
@@ -992,10 +983,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;
@@ -1032,10 +1019,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);
@@ -1155,9 +1138,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) {
@@ -1165,6 +1153,7 @@ function loaded() {
                         cloneLifetime: elCloneableLifetime,
                         cloneLimit: elCloneableLimit,
                         cloneDynamic: elCloneableDynamic,
+                        cloneAvatarEntity: elCloneableAvatarEntity,
                         cloneable: event.target,
                         grabbable: null
                     }, elUserData, {});
@@ -1175,6 +1164,7 @@ function loaded() {
                         cloneLifetime: null,
                         cloneLimit: null,
                         cloneDynamic: null,
+                        cloneAvatarEntity: null,
                         cloneable: false
                     }, elUserData, {});
                 elCloneableGroup.style.display = "none";
@@ -1235,20 +1225,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 + ")";
+
             }
         }));
 
@@ -1298,6 +1309,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'));
 
@@ -1512,11 +1524,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 8a8cf62008..ded4542c51 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -25,7 +25,11 @@
     var canWriteAssets = false;
     var xmlHttpRequest = null;
     var isPreparing = false;  // Explicitly track download request status.
-    
+
+    var confirmAllPurchases = false; // Set this to "true" to cause Checkout.qml to popup for all items, even if free
+    var userIsLoggedIn = false;
+    var walletNeedsSetup = false;
+
     function injectCommonCode(isDirectoryPage) {
 
         // Supporting styles from marketplaces.css.
@@ -65,7 +69,7 @@
 
         // Footer actions.
         $("#back-button").on("click", function () {
-            (window.history.state != null) ? window.history.back() : window.location = "https://metaverse.highfidelity.com/marketplace?";
+            (document.referrer !== "") ? window.history.back() : window.location = "https://metaverse.highfidelity.com/marketplace?";
         });
         $("#all-markets").on("click", function () {
             EventBridge.emitWebEvent(GOTO_DIRECTORY);
@@ -79,6 +83,7 @@
         letUsKnow.replaceWith(letUsKnow.html());
 
         // Add button links.
+
         $('#exploreClaraMarketplace').on('click', function () {
             window.location = "https://clara.io/library?gameCheck=true&public=true";
         });
@@ -87,8 +92,278 @@
         });
     }
 
+    emitWalletSetupEvent = function() {
+        EventBridge.emitWebEvent(JSON.stringify({
+            type: "WALLET_SETUP"
+        }));
+    }
+
+    function maybeAddSetupWalletButton() {
+        if (userIsLoggedIn && walletNeedsSetup) {
+            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 (!userIsLoggedIn) {
+            var resultsElement = document.getElementById('results');
+            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');
+            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 on button hover
+        $('body').on('mouseenter', '#price-or-edit .price', function () {
+            var $this = $(this);
+            $this.data('initialHtml', $this.html());
+            $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 injectHiFiCode() {
-        // Nothing to do.
+        if (!$('body').hasClass("code-injected") && confirmAllPurchases) {
+
+            $('body').addClass("code-injected");
+
+            maybeAddLogInButton();
+            maybeAddSetupWalletButton();
+            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();
+        }
+    }
+
+    function injectHiFiItemPageCode() {
+        if (!$('body').hasClass("code-injected") && confirmAllPurchases) {
+
+            $('body').addClass("code-injected");
+
+            maybeAddLogInButton();
+            maybeAddSetupWalletButton();
+            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();
+        }
     }
 
     function updateClaraCode() {
@@ -140,7 +415,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 +437,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 +583,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 +605,41 @@
             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") {
+                        confirmAllPurchases = !!parsedJsonMessage.data.commerceMode;
+                        userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn;
+                        walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup;
+                        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/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js
index c3d55d5875..92a5857390 100644
--- a/scripts/system/libraries/WebTablet.js
+++ b/scripts/system/libraries/WebTablet.js
@@ -8,7 +8,7 @@
 //  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"));
@@ -42,56 +42,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, landscape) {
+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.6, z: 0.1 };
-        position = Vec3.sum(position, Vec3.multiplyQbyV(rotation, Vec3.multiply(tabletHeight, RELATIVE_SPAWN_OFFSET)));
-
-        return {
-            position: position,
-            rotation: landscape ? Quat.multiply(rotation, { x: 0.0, y: 0.0, z: 0.707, w: 0.707 }) : 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: landscape ? Quat.multiply(orientation, ROT_LANDSCAPE) : Quat.multiply(orientation, ROT_Y_180)
-        };
-    }
+    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)
+    };
 }
 
 /**
@@ -106,19 +70,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;
@@ -132,7 +99,7 @@ WebTablet = function (url, width, dpi, hand, clientOnly, location, visible) {
         userData: JSON.stringify({
             "grabbableKey": {"grabbable": true}
         }),
-        dimensions: this.getDimensions(),
+        dimensions: { x: tabletWidth, y: tabletHeight, z: tabletDepth },
         parentID: AVATAR_SELF_ID,
         visible: visible
     };
@@ -152,8 +119,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",
@@ -161,17 +128,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},
@@ -248,10 +214,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 };
@@ -260,6 +222,10 @@ WebTablet.prototype.getTabletTextureResolution = function() {
     }
 };
 
+WebTablet.prototype.getLandscape = function() {
+    return this.landscape;
+}
+
 WebTablet.prototype.setLandscape = function(newLandscapeValue) {
     if (this.landscape === newLandscapeValue) {
         return;
@@ -302,31 +268,8 @@ 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 () {
@@ -346,11 +289,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);
     }
 };
 
@@ -381,10 +322,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;
@@ -424,7 +374,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, this.landscape);
+        var spawnInfo = calcSpawnInfo(hand, this.landscape);
         tabletProperties.position = spawnInfo.position;
         tabletProperties.rotation = spawnInfo.rotation;
     } else {
@@ -447,16 +397,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 () {
@@ -536,16 +480,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) {
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..777504b16d
--- /dev/null
+++ b/scripts/system/libraries/cloneEntityUtils.js
@@ -0,0 +1,98 @@
+"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/controllers/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..e9e25b058b
--- /dev/null
+++ b/scripts/system/libraries/controllerDispatcherUtils.js
@@ -0,0 +1,374 @@
+"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, NULL_UUID:true, AVATAR_SELF_ID: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,
+   projectOntoEntityXYPlane:true,
+   projectOntoOverlayXYPlane:true,
+   entityHasActions:true,
+   ensureDynamic:true,
+   findGroupParent:true,
+   BUMPER_ON_VALUE: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;
+
+NULL_UUID = "{00000000-0000-0000-0000-000000000000}";
+AVATAR_SELF_ID = "{00000000-0000-0000-0000-000000000001}";
+
+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 MyAvatar.getJointIndex("Head");
+};
+
+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 === 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(entityID, { velocity: velocity });
+        }
+    }
+};
+
+findGroupParent = function (controllerData, targetProps) {
+    while (targetProps.parentID &&
+           targetProps.parentID !== NULL_UUID &&
+           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;
+};
+
+
+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(AVATAR_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(AVATAR_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(AVATAR_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/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 77b62913bf..4df25c41b7 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -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;
@@ -238,6 +240,7 @@ function normalizeDegrees(degrees) {
     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 +252,7 @@ function getRelativeCenterPosition(dimensions, registrationPoint) {
     };
 }
 
+// SELECTION DISPLAY DEFINITION
 SelectionDisplay = (function() {
     var that = {};
 
@@ -272,6 +276,10 @@ SelectionDisplay = (function() {
     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,
@@ -1152,6 +1160,7 @@ 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);
@@ -1545,11 +1554,6 @@ SelectionDisplay = (function() {
             translateHandlesVisible = false;
         }
 
-        var rotation = selectionManager.worldRotation;
-        var dimensions = selectionManager.worldDimensions;
-        var position = selectionManager.worldPosition;
-
-
         Overlays.editOverlay(rotateOverlayTarget, {
             visible: rotationOverlaysVisible
         });
@@ -1577,6 +1581,7 @@ SelectionDisplay = (function() {
         });
     };
 
+    // FUNCTION: SET SPACE MODE
     that.setSpaceMode = function(newSpaceMode) {
         if (spaceMode != newSpaceMode) {
             spaceMode = newSpaceMode;
@@ -1584,6 +1589,7 @@ SelectionDisplay = (function() {
         }
     };
 
+    // 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");
@@ -1593,8 +1599,11 @@ SelectionDisplay = (function() {
         that.updateHandles();
     };
 
+    // FUNCTION: UNSELECT ALL
+    // TODO?: Needs implementation
     that.unselectAll = function() {};
 
+    // FUNCTION: UPDATE HANDLES
     that.updateHandles = function() {
         if (SelectionManager.selections.length === 0) {
             that.setOverlaysVisible(false);
@@ -2168,10 +2177,10 @@ SelectionDisplay = (function() {
             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"),
@@ -2218,13 +2227,13 @@ 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};
 
                 Overlays.editOverlay(selectionBoxes[i], {
-                    position: boxPosition,
+                    position: curBoxPosition,
                     color: color,
                     rotation: props.rotation,
                     dimensions: props.dimensions,
@@ -2305,9 +2314,9 @@ SelectionDisplay = (function() {
             x: position.x,
             y: position.y + worldTop + grabberMoveUpOffset,
             z: position.z
-        }
+        };
         Overlays.editOverlay(grabberMoveUp, {
-            visible: activeTool == null || mode == "TRANSLATE_UP_DOWN"
+            visible: (activeTool === null) || (mode == "TRANSLATE_UP_DOWN")
         });
 
         Overlays.editOverlay(baseOfEntityProjectionOverlay, {
@@ -2327,21 +2336,24 @@ SelectionDisplay = (function() {
 
     };
 
+    // FUNCTION: SET OVERLAYS VISIBLE
     that.setOverlaysVisible = function(isVisible) {
         var length = allOverlays.length;
-        for (var i = 0; i < length; i++) {
-            Overlays.editOverlay(allOverlays[i], {
+        for (var overlayIndex = 0; overlayIndex < length; overlayIndex++) {
+            Overlays.editOverlay(allOverlays[overlayIndex], {
                 visible: isVisible
             });
         }
         length = selectionBoxes.length;
-        for (var i = 0; i < length; i++) {
-            Overlays.editOverlay(selectionBoxes[i], {
+        for (var boxIndex = 0; boxIndex < length; boxIndex++) {
+            Overlays.editOverlay(selectionBoxes[boxIndex], {
                 visible: isVisible
             });
         }
     };
 
+    // FUNCTION: UNSELECT
+    // TODO?: Needs implementation
     that.unselect = function(entityID) {};
 
     var initialXZPick = null;
@@ -2350,6 +2362,7 @@ SelectionDisplay = (function() {
     var startPosition = null;
     var duplicatedEntityIDs = null;
 
+    // TOOL DEFINITION: TRANSLATE XZ TOOL
     var translateXZTool = {
         mode: 'TRANSLATE_XZ',
         pickPlanePosition: { x: 0, y: 0, z: 0 },
@@ -2538,7 +2551,8 @@ SelectionDisplay = (function() {
         }
     };
 
-    var lastXYPick = null
+    // GRABBER TOOL: GRABBER MOVE UP
+    var lastXYPick = null;
     var upDownPickNormal = null;
     addGrabberTool(grabberMoveUp, {
         mode: "TRANSLATE_UP_DOWN",
@@ -2594,7 +2608,7 @@ 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];
@@ -2612,6 +2626,7 @@ SelectionDisplay = (function() {
         },
     });
 
+    // GRABBER TOOL: GRABBER CLONER
     addGrabberTool(grabberCloner, {
         mode: "CLONE",
         onBegin: function(event) {
@@ -2639,7 +2654,7 @@ SelectionDisplay = (function() {
 
 
 
-
+    // FUNCTION: VEC 3 MULT
     var vec3Mult = function(v1, v2) {
             return {
                 x: v1.x * v2.x,
@@ -2647,6 +2662,8 @@ SelectionDisplay = (function() {
                 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
@@ -2898,13 +2915,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);
             
@@ -2919,7 +2937,7 @@ SelectionDisplay = (function() {
                 newPick = rayPlaneIntersection(pickRay,
                 pickRayPosition,
                 planeNormal);
-                var vector = Vec3.subtract(newPick, lastPick);
+                vector = Vec3.subtract(newPick, lastPick);
 
                 vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
 
@@ -2955,41 +2973,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,
@@ -3042,7 +3058,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") {
@@ -3067,7 +3084,7 @@ SelectionDisplay = (function() {
     }
     
     
-
+    // FUNCTION: ADD STRETCH TOOL
     function addStretchTool(overlay, mode, pivot, direction, offset, handleMove) {
         if (!pivot) {
             pivot = direction;
@@ -3077,6 +3094,7 @@ SelectionDisplay = (function() {
         addGrabberTool(overlay, tool);
     }
 
+    // FUNCTION: CUTOFF STRETCH FUNC
     function cutoffStretchFunc(vector, change) {
         vector = change;
         Vec3.print("Radius stretch: ", vector);
@@ -3097,6 +3115,7 @@ SelectionDisplay = (function() {
         SelectionManager._update();
     }
 
+    // FUNCTION: RADIUS STRETCH FUNC
     function radiusStretchFunc(vector, change) {
         var props = selectionManager.savedProperties[selectionManager.selections[0]];
 
@@ -3123,6 +3142,7 @@ SelectionDisplay = (function() {
         SelectionManager._update();
     }
 
+    // STRETCH TOOL DEF SECTION
     addStretchTool(grabberNEAR, "STRETCH_NEAR", {
         x: 0,
         y: 0,
@@ -3529,6 +3549,7 @@ SelectionDisplay = (function() {
         z: 1
     });
 
+    // FUNCTION: UPDATE ROTATION DEGREES OVERLAY
     function updateRotationDegreesOverlay(angleFromZero, handleRotation, centerPosition) {
         var angle = angleFromZero * (Math.PI / 180);
         var position = {
@@ -3549,6 +3570,7 @@ SelectionDisplay = (function() {
         });
     }
 
+    // YAW GRABBER TOOL DEFINITION
     var initialPosition = SelectionManager.worldPosition;
     addGrabberTool(yawHandle, {
         mode: "ROTATE_YAW",
@@ -3625,10 +3647,10 @@ SelectionDisplay = (function() {
             if (result.intersects) {
                 var center = yawCenter;
                 var zero = yawZero;
-                // TODO: these vectors are backwards to their names, doesn't matter for this use case (inverted vectors still give same angle)
-                var centerToZero = Vec3.subtract(center, zero);
-                var centerToIntersect = Vec3.subtract(center, result.intersection);
-                // TODO: orientedAngle wants normalized centerToZero and centerToIntersect
+                var centerToZero = Vec3.subtract(zero, center);
+                var centerToIntersect = Vec3.subtract(result.intersection, center);
+                // 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.distance(center, result.intersection);
                 var snapToInner = distanceFromCenter < innerRadius;
@@ -3717,6 +3739,7 @@ SelectionDisplay = (function() {
         }
     });
 
+    // PITCH GRABBER TOOL DEFINITION
     addGrabberTool(pitchHandle, {
         mode: "ROTATE_PITCH",
         onBegin: function(event) {
@@ -3789,11 +3812,12 @@ SelectionDisplay = (function() {
             var result = Overlays.findRayIntersection(pickRay, true, [rotateOverlayTarget]);
 
             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 centerToZero = Vec3.subtract(zero, center);
+                var centerToIntersect = Vec3.subtract(result.intersection, center);
+                // Note: orientedAngle which wants normalized centerToZero & centerToIntersect, handles
+                //       this internally, so it's fine to pass non-normalized versions here.
                 var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
 
                 var distanceFromCenter = Vec3.distance(center, result.intersection);
@@ -3809,7 +3833,6 @@ SelectionDisplay = (function() {
 
                 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);
@@ -3874,6 +3897,7 @@ SelectionDisplay = (function() {
         }
     });
 
+    // ROLL GRABBER TOOL DEFINITION
     addGrabberTool(rollHandle, {
         mode: "ROTATE_ROLL",
         onBegin: function(event) {
@@ -3946,11 +3970,12 @@ SelectionDisplay = (function() {
             var result = Overlays.findRayIntersection(pickRay, true, [rotateOverlayTarget]);
 
             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 centerToZero = Vec3.subtract(zero, center);
+                var centerToIntersect = Vec3.subtract(result.intersection, center);
+                // Note: orientedAngle which wants normalized centerToZero & centerToIntersect, handles
+                //       this internally, so it's fine to pass non-normalized versions here.
                 var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
 
                 var distanceFromCenter = Vec3.distance(center, result.intersection);
@@ -3965,7 +3990,6 @@ SelectionDisplay = (function() {
                 });
                 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);
@@ -4030,6 +4054,7 @@ SelectionDisplay = (function() {
         }
     });
 
+    // FUNCTION: CHECK MOVE
     that.checkMove = function() {
         if (SelectionManager.hasSelection()) {
 
@@ -4044,6 +4069,22 @@ SelectionDisplay = (function() {
         }
     };
 
+    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)) {
+                    print("setting controller pose");
+                    that.mouseMoveEvent({});
+                }
+            }
+            lastControllerPoses[hand] = controllerPose;
+        }
+    };
+
+    // FUNCTION: MOUSE PRESS EVENT
     that.mousePressEvent = function(event) {
         var wantDebug = false;
         if (!event.isLeftButton && !that.triggered) {
@@ -4167,7 +4208,7 @@ SelectionDisplay = (function() {
 
 
             // Only intersect versus yaw/pitch/roll.
-            var result = Overlays.findRayIntersection(pickRay, true, [ yawHandle, pitchHandle, rollHandle ] );
+            result = Overlays.findRayIntersection(pickRay, true, [ yawHandle, pitchHandle, rollHandle ] );
 
             var overlayOrientation;
             var overlayCenter;
@@ -4184,10 +4225,10 @@ SelectionDisplay = (function() {
             originalRoll = roll;
 
             if (result.intersects) {
-                var tool = grabberTools[result.overlayID];
-                if (tool) {
-                    activeTool = tool;
-                    mode = tool.mode;
+                var resultTool = grabberTools[result.overlayID];
+                if (resultTool) {
+                    activeTool = resultTool;
+                    mode = resultTool.mode;
                     somethingClicked = 'tool';
                     if (activeTool && activeTool.onBegin) {
                         activeTool.onBegin(event);
@@ -4370,7 +4411,7 @@ SelectionDisplay = (function() {
 
         if (!somethingClicked) {
             // Only intersect versus selectionBox.
-            var result = Overlays.findRayIntersection(pickRay, true, [selectionBox]);
+            result = Overlays.findRayIntersection(pickRay, true, [selectionBox]);
             if (result.intersects) {
                 switch (result.overlayID) {
                     case selectionBox:
@@ -4425,6 +4466,7 @@ SelectionDisplay = (function() {
         return somethingClicked;
     };
 
+    // FUNCTION: MOUSE MOVE EVENT
     that.mouseMoveEvent = function(event) {
         if (activeTool) {
             activeTool.onMove(event);
@@ -4554,7 +4596,7 @@ SelectionDisplay = (function() {
         return false;
     };
 
-
+    // FUNCTION: UPDATE HANDLE SIZES
     that.updateHandleSizes = function() {
         if (selectionManager.hasSelection()) {
             var diff = Vec3.subtract(selectionManager.worldPosition, Camera.getPosition());
@@ -4593,6 +4635,7 @@ SelectionDisplay = (function() {
     };
     Script.update.connect(that.updateHandleSizes);
 
+    // FUNCTION: MOUSE RELEASE EVENT
     that.mouseReleaseEvent = function(event) {
         var showHandles = false;
         if (activeTool && activeTool.onEnd) {
diff --git a/scripts/system/libraries/touchEventUtils.js b/scripts/system/libraries/touchEventUtils.js
new file mode 100644
index 0000000000..fbd56e16ae
--- /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,
+   controllerDispatcher.NULL_UUID, enableDispatcherModule, disableDispatcherModule, makeRunningValues,
+   Messages, Quat, Vec3, getControllerWorldLocation, makeDispatcherModuleParameters, Overlays, controllerDispatcher.ZERO_VEC,
+   AVATAR_SELF_ID, 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 !== controllerDispatcher.NULL_UUID) {
+        return Entities.keyboardFocusEntity === touchTarget.entityID;
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        return Overlays.keyboardFocusOverlay === touchTarget.overlayID;
+    }
+}
+
+function setKeyboardFocusOnTouchTarget(touchTarget) {
+    if (touchTarget.entityID && touchTarget.entityID !== controllerDispatcher.NULL_UUID &&
+        Entities.wantsHandControllerPointerEvents(touchTarget.entityID)) {
+        Overlays.keyboardFocusOverlay = controllerDispatcher.NULL_UUID;
+        Entities.keyboardFocusEntity = touchTarget.entityID;
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        Overlays.keyboardFocusOverlay = touchTarget.overlayID;
+        Entities.keyboardFocusEntity = controllerDispatcher.NULL_UUID;
+    }
+}
+
+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 !== controllerDispatcher.NULL_UUID) {
+        Entities.sendHoverEnterEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        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 !== controllerDispatcher.NULL_UUID) {
+        Entities.sendMouseMoveOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendHoverOverEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        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 !== controllerDispatcher.NULL_UUID) {
+        Entities.sendMousePressOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendClickDownOnEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        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 !== controllerDispatcher.NULL_UUID) {
+        Entities.sendMouseReleaseOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendClickReleaseOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendHoverLeaveEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        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 !== controllerDispatcher.NULL_UUID) {
+        Entities.sendMouseMoveOnEntity(touchTarget.entityID, pointerEvent);
+        Entities.sendHoldingClickOnEntity(touchTarget.entityID, pointerEvent);
+    } else if (touchTarget.overlayID && touchTarget.overlayID !== controllerDispatcher.NULL_UUID) {
+        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..162edcaea0 100644
--- a/scripts/system/libraries/utils.js
+++ b/scripts/system/libraries/utils.js
@@ -351,3 +351,66 @@ 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) {
+        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}
+    });
+};
diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js
index d95ad919b6..bfad959ffc 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);
         }
     }
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 7b25589e92..e94b227a4a 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -19,6 +19,11 @@
     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";
@@ -53,50 +58,26 @@
     Window.messageBoxClosed.connect(onMessageBoxClosed);
 
     var onMarketplaceScreen = false;
+    var onCommerceScreen = false;
 
+    var debugCheckout = false;
+    var debugError = false;
     function showMarketplace() {
-        UserActivityLogger.openedMarketplace();
-        tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
-        tablet.webEventReceived.connect(function (message) {
-
-            if (message === GOTO_DIRECTORY) {
-                tablet.gotoWebScreen(MARKETPLACES_URL, MARKETPLACES_INJECT_SCRIPT_URL);
-            }
-
-            if (message === QUERY_CAN_WRITE_ASSETS) {
-                tablet.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets());
-            }
-
-            if (message === WARN_USER_NO_PERMISSIONS) {
-                Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
-            }
-
-            if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) {
-                if (isDownloadBeingCancelled) {
-                    return;
-                }
-
-                var text = message.slice(CLARA_IO_STATUS.length);
-                if (messageBox === null) {
-                    messageBox = Window.openMessageBox(CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
-                } else {
-                    Window.updateMessageBox(messageBox, CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
-                }
-                return;
-            }
-
-            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) {
-                isDownloadBeingCancelled = false;
-            }
-        });
+        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',
+                },
+                canRezCertifiedItems: Entities.canRezCertified || Entities.canRezTmpCertified
+            });
+        }
     }
 
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@@ -113,7 +94,7 @@
     }
 
     function onClick() {
-        if (onMarketplaceScreen) {
+        if (onMarketplaceScreen || onCommerceScreen) {
             // for toolbar-mode: go back to home screen, this will close the window.
             tablet.gotoHomeScreen();
         } else {
@@ -123,10 +104,24 @@
         }
     }
 
+    var referrerURL; // Used for updating Purchases QML
+    var filterText; // Used for updating Purchases QML
     function onScreenChanged(type, url) {
-        onMarketplaceScreen = type === "Web" && url === MARKETPLACE_URL_INITIAL
+        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',
+                canRezCertifiedItems: Entities.canRezCertified || Entities.canRezTmpCertified,
+                referrerURL: referrerURL,
+                filterText: filterText
+            });
+        }
+
         // for toolbar mode: change button to active when window is first openend, false otherwise.
-        marketplaceButton.editProperties({ isActive: onMarketplaceScreen });
+        marketplaceButton.editProperties({ isActive: onMarketplaceScreen || onCommerceScreen });
         if (type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1) {
             ContextOverlay.isInMarketplaceInspectionMode = true;
         } else {
@@ -134,17 +129,237 @@
         }
     }
 
+    function setCertificateInfo(currentEntityWithContextOverlay, itemMarketplaceId) {
+        wireEventBridge(true);
+        tablet.sendToQml({
+            method: 'inspectionCertificate_setMarketplaceId',
+            marketplaceId: itemMarketplaceId || Entities.getEntityProperties(currentEntityWithContextOverlay, ['marketplaceID']).marketplaceID
+        });
+        // ZRF FIXME! Make a call to the endpoint to get item info instead of this silliness
+        Script.setTimeout(function () {
+            var randomNumber = Math.floor((Math.random() * 150) + 1);
+            tablet.sendToQml({
+                method: 'inspectionCertificate_setItemInfo',
+                itemName: "The Greatest Item",
+                itemOwner: "ABCDEFG1234567",
+                itemEdition: (Math.floor(Math.random() * randomNumber) + " / " + randomNumber)
+            });
+        }, 500);
+    }
+
+    function onUsernameChanged() {
+        if (onMarketplaceScreen) {
+            tablet.gotoWebScreen(MARKETPLACE_URL_INITIAL, MARKETPLACES_INJECT_SCRIPT_URL);
+        }
+    }
+
     marketplaceButton.clicked.connect(onClick);
     tablet.screenChanged.connect(onScreenChanged);
     Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
+    ContextOverlay.contextOverlayClicked.connect(setCertificateInfo);
+    GlobalServices.myUsernameChanged.connect(onUsernameChanged);
+
+    function onMessage(message) {
+
+        if (message === GOTO_DIRECTORY) {
+            tablet.gotoWebScreen(MARKETPLACES_URL, MARKETPLACES_INJECT_SCRIPT_URL);
+        } else if (message === QUERY_CAN_WRITE_ASSETS) {
+            tablet.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets());
+        } else if (message === WARN_USER_NO_PERMISSIONS) {
+            Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
+        } else if (message.slice(0, CLARA_IO_STATUS.length) === CLARA_IO_STATUS) {
+            if (isDownloadBeingCancelled) {
+                return;
+            }
+
+            var text = message.slice(CLARA_IO_STATUS.length);
+            if (messageBox === null) {
+                messageBox = Window.openMessageBox(CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
+            } else {
+                Window.updateMessageBox(messageBox, CLARA_DOWNLOAD_TITLE, text, CANCEL_BUTTON, NO_BUTTON);
+            }
+            return;
+        } else if (message.slice(0, CLARA_IO_DOWNLOAD.length) === CLARA_IO_DOWNLOAD) {
+            if (messageBox !== null) {
+                Window.closeMessageBox(messageBox);
+                messageBox = null;
+            }
+            return;
+        } 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,
+                    canRezCertifiedItems: Entities.canRezCertified || Entities.canRezTmpCertified
+                });
+            } else if (parsedJsonMessage.type === "REQUEST_SETTING") {
+                tablet.emitScriptEvent(JSON.stringify({
+                    type: "marketplaces",
+                    action: "commerceSetting",
+                    data: {
+                        commerceMode: Settings.getValue("commerce", false),
+                        userIsLoggedIn: Account.loggedIn,
+                        walletNeedsSetup: Wallet.walletStatus === 1
+                    }
+                }));
+            } 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") {
+                tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+            } 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) {
+        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);
     });
 
+
+
+    // 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: 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':
+                tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+                break;
+            case 'purchases_walletNotSetUp':
+            case 'checkout_walletNotSetUp':
+                wireEventBridge(true);
+                tablet.sendToQml({
+                    method: 'updateWalletReferrer',
+                    referrer: "purchases"
+                });
+                tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+                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 '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.itemMarketplaceId);
+                break;
+            case 'inspectionCertificate_closeClicked':
+                tablet.gotoHomeScreen();
+                break;
+            case 'inspectionCertificate_showInMarketplaceClicked':
+                tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, 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));
+        }
+    }
+
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/notifications.js b/scripts/system/notifications.js
index b34630f3f8..ffe93d13e8 100644
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@@ -207,7 +207,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 +221,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 +242,7 @@
             noticeHeight,
             positions,
             last;
-
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
         if (isOnHMD) {
             // Calculate 3D values from 2D overlay properties.
 
@@ -261,7 +261,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 +366,7 @@
             buttonProperties,
             i;
 
+        var sensorScaleFactor = MyAvatar.sensorToWorldScale;
         if (text.length >= breakPoint) {
             breaks = count;
         }
@@ -387,7 +388,7 @@
             alpha: backgroundAlpha,
             topMargin: topMargin,
             leftMargin: leftMargin,
-            font: {size: fontSize},
+            font: {size: fontSize * sensorScaleFactor},
             text: text
         };
 
@@ -448,7 +449,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,
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 37618253ee..8f08b29cff 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;
@@ -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))
@@ -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);
@@ -764,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..96ed3e3f59 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;
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 257a56bf09..78b14eb7c6 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,7 +97,7 @@
         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();
@@ -98,6 +105,7 @@
         HMD.homeButtonID = UIWebTablet.homeButtonID;
         HMD.tabletScreenID = UIWebTablet.webOverlayID;
         HMD.displayModeChanged.connect(onHmdChanged);
+        MyAvatar.sensorToWorldScaleChanged.connect(onSensorToWorldScaleChanged);
 
         tabletRezzed = true;
     }
@@ -121,6 +129,7 @@
             Overlays.editOverlay(HMD.homeButtonID, { visible: true });
             Overlays.editOverlay(HMD.tabletScreenID, { visible: true });
             Overlays.editOverlay(HMD.tabletScreenID, { maxFPS: 90 });
+            updateTabletWidthFromSettings(true);
         }
         gTablet.tabletShown = true;
     }
@@ -183,9 +192,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 +274,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 () {
diff --git a/tests/gpu-test/src/TestWindow.cpp b/tests/gpu-test/src/TestWindow.cpp
index 39043805b8..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,7 +77,7 @@ void TestWindow::initGl() {
 #ifdef DEFERRED_LIGHTING
     auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
     deferredLightingEffect->init();
-    initDeferredPipelines(*_shapePlumber);
+    initDeferredPipelines(*_shapePlumber, nullptr, nullptr);
 #endif
 }
 
diff --git a/tests/render-perf/CMakeLists.txt b/tests/render-perf/CMakeLists.txt
index 77c8ab2177..5b83ff313b 100644
--- a/tests/render-perf/CMakeLists.txt
+++ b/tests/render-perf/CMakeLists.txt
@@ -12,7 +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 midi)
+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 dbb315a9ae..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,6 +698,7 @@ private:
         _renderCount = _renderThread._presentCount.load();
         update();
 
+        _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;
@@ -1095,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/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index 9847e9f7b9..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>
 
@@ -114,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() {
diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp
index 7d091aec74..c5edf27b67 100644
--- a/tools/atp-client/src/ATPClientApp.cpp
+++ b/tools/atp-client/src/ATPClientApp.cpp
@@ -332,7 +332,7 @@ void ATPClientApp::listAssets() {
         } else if (result == GetAllMappingsRequest::NoError) {
             auto mappings = request->getMappings();
             for (auto& kv : mappings ) {
-                qDebug() << kv.first << kv.second;
+                qDebug() << kv.first << kv.second.hash;
             }
         } else {
             qDebug() << "error -- " << request->getError() << " -- " << request->getErrorString();
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 0259a6baf8..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 fbxTextureFileName { fileTexture->GetFileName() };
-                            QFileInfo textureFileInfo { fbxTextureFileName.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;
-
-                                // figure out the URL to this texture, embedded or external
-                                auto urlToTexture = getTextureURL(textureFileInfo, fileTexture);
-
-                                // 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());
-
-                                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 d0b8c3cd65..d91206a592 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -44,18 +44,14 @@ 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)) {
@@ -81,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) {
@@ -97,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/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/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/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/dist/app-doppleganger-marketplace.js b/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
index c2cf2a2353..bc5368ba5b 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/dist/app-doppleganger-marketplace.js
@@ -599,6 +599,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++;
@@ -612,7 +626,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
@@ -1488,13 +1502,13 @@ 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>";
+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>";
+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.js b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
index 190a8aa69e..9e35d791d6 100644
--- a/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
+++ b/unpublishedScripts/marketplace/doppleganger-attachments/doppleganger.js
@@ -78,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++;
@@ -91,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
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/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/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/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