From b1e4e17f47065d4269048400682ac4f806bc4259 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 20 Nov 2018 10:51:55 -0800
Subject: [PATCH 01/58] Santa Cruz

---
 .gitignore                                    |    1 +
 CMakeLists.txt                                |    1 +
 .../gvrinterface/InterfaceActivity.java       |   42 -
 .../hifiinterface/InterfaceActivity.java      |   21 +-
 .../fragment/SignedInFragment.java            |   73 +
 ...d_button_color1.xml => rounded_button.xml} |    0
 .../src/main/res/drawable/rounded_edit.xml    |    7 +
 .../src/main/res/layout/fragment_signedin.xml |   63 +
 android/apps/questFramePlayer/CMakeLists.txt  |    9 +
 android/apps/questFramePlayer/build.gradle    |   51 +
 .../proguard-rules.pro                        |    0
 .../src/main/AndroidManifest.xml              |   55 +
 .../src/main/cpp/PlayerWindow.cpp             |   25 +
 .../src/main/cpp/PlayerWindow.h               |   29 +
 .../src/main/cpp/RenderThread.cpp             |  239 ++++
 .../src/main/cpp/RenderThread.h               |   44 +
 .../questFramePlayer/src/main/cpp/main.cpp    |   56 +
 .../frameplayer/QuestQtActivity.java          |   52 +
 .../frameplayer/QuestRenderActivity.java      |   14 +
 .../src/main/res/drawable/ic_launcher.xml     |    0
 .../src/main/res/values/strings.xml           |    3 +
 android/apps/questInterface/CMakeLists.txt    |   16 +
 android/apps/questInterface/build.gradle      |  149 ++
 .../apps/questInterface/proguard-rules.pro    |   25 +
 .../src/main/AndroidManifest.xml              |   54 +
 .../questInterface/src/main/cpp/native.cpp    |   86 ++
 .../questInterface/MainActivity.java          |   70 +
 .../questInterface/PermissionsChecker.java    |   65 +
 .../questInterface/QuestActivity.java         |   25 +
 .../src/main/res/drawable/ic_launcher.xml     |   17 +
 .../src/main/res/values/strings.xml           |    3 +
 android/apps/ui/CMakeLists.txt                |    7 +
 android/apps/ui/proguard-rules.pro            |   25 +
 android/apps/ui/src/main/AndroidManifest.xml  |   32 +
 android/apps/ui/src/main/cpp/PlayerWindow.cpp |   22 +
 android/apps/ui/src/main/cpp/PlayerWindow.h   |   27 +
 android/apps/ui/src/main/cpp/RenderThread.cpp |   98 ++
 android/apps/ui/src/main/cpp/RenderThread.h   |   42 +
 android/apps/ui/src/main/cpp/main.cpp         |   58 +
 android/apps/ui/src/main/cpp/main.qml         |   21 +
 android/apps/ui/src/main/cpp/mainqt.cpp       |    5 +
 android/apps/ui/src/main/cpp/resources.qrc    |    6 +
 .../java/io/highfidelity/ui/UiActivity.java   |   21 +
 .../ui/src/main/res/drawable/ic_launcher.xml  |   17 +
 .../apps/ui/src/main/res/values/strings.xml   |    3 +
 android/apps/ui/src/main/uiApp.pro            |   22 +
 android/build.gradle                          |  122 +-
 android/gradle.properties                     |    1 +
 .../gradle/wrapper/gradle-wrapper.properties  |    4 +-
 android/libraries/oculus/build.gradle         |   17 +
 .../oculus/src/main/AndroidManifest.xml       |    2 +
 .../oculus/OculusMobileActivity.java          |  103 ++
 .../qt5/android/bindings/QtActivity.java      |   20 +-
 android/settings.gradle                       |   25 +-
 cmake/macros/IncludeHifiLibraryHeaders.cmake  |    2 +-
 cmake/macros/LinkHifiLibraries.cmake          |    4 +-
 cmake/macros/TargetEGL.cmake                  |    4 +
 cmake/macros/TargetOculusMobile.cmake         |   20 +
 cmake/ports/hifi-client-deps/CONTROL          |    2 +-
 gvr-interface/CMakeLists.txt                  |   85 --
 gvr-interface/res/drawable/icon.png           |  Bin 9914 -> 0 bytes
 gvr-interface/src/Client.cpp                  |   73 -
 gvr-interface/src/Client.h                    |   33 -
 gvr-interface/src/GVRInterface.cpp            |  191 ---
 gvr-interface/src/GVRInterface.h              |   72 -
 gvr-interface/src/GVRMainWindow.cpp           |  176 ---
 gvr-interface/src/GVRMainWindow.h             |   58 -
 gvr-interface/src/InterfaceView.cpp           |   18 -
 gvr-interface/src/InterfaceView.h             |   23 -
 gvr-interface/src/LoginDialog.cpp             |   69 -
 gvr-interface/src/LoginDialog.h               |   34 -
 gvr-interface/src/RenderingClient.cpp         |  156 ---
 gvr-interface/src/RenderingClient.h           |   57 -
 .../gvrinterface/InterfaceActivity.java       |   41 -
 gvr-interface/src/main.cpp                    |   28 -
 .../templates/InterfaceBetaActivity.java.in   |   51 -
 gvr-interface/templates/hockeyapp.xml.in      |    5 -
 hifi_android.py                               |    7 +
 interface/CMakeLists.txt                      |   11 +-
 interface/resources/qml/+android/StatText.qml |    9 -
 interface/resources/qml/+android/Stats.qml    |  410 ------
 interface/resources/qml/Browser.qml           |   22 +-
 .../LoginDialog/+android/LinkAccountBody.qml  |  292 ----
 .../qml/LoginDialog/+android/SignUpBody.qml   |  297 ----
 interface/resources/qml/QmlWebWindow.qml      |   29 +-
 interface/resources/qml/TabletBrowser.qml     |   38 +-
 interface/resources/qml/Web3DSurface.qml      |   75 +-
 .../qml/controls/FlickableWebViewCore.qml     |   39 +-
 .../resources/qml/controls/TabletWebView.qml  |    1 -
 .../qml/controlsUit/+android/ImageButton.qml  |   82 --
 .../resources/qml/controlsUit/BaseWebView.qml |   12 +-
 .../resources/qml/controlsUit/WebSpinner.qml  |    4 +-
 .../qml/desktop/+android/FocusHack.qml        |   26 -
 interface/resources/qml/desktop/Desktop.qml   |   11 +-
 .../resources/qml/hifi/+android/ActionBar.qml |   71 -
 .../resources/qml/hifi/+android/AudioBar.qml  |   84 --
 .../qml/hifi/+android/AvatarOption.qml        |  117 --
 .../resources/qml/hifi/+android/Desktop.qml   |   63 -
 .../qml/hifi/+android/HifiConstants.qml       |   56 -
 .../resources/qml/hifi/+android/StatsBar.qml  |   71 -
 .../qml/hifi/+android/WindowHeader.qml        |  113 --
 .../qml/hifi/+android/bottomHudOptions.qml    |   86 --
 .../resources/qml/hifi/+android/button.qml    |  225 ---
 .../resources/qml/hifi/+android/modesbar.qml  |   72 -
 interface/resources/qml/hifi/Desktop.qml      |   35 +-
 interface/resources/qml/hifi/WebBrowser.qml   |   95 +-
 .../resources/qml/hifi/avatarapp/Spinner.qml  |    1 -
 .../qml/hifi/tablet/BlocksWebView.qml         |    3 +-
 .../resources/qml/hifi/tablet/TabletMenu.qml  |    2 -
 .../qml/hifi/tablet/TabletWebView.qml         |    1 -
 .../qml/hifi/tablet/WindowWebView.qml         |    1 -
 .../qml/stylesUit/+android/HifiConstants.qml  |  358 -----
 interface/src/Application.cpp                 |   74 +-
 interface/src/Application.h                   |    6 +-
 interface/src/LODManager.cpp                  |    1 +
 interface/src/avatar/MyAvatar.cpp             |   12 +-
 .../interface/InterfaceActivity.java          |   40 -
 .../src/octree/OctreePacketProcessor.cpp      |    5 +-
 interface/src/raypick/LaserPointer.cpp        |    6 +-
 .../raypick/LaserPointerScriptingInterface.h  |    2 +-
 interface/src/raypick/ParabolaPick.cpp        |   14 +-
 interface/src/raypick/ParabolaPointer.cpp     |    2 +-
 interface/src/raypick/PathPointer.cpp         |   12 +-
 .../src/raypick/PickScriptingInterface.cpp    |   22 +-
 .../src/raypick/PickScriptingInterface.h      |  131 +-
 .../src/raypick/PointerScriptingInterface.h   |    9 +-
 interface/src/raypick/RayPick.cpp             |   13 +-
 .../src/raypick/RayPickScriptingInterface.h   |   10 +-
 interface/src/raypick/StylusPointer.cpp       |    2 +-
 interface/src/ui/AnimStats.cpp                |    2 +-
 interface/src/ui/Keyboard.cpp                 |    3 +-
 interface/src/ui/Stats.cpp                    |    2 +-
 .../animation/src/AnimInverseKinematics.cpp   |    2 +-
 .../src/display-plugins/DisplayPlugin.cpp     |    2 +
 .../display-plugins/OpenGLDisplayPlugin.cpp   |    6 +-
 .../src/display-plugins/OpenGLDisplayPlugin.h |    3 +
 .../hmd/DebugHmdDisplayPlugin.cpp             |   13 +
 .../display-plugins/hmd/HmdDisplayPlugin.h    |    2 +-
 .../src/EntityTreeRenderer.cpp                |   10 +-
 libraries/entities/CMakeLists.txt             |    1 -
 .../entities/src/EntityScriptingInterface.cpp |  130 +-
 .../entities/src/EntityScriptingInterface.h   |   95 +-
 libraries/entities/src/EntityTree.cpp         |  374 +++--
 libraries/entities/src/EntityTree.h           |   57 +-
 libraries/entities/src/EntityTreeElement.cpp  |  256 +---
 libraries/entities/src/EntityTreeElement.h    |   52 +-
 libraries/gl/CMakeLists.txt                   |    2 +-
 libraries/gl/src/gl/Context.cpp               |   24 +-
 libraries/gl/src/gl/ContextQt.cpp             |   12 +-
 libraries/gl/src/gl/OffscreenGLCanvas.cpp     |   14 +-
 libraries/gl/src/gl/QOpenGLContextWrapper.cpp |   30 +-
 libraries/gl/src/gl/QOpenGLContextWrapper.h   |   22 +-
 .../gpu-gl-common/src/gpu/gl/GLBackend.cpp    |    4 +
 .../gpu-gl-common/src/gpu/gl/GLBackend.h      |    4 +-
 .../src/gpu/gl45/GL45BackendTexture.cpp       |   12 +-
 .../src/gpu/gles/GLESBackendOutput.cpp        |    2 +-
 libraries/gpu/src/gpu/Context.h               |    1 +
 libraries/gpu/src/gpu/FrameReader.cpp         |   29 +-
 libraries/gpu/src/gpu/Transform.slh           |    2 +-
 .../src/input-plugins/InputPlugin.cpp         |    3 +
 libraries/oculusMobile/CMakeLists.txt         |   11 +
 libraries/oculusMobile/src/ovr/Forward.h      |   17 +
 .../oculusMobile/src/ovr/Framebuffer.cpp      |   93 ++
 libraries/oculusMobile/src/ovr/Framebuffer.h  |   34 +
 libraries/oculusMobile/src/ovr/GLContext.cpp  |  182 +++
 libraries/oculusMobile/src/ovr/GLContext.h    |   37 +
 libraries/oculusMobile/src/ovr/Helpers.cpp    |   38 +
 libraries/oculusMobile/src/ovr/Helpers.h      |   94 ++
 libraries/oculusMobile/src/ovr/TaskQueue.cpp  |   40 +
 libraries/oculusMobile/src/ovr/TaskQueue.h    |   42 +
 libraries/oculusMobile/src/ovr/VrHandler.cpp  |  337 +++++
 libraries/oculusMobile/src/ovr/VrHandler.h    |   47 +
 libraries/oculusMobilePlugin/CMakeLists.txt   |   29 +
 libraries/oculusMobilePlugin/src/Logging.cpp  |    4 +
 libraries/oculusMobilePlugin/src/Logging.h    |   13 +
 .../src/OculusMobileControllerManager.cpp     |  694 ++++++++++
 .../src/OculusMobileControllerManager.h       |   43 +
 .../src/OculusMobileDisplayPlugin.cpp         |  269 ++++
 .../src/OculusMobileDisplayPlugin.h           |   65 +
 libraries/pointers/src/Pick.cpp               |    5 +-
 libraries/pointers/src/Pick.h                 |   79 +-
 libraries/pointers/src/PickCacheOptimizer.h   |    6 +-
 libraries/qml/src/qml/OffscreenSurface.cpp    |   15 +
 libraries/qml/src/qml/OffscreenSurface.h      |    2 +
 libraries/render-utils/src/Model.cpp          |    5 +
 .../render-utils/src/parabola_forward.slv     |    7 +
 libraries/render/src/render/CullTask.cpp      |   16 +-
 .../src/ConsoleScriptingInterface.cpp         |   12 +
 libraries/shaders/headers/310es/header.glsl   |    3 +
 libraries/shaders/src/shaders/Shaders.cpp     |    4 +-
 libraries/shared/src/shared/FileUtils.cpp     |    3 +
 libraries/ui/src/QmlFragmentClass.cpp         |    9 +-
 libraries/ui/src/QmlWindowClass.cpp           |    2 +
 libraries/ui/src/ui/OffscreenQmlSurface.cpp   |   11 +-
 plugins/oculus/src/OculusDisplayPlugin.cpp    |    4 +
 scripts/+android/defaultScripts.js            |  128 --
 scripts/defaultScripts.js                     |   23 +-
 .../utilities/tests/entityPerfTest.js         |    8 +
 scripts/system/+android/actionbar.js          |   59 -
 scripts/system/+android/audio.js              |   71 -
 scripts/system/+android/clickWeb.js           |  108 --
 scripts/system/+android/displayNames.js       |  167 ---
 scripts/system/+android/modes.js              |  124 --
 scripts/system/+android/radar.js              | 1217 -----------------
 scripts/system/+android/stats.js              |   39 -
 .../system/+android/touchscreenvirtualpad.js  |   22 -
 scripts/system/+android/uniqueColor.js        |   54 -
 scripts/system/goto.js                        |   51 +-
 scripts/system/html/js/miniTablet.js          |   24 +-
 scripts/system/miniTablet.js                  |    5 +-
 tools/CMakeLists.txt                          |    1 +
 tools/gpu-frame-player/CMakeLists.txt         |    3 +-
 tools/gpu-frame-player/src/PlayerWindow.cpp   |   46 +-
 tools/gpu-frame-player/src/RenderThread.cpp   |   39 +-
 tools/gpu-frame-player/src/RenderThread.h     |    2 +
 tools/noramlizeFrame.py                       |   62 +
 tools/webview/CMakeLists.txt                  |    7 +
 tools/webview/src/PlayerWindow.cpp            |   23 +
 tools/webview/src/PlayerWindow.h              |   27 +
 tools/webview/src/RenderThread.cpp            |   95 ++
 tools/webview/src/RenderThread.h              |   42 +
 tools/webview/src/main.cpp                    |   31 +
 tools/webview/src/main.qml                    |   23 +
 tools/webview/src/mainqt.cpp                  |    5 +
 tools/webview/src/resources.qrc               |    6 +
 .../DomainContent/Toybox/pistol/pistol.js     |    2 +-
 226 files changed, 5403 insertions(+), 6931 deletions(-)
 delete mode 100644 android/apps/interface/src/main/java/io/highfidelity/gvrinterface/InterfaceActivity.java
 create mode 100644 android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
 rename android/apps/interface/src/main/res/drawable/{rounded_button_color1.xml => rounded_button.xml} (100%)
 create mode 100644 android/apps/interface/src/main/res/drawable/rounded_edit.xml
 create mode 100644 android/apps/interface/src/main/res/layout/fragment_signedin.xml
 create mode 100644 android/apps/questFramePlayer/CMakeLists.txt
 create mode 100644 android/apps/questFramePlayer/build.gradle
 rename android/apps/{interface => questFramePlayer}/proguard-rules.pro (100%)
 create mode 100644 android/apps/questFramePlayer/src/main/AndroidManifest.xml
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/RenderThread.h
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/main.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
 create mode 100644 android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
 rename android/apps/{interface => questFramePlayer}/src/main/res/drawable/ic_launcher.xml (100%)
 create mode 100644 android/apps/questFramePlayer/src/main/res/values/strings.xml
 create mode 100644 android/apps/questInterface/CMakeLists.txt
 create mode 100644 android/apps/questInterface/build.gradle
 create mode 100644 android/apps/questInterface/proguard-rules.pro
 create mode 100644 android/apps/questInterface/src/main/AndroidManifest.xml
 create mode 100644 android/apps/questInterface/src/main/cpp/native.cpp
 create mode 100644 android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
 create mode 100644 android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
 create mode 100644 android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
 create mode 100644 android/apps/questInterface/src/main/res/drawable/ic_launcher.xml
 create mode 100644 android/apps/questInterface/src/main/res/values/strings.xml
 create mode 100644 android/apps/ui/CMakeLists.txt
 create mode 100644 android/apps/ui/proguard-rules.pro
 create mode 100644 android/apps/ui/src/main/AndroidManifest.xml
 create mode 100644 android/apps/ui/src/main/cpp/PlayerWindow.cpp
 create mode 100644 android/apps/ui/src/main/cpp/PlayerWindow.h
 create mode 100644 android/apps/ui/src/main/cpp/RenderThread.cpp
 create mode 100644 android/apps/ui/src/main/cpp/RenderThread.h
 create mode 100644 android/apps/ui/src/main/cpp/main.cpp
 create mode 100644 android/apps/ui/src/main/cpp/main.qml
 create mode 100644 android/apps/ui/src/main/cpp/mainqt.cpp
 create mode 100644 android/apps/ui/src/main/cpp/resources.qrc
 create mode 100644 android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java
 create mode 100644 android/apps/ui/src/main/res/drawable/ic_launcher.xml
 create mode 100644 android/apps/ui/src/main/res/values/strings.xml
 create mode 100644 android/apps/ui/src/main/uiApp.pro
 create mode 100644 android/libraries/oculus/build.gradle
 create mode 100644 android/libraries/oculus/src/main/AndroidManifest.xml
 create mode 100644 android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
 create mode 100644 cmake/macros/TargetEGL.cmake
 create mode 100644 cmake/macros/TargetOculusMobile.cmake
 delete mode 100644 gvr-interface/CMakeLists.txt
 delete mode 100644 gvr-interface/res/drawable/icon.png
 delete mode 100644 gvr-interface/src/Client.cpp
 delete mode 100644 gvr-interface/src/Client.h
 delete mode 100644 gvr-interface/src/GVRInterface.cpp
 delete mode 100644 gvr-interface/src/GVRInterface.h
 delete mode 100644 gvr-interface/src/GVRMainWindow.cpp
 delete mode 100644 gvr-interface/src/GVRMainWindow.h
 delete mode 100644 gvr-interface/src/InterfaceView.cpp
 delete mode 100644 gvr-interface/src/InterfaceView.h
 delete mode 100644 gvr-interface/src/LoginDialog.cpp
 delete mode 100644 gvr-interface/src/LoginDialog.h
 delete mode 100644 gvr-interface/src/RenderingClient.cpp
 delete mode 100644 gvr-interface/src/RenderingClient.h
 delete mode 100644 gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java
 delete mode 100644 gvr-interface/src/main.cpp
 delete mode 100644 gvr-interface/templates/InterfaceBetaActivity.java.in
 delete mode 100644 gvr-interface/templates/hockeyapp.xml.in
 delete mode 100644 interface/resources/qml/+android/StatText.qml
 delete mode 100644 interface/resources/qml/+android/Stats.qml
 delete mode 100644 interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
 delete mode 100644 interface/resources/qml/LoginDialog/+android/SignUpBody.qml
 delete mode 100644 interface/resources/qml/controlsUit/+android/ImageButton.qml
 delete mode 100644 interface/resources/qml/desktop/+android/FocusHack.qml
 delete mode 100644 interface/resources/qml/hifi/+android/ActionBar.qml
 delete mode 100644 interface/resources/qml/hifi/+android/AudioBar.qml
 delete mode 100644 interface/resources/qml/hifi/+android/AvatarOption.qml
 delete mode 100644 interface/resources/qml/hifi/+android/Desktop.qml
 delete mode 100644 interface/resources/qml/hifi/+android/HifiConstants.qml
 delete mode 100644 interface/resources/qml/hifi/+android/StatsBar.qml
 delete mode 100644 interface/resources/qml/hifi/+android/WindowHeader.qml
 delete mode 100644 interface/resources/qml/hifi/+android/bottomHudOptions.qml
 delete mode 100644 interface/resources/qml/hifi/+android/button.qml
 delete mode 100644 interface/resources/qml/hifi/+android/modesbar.qml
 delete mode 100644 interface/resources/qml/stylesUit/+android/HifiConstants.qml
 delete mode 100644 interface/src/java/io/highfidelity/interface/InterfaceActivity.java
 create mode 100644 libraries/oculusMobile/CMakeLists.txt
 create mode 100644 libraries/oculusMobile/src/ovr/Forward.h
 create mode 100644 libraries/oculusMobile/src/ovr/Framebuffer.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/Framebuffer.h
 create mode 100644 libraries/oculusMobile/src/ovr/GLContext.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/GLContext.h
 create mode 100644 libraries/oculusMobile/src/ovr/Helpers.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/Helpers.h
 create mode 100644 libraries/oculusMobile/src/ovr/TaskQueue.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/TaskQueue.h
 create mode 100644 libraries/oculusMobile/src/ovr/VrHandler.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/VrHandler.h
 create mode 100644 libraries/oculusMobilePlugin/CMakeLists.txt
 create mode 100644 libraries/oculusMobilePlugin/src/Logging.cpp
 create mode 100644 libraries/oculusMobilePlugin/src/Logging.h
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
 create mode 100644 libraries/render-utils/src/parabola_forward.slv
 delete mode 100644 scripts/+android/defaultScripts.js
 delete mode 100644 scripts/system/+android/actionbar.js
 delete mode 100644 scripts/system/+android/audio.js
 delete mode 100644 scripts/system/+android/clickWeb.js
 delete mode 100644 scripts/system/+android/displayNames.js
 delete mode 100644 scripts/system/+android/modes.js
 delete mode 100644 scripts/system/+android/radar.js
 delete mode 100644 scripts/system/+android/stats.js
 delete mode 100644 scripts/system/+android/touchscreenvirtualpad.js
 delete mode 100644 scripts/system/+android/uniqueColor.js
 create mode 100644 tools/noramlizeFrame.py
 create mode 100644 tools/webview/CMakeLists.txt
 create mode 100644 tools/webview/src/PlayerWindow.cpp
 create mode 100644 tools/webview/src/PlayerWindow.h
 create mode 100644 tools/webview/src/RenderThread.cpp
 create mode 100644 tools/webview/src/RenderThread.h
 create mode 100644 tools/webview/src/main.cpp
 create mode 100644 tools/webview/src/main.qml
 create mode 100644 tools/webview/src/mainqt.cpp
 create mode 100644 tools/webview/src/resources.qrc

diff --git a/.gitignore b/.gitignore
index 5a965b494c..4c262f9f4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ android/**/bin
 android/**/src/main/res/values/libs.xml
 android/**/src/main/assets
 android/**/gradle*
+*.class
 
 # VSCode
 # List taken from Github Global Ignores master@435c4d92
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6956fd22c3..4d616e1f3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@ endif()
 if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
+  add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine)
 endif ()
diff --git a/android/apps/interface/src/main/java/io/highfidelity/gvrinterface/InterfaceActivity.java b/android/apps/interface/src/main/java/io/highfidelity/gvrinterface/InterfaceActivity.java
deleted file mode 100644
index aad769de70..0000000000
--- a/android/apps/interface/src/main/java/io/highfidelity/gvrinterface/InterfaceActivity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  InterfaceActivity.java
-//  gvr-interface/java
-//
-//  Created by Stephen Birarda on 1/26/15.
-//  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
-//
-
-package io.highfidelity.gvrinterface;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.view.WindowManager;
-import android.util.Log;
-import org.qtproject.qt5.android.bindings.QtActivity;
-
-public class InterfaceActivity extends QtActivity {
-    
-    public static native void handleHifiURL(String hifiURLString);
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        
-        // Get the intent that started this activity in case we have a hifi:// URL to parse
-        Intent intent = getIntent();
-        if (intent.getAction() == Intent.ACTION_VIEW) {
-            Uri data = intent.getData();
-        
-            if (data.getScheme().equals("hifi")) {
-                handleHifiURL(data.toString());
-            }
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index b7d2157737..fce5c2553e 100644
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -166,8 +166,27 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         nativeOnDestroy();
+        /*
+        cduarte https://highfidelity.manuscript.com/f/cases/16712/App-freezes-on-opening-randomly
+        After Qt upgrade to 5.11 we had a black screen crash after closing the application with
+        the hardware button "Back" and trying to start the app again. It could only be fixed after
+        totally closing the app swiping it in the list of running apps.
+        This problem did not happen with the previous Qt version.
+        After analysing changes we came up with this case and change:
+            https://codereview.qt-project.org/#/c/218882/
+        In summary they've moved libs loading to the same thread as main() and as a matter of correctness
+        in the onDestroy method in QtActivityDelegate, they exit that thread with `QtNative.m_qtThread.exit();`
+        That exit call is the main reason of this problem.
+
+        In this fix we just replace the `QtApplication.invokeDelegate();` call that may end using the
+        entire onDestroy method including that thread exit line for other three lines that purposely
+        terminate qt (borrowed from QtActivityDelegate::onDestroy as well).
+         */
+        QtNative.terminateQt();
+        QtNative.setActivity(null, null);
+        System.exit(0);
+        super.onDestroy();
     }
 
     @Override
diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
new file mode 100644
index 0000000000..9ed2f1c7f5
--- /dev/null
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
@@ -0,0 +1,73 @@
+package io.highfidelity.hifiinterface.fragment;
+
+import android.app.Fragment;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import io.highfidelity.hifiinterface.R;
+
+public class SignedInFragment extends Fragment {
+
+    private Button mGetStartedButton;
+    private OnSignedInInteractionListener mListener;
+
+    public SignedInFragment() {
+        // Required empty public constructor
+    }
+
+    public static SignedInFragment newInstance() {
+        SignedInFragment fragment = new SignedInFragment();
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_signedin, container, false);
+        mGetStartedButton = rootView.findViewById(R.id.getStarted);
+
+        mGetStartedButton.setOnClickListener(view -> {
+            getStarted();
+        });
+
+        return rootView;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof SignedInFragment.OnSignedInInteractionListener) {
+            mListener = (SignedInFragment.OnSignedInInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnSignedInInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    public void getStarted() {
+        if (mListener != null) {
+            mListener.onGettingStarted();
+        }
+    }
+
+    public interface OnSignedInInteractionListener {
+        void onGettingStarted();
+    }
+
+}
diff --git a/android/apps/interface/src/main/res/drawable/rounded_button_color1.xml b/android/apps/interface/src/main/res/drawable/rounded_button.xml
similarity index 100%
rename from android/apps/interface/src/main/res/drawable/rounded_button_color1.xml
rename to android/apps/interface/src/main/res/drawable/rounded_button.xml
diff --git a/android/apps/interface/src/main/res/drawable/rounded_edit.xml b/android/apps/interface/src/main/res/drawable/rounded_edit.xml
new file mode 100644
index 0000000000..3c1cac4d1d
--- /dev/null
+++ b/android/apps/interface/src/main/res/drawable/rounded_edit.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" android:padding="9dp">
+        <corners android:radius="4dip" />
+        <stroke android:width="1dip" android:color="@android:color/black" />
+        <solid android:color="@color/backgroundEditText"/>
+</shape>
\ No newline at end of file
diff --git a/android/apps/interface/src/main/res/layout/fragment_signedin.xml b/android/apps/interface/src/main/res/layout/fragment_signedin.xml
new file mode 100644
index 0000000000..1c982b0e0d
--- /dev/null
+++ b/android/apps/interface/src/main/res/layout/fragment_signedin.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/backgroundLight">
+
+    <ImageView
+        android:id="@+id/header"
+        android:layout_width="@dimen/header_hifi_width"
+        android:layout_height="@dimen/header_hifi_height"
+        android:layout_marginTop="@dimen/header_hifi_margin_top"
+        android:contentDescription="HighFidelity"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/hifi_header" />
+
+    <TextView
+        android:id="@+id/welcome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:paddingLeft="86dp"
+        android:paddingRight="86dp"
+        android:fontFamily="@font/raleway"
+        android:textColor="@color/clearText"
+        android:textSize="24sp"
+        android:text="@string/signedin_welcome"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:gravity="center"
+
+        />
+
+    <Button
+        android:id="@+id/getStarted"
+        android:layout_width="217dp"
+        android:layout_height="38dp"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/rounded_button"
+        android:fontFamily="@font/raleway_semibold"
+        android:paddingBottom="0dp"
+        android:paddingLeft="25dp"
+        android:paddingRight="25dp"
+        android:paddingTop="0dp"
+        android:text="@string/get_started"
+        android:textColor="@color/white_opaque"
+        android:textAllCaps="false"
+        android:textSize="18sp"
+        app:layout_constraintTop_toBottomOf="@id/welcome"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+
+        app:layout_goneMarginTop="4dp"/>
+
+
+
+
+
+</android.support.constraint.ConstraintLayout>
diff --git a/android/apps/questFramePlayer/CMakeLists.txt b/android/apps/questFramePlayer/CMakeLists.txt
new file mode 100644
index 0000000000..a22524222a
--- /dev/null
+++ b/android/apps/questFramePlayer/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(TARGET_NAME framePlayer)
+setup_hifi_library(AndroidExtras)
+link_hifi_libraries(shared ktx shaders gpu gl oculusMobile ${PLATFORM_GL_BACKEND})
+target_include_directories(${TARGET_NAME} PRIVATE ${HIFI_ANDROID_PRECOMPILED}/ovr/VrApi/Include)
+target_link_libraries(${TARGET_NAME} android log m)
+target_opengl()
+target_oculus_mobile()
+
+
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
new file mode 100644
index 0000000000..6b77eb72de
--- /dev/null
+++ b/android/apps/questFramePlayer/build.gradle
@@ -0,0 +1,51 @@
+apply plugin: 'com.android.application'
+
+android {
+    signingConfigs {
+        release {
+            keyAlias 'key0'
+            keyPassword 'password'
+            storeFile file('C:/android/keystore.jks')
+            storePassword 'password'
+        }
+    }
+
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "io.highfidelity.frameplayer"
+        minSdkVersion 25
+        targetSdkVersion 28
+        ndk { abiFilters 'arm64-v8a' }
+        externalNativeBuild {
+            cmake {
+                arguments '-DHIFI_ANDROID=1',
+                    '-DHIFI_ANDROID_APP=framePlayer',
+                    '-DANDROID_TOOLCHAIN=clang',
+                    '-DANDROID_STL=c++_shared',
+
+                    '-DCMAKE_VERBOSE_MAKEFILE=ON'
+                targets = ['framePlayer']
+            }
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+    }
+
+    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
+    implementation project(':oculus')
+    implementation project(':qt')
+}
diff --git a/android/apps/interface/proguard-rules.pro b/android/apps/questFramePlayer/proguard-rules.pro
similarity index 100%
rename from android/apps/interface/proguard-rules.pro
rename to android/apps/questFramePlayer/proguard-rules.pro
diff --git a/android/apps/questFramePlayer/src/main/AndroidManifest.xml b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..a4c4ec1f2f
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.highfidelity.frameplayer"
+    android:versionCode="1"
+    android:versionName="1.0"
+    android:installLocation="auto">
+    <uses-feature android:glEsVersion="0x00030002" android:required="true" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <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="true"/>
+    <uses-feature android:name="android.hardware.vr.high_performance" android:required="true"/>
+
+
+    <application android:label="Frame Viewer"
+        android:allowBackup="false"
+        android:name="org.qtproject.qt5.android.bindings.QtApplication"
+        tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon">
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+        <activity
+            android:name=".QuestQtActivity"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape"
+            android:excludeFromRecents="false"
+            android:alwaysRetainTaskState="true"
+            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
+            >
+            <!-- JNI nonsense -->
+            <meta-data android:name="android.app.lib_name" android:value="framePlayer"/>
+            <!-- Qt nonsense -->
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+        </activity>
+
+        <activity
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
+            android:name=".QuestRenderActivity"
+            android:label="Frame Player"
+            android:launchMode="singleInstance"
+            android:screenOrientation="landscape"
+            android:excludeFromRecents="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
new file mode 100644
index 0000000000..ec2986298e
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
@@ -0,0 +1,25 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "PlayerWindow.h"
+
+#include <QtWidgets/QFileDialog>
+
+PlayerWindow::PlayerWindow() {
+    installEventFilter(this);
+    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
+    setSurfaceType(QSurface::OpenGLSurface);
+    create();
+    showFullScreen();
+    // Ensure the window is visible and the GL context is valid
+    QCoreApplication::processEvents();
+    _renderThread.initialize(this);
+}
+
+PlayerWindow::~PlayerWindow() {
+}
diff --git a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
new file mode 100644
index 0000000000..e4dd6cef43
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
@@ -0,0 +1,29 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+#include <QtGui/QWindow>
+#include <QtCore/QSettings>
+
+#include <gpu/Forward.h>
+#include "RenderThread.h"
+
+// Create a simple OpenGL window that renders text in various ways
+class PlayerWindow : public QWindow {
+public:
+    PlayerWindow();
+    virtual ~PlayerWindow();
+
+protected:
+    //bool eventFilter(QObject* obj, QEvent* event) override;
+    //void keyPressEvent(QKeyEvent* event) override;
+
+private:
+    QSettings _settings;
+    RenderThread _renderThread;
+};
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
new file mode 100644
index 0000000000..507bfd08b9
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
@@ -0,0 +1,239 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "RenderThread.h"
+
+#include <mutex>
+
+#include <jni.h>
+#include <android/log.h>
+
+#include <QtCore/QFileInfo>
+#include <QtGui/QWindow>
+#include <QtGui/QImageReader>
+
+#include <gl/QOpenGLContextWrapper.h>
+#include <gpu/FrameIO.h>
+#include <gpu/Texture.h>
+
+#include <VrApi_Types.h>
+#include <ovr/VrHandler.h>
+#include <ovr/Helpers.h>
+
+#include <VrApi.h>
+#include <VrApi_Input.h>
+
+static JNIEnv* _env { nullptr };
+static JavaVM* _vm { nullptr };
+static jobject _activity { nullptr };
+
+struct HandController{
+    ovrInputTrackedRemoteCapabilities caps {};
+    ovrInputStateTrackedRemote state {};
+    ovrResult stateResult{ ovrSuccess };
+    ovrTracking tracking {};
+    ovrResult trackingResult{ ovrSuccess };
+
+    void update(ovrMobile* session, double time = 0.0) {
+        const auto& deviceId = caps.Header.DeviceID;
+        stateResult = vrapi_GetCurrentInputState(session, deviceId, &state.Header);
+        trackingResult = vrapi_GetInputTrackingState(session, deviceId, 0.0, &tracking);
+    }
+};
+
+std::vector<HandController> devices;
+
+extern "C" {
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", __FUNCTION__);
+    return JNI_VERSION_1_6;
+}
+
+
+JNIEXPORT void JNICALL Java_io_highfidelity_frameplayer_QuestQtActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
+    env->GetJavaVM(&_vm);
+    _activity = env->NewGlobalRef(obj);
+}
+}
+
+static const char* FRAME_FILE = "assets:/frames/20190115_0948.json";
+
+static void textureLoader(const std::string& filename, const gpu::TexturePointer& texture, uint16_t layer) {
+    QImage image;
+    QImageReader(filename.c_str()).read(&image);
+    if (layer > 0) {
+        return;
+    }
+    texture->assignStoredMip(0, image.byteCount(), image.constBits());
+}
+
+void RenderThread::submitFrame(const gpu::FramePointer& frame) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    _pendingFrames.push(frame);
+}
+
+void RenderThread::move(const glm::vec3& v) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    _correction = glm::inverse(glm::translate(mat4(), v)) * _correction;
+}
+
+void RenderThread::initialize(QWindow* window) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    setObjectName("RenderThread");
+    Parent::initialize();
+    _window = window;
+    _thread->setObjectName("RenderThread");
+}
+
+void RenderThread::setup() {
+    // Wait until the context has been moved to this thread
+    { std::unique_lock<std::mutex> lock(_frameLock); }
+
+
+    ovr::VrHandler::initVr();
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Launching oculus activity");
+    _vm->AttachCurrentThread(&_env, nullptr);
+    jclass cls = _env->GetObjectClass(_activity);
+    jmethodID mid = _env->GetMethodID(cls, "launchOculusActivity", "()V");
+    _env->CallVoidMethod(_activity, mid);
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Launching oculus activity done");
+    ovr::VrHandler::setHandler(this);
+
+    makeCurrent();
+
+    // GPU library init
+    gpu::Context::init<gpu::gl::GLBackend>();
+    _gpuContext = std::make_shared<gpu::Context>();
+    _backend = _gpuContext->getBackend();
+    _gpuContext->beginFrame();
+    _gpuContext->endFrame();
+
+    makeCurrent();
+    glGenTextures(1, &_externalTexture);
+    glBindTexture(GL_TEXTURE_2D, _externalTexture);
+    static const glm::u8vec4 color{ 0,1,0,0 };
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &color);
+
+    if (QFileInfo(FRAME_FILE).exists()) {
+        auto frame = gpu::readFrame(FRAME_FILE, _externalTexture, &textureLoader);
+        submitFrame(frame);
+    }
+}
+
+void RenderThread::shutdown() {
+    _activeFrame.reset();
+    while (!_pendingFrames.empty()) {
+        _gpuContext->consumeFrameUpdates(_pendingFrames.front());
+        _pendingFrames.pop();
+    }
+    _gpuContext->shutdown();
+    _gpuContext.reset();
+}
+
+void RenderThread::handleInput() {
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        withOvrMobile([&](ovrMobile* session){
+            int deviceIndex = 0;
+            ovrInputCapabilityHeader capsHeader;
+            while (vrapi_EnumerateInputDevices(session, deviceIndex, &capsHeader) >= 0) {
+                if (capsHeader.Type == ovrControllerType_TrackedRemote) {
+                    HandController controller = {};
+                    controller.caps.Header = capsHeader;
+                    controller.state.Header.ControllerType = ovrControllerType_TrackedRemote;
+                    vrapi_GetInputDeviceCapabilities( session, &controller.caps.Header);
+                    devices.push_back(controller);
+                }
+                ++deviceIndex;
+            }
+        });
+    });
+
+    auto readResult = ovr::VrHandler::withOvrMobile([&](ovrMobile *session) {
+        for (auto &controller : devices) {
+            controller.update(session);
+        }
+    });
+
+    if (readResult) {
+        for (auto &controller : devices) {
+            const auto &caps = controller.caps;
+            if (controller.stateResult >= 0) {
+                const auto &remote = controller.state;
+                if (remote.Joystick.x != 0.0f || remote.Joystick.y != 0.0f) {
+                    glm::vec3 translation;
+                    float rotation = 0.0f;
+                    if (caps.ControllerCapabilities & ovrControllerCaps_LeftHand) {
+                        translation = glm::vec3{0.0f, -remote.Joystick.y, 0.0f};
+                    } else {
+                        translation = glm::vec3{remote.Joystick.x, 0.0f, -remote.Joystick.y};
+                    }
+                    float scale = 0.1f + (1.9f * remote.GripTrigger);
+                    _correction = glm::translate(glm::mat4(), translation * scale) * _correction;
+                }
+            }
+        }
+    }
+}
+
+void RenderThread::renderFrame() {
+    GLuint finalTexture = 0;
+    glm::uvec2 finalTextureSize;
+    const auto& tracking = beginFrame();
+    if (_activeFrame) {
+        const auto& frame = _activeFrame;
+        auto& eyeProjections = frame->stereoState._eyeProjections;
+        auto& eyeOffsets = frame->stereoState._eyeViews;
+        // Quest
+        auto frameCorrection = _correction * ovr::toGlm(tracking.HeadPose.Pose);
+        _backend->setCameraCorrection(glm::inverse(frameCorrection), frame->view);
+        ovr::for_each_eye([&](ovrEye eye){
+            const auto& eyeInfo = tracking.Eye[eye];
+            eyeProjections[eye] = ovr::toGlm(eyeInfo.ProjectionMatrix);
+            eyeOffsets[eye] = ovr::toGlm(eyeInfo.ViewMatrix);
+        });
+        _backend->recycle();
+        _backend->syncCache();
+        _gpuContext->enableStereo(true);
+        if (frame && !frame->batches.empty()) {
+            _gpuContext->executeFrame(frame);
+        }
+        auto& glbackend = (gpu::gl::GLBackend&)(*_backend);
+        finalTextureSize = { frame->framebuffer->getWidth(), frame->framebuffer->getHeight() };
+        finalTexture = glbackend.getTextureID(frame->framebuffer->getRenderBuffer(0));
+    }
+    presentFrame(finalTexture, finalTextureSize, tracking);
+}
+
+bool RenderThread::process() {
+    pollTask();
+
+    if (!vrActive()) {
+        QThread::msleep(1);
+        return true;
+    }
+
+    std::queue<gpu::FramePointer> pendingFrames;
+    {
+        std::unique_lock<std::mutex> lock(_frameLock);
+        pendingFrames.swap(_pendingFrames);
+    }
+
+    makeCurrent();
+    while (!pendingFrames.empty()) {
+        _activeFrame = pendingFrames.front();
+        pendingFrames.pop();
+        _gpuContext->consumeFrameUpdates(_activeFrame);
+        _activeFrame->stereoState._enable = true;
+    }
+
+    handleInput();
+    renderFrame();
+    return true;
+}
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.h b/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
new file mode 100644
index 0000000000..701cd25f5b
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
@@ -0,0 +1,44 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+
+#include <QtCore/QElapsedTimer>
+
+#include <GenericThread.h>
+#include <shared/RateCounter.h>
+#include <gl/Config.h>
+#include <gl/Context.h>
+#include <gpu/gl/GLBackend.h>
+#include <ovr/VrHandler.h>
+
+class RenderThread : public GenericThread, ovr::VrHandler {
+    using Parent = GenericThread;
+public:
+    QWindow* _window{ nullptr };
+    std::mutex _mutex;
+    gpu::ContextPointer _gpuContext;  // initialized during window creation
+    std::shared_ptr<gpu::Backend> _backend;
+    std::atomic<size_t> _presentCount{ 0 };
+    std::mutex _frameLock;
+    std::queue<gpu::FramePointer> _pendingFrames;
+    gpu::FramePointer _activeFrame;
+    uint32_t _externalTexture{ 0 };
+    glm::mat4 _correction;
+
+    void move(const glm::vec3& v);
+    void setup() override;
+    bool process() override;
+    void shutdown() override;
+
+    void handleInput();
+
+    void submitFrame(const gpu::FramePointer& frame);
+    void initialize(QWindow* window);
+    void renderFrame();
+};
diff --git a/android/apps/questFramePlayer/src/main/cpp/main.cpp b/android/apps/questFramePlayer/src/main/cpp/main.cpp
new file mode 100644
index 0000000000..4730d3fa15
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/main.cpp
@@ -0,0 +1,56 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/22
+//  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 <android/log.h>
+
+#include <QtGui/QGuiApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QFileInfo>
+
+#include <Trace.h>
+
+#include "PlayerWindow.h"
+
+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    if (!message.isEmpty()) {
+        const char * local=message.toStdString().c_str();
+        switch (type) {
+            case QtDebugMsg:
+                __android_log_write(ANDROID_LOG_DEBUG,"Interface",local);
+                break;
+            case QtInfoMsg:
+                __android_log_write(ANDROID_LOG_INFO,"Interface",local);
+                break;
+            case QtWarningMsg:
+                __android_log_write(ANDROID_LOG_WARN,"Interface",local);
+                break;
+            case QtCriticalMsg:
+                __android_log_write(ANDROID_LOG_ERROR,"Interface",local);
+                break;
+            case QtFatalMsg:
+            default:
+                __android_log_write(ANDROID_LOG_FATAL,"Interface",local);
+                abort();
+        }
+    }
+}
+
+int main(int argc, char** argv) {
+    setupHifiApplication("gpuFramePlayer");
+    QGuiApplication app(argc, argv);
+    auto oldMessageHandler = qInstallMessageHandler(messageHandler);
+    DependencyManager::set<tracing::Tracer>();
+    PlayerWindow window;
+    __android_log_write(ANDROID_LOG_FATAL,"QQQ","Exec");
+    app.exec();
+    __android_log_write(ANDROID_LOG_FATAL,"QQQ","Exec done");
+    qInstallMessageHandler(oldMessageHandler);
+    return 0;
+}
+
+
diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
new file mode 100644
index 0000000000..948243c048
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
@@ -0,0 +1,52 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+package io.highfidelity.frameplayer;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+
+import io.highfidelity.oculus.OculusMobileActivity;
+
+
+public class QuestQtActivity extends QtActivity {
+    private native void nativeOnCreate();
+    private boolean launchedQuestMode = false;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Log.w("QQQ_Qt", "QuestQtActivity::onCreate");
+        super.onCreate(savedInstanceState);
+        nativeOnCreate();
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.w("QQQ_Qt", "QuestQtActivity::onDestroy");
+        super.onDestroy();
+    }
+
+    public void launchOculusActivity() {
+        Log.w("QQQ_Qt", "QuestQtActivity::launchOculusActivity");
+        runOnUiThread(()->{
+            keepInterfaceRunning = true;
+            launchedQuestMode = true;
+            moveTaskToBack(true);
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (launchedQuestMode) {
+            moveTaskToBack(true);
+        }
+    }
+}
diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
new file mode 100644
index 0000000000..a395a32b68
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
@@ -0,0 +1,14 @@
+package io.highfidelity.frameplayer;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import io.highfidelity.oculus.OculusMobileActivity;
+
+public class QuestRenderActivity extends OculusMobileActivity {
+    @Override
+    public void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+        startActivity(new Intent(this, QuestQtActivity.class));
+    }
+}
diff --git a/android/apps/interface/src/main/res/drawable/ic_launcher.xml b/android/apps/questFramePlayer/src/main/res/drawable/ic_launcher.xml
similarity index 100%
rename from android/apps/interface/src/main/res/drawable/ic_launcher.xml
rename to android/apps/questFramePlayer/src/main/res/drawable/ic_launcher.xml
diff --git a/android/apps/questFramePlayer/src/main/res/values/strings.xml b/android/apps/questFramePlayer/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..8bf550f74e
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name" translatable="false">GPU Frame Player</string>
+</resources>
diff --git a/android/apps/questInterface/CMakeLists.txt b/android/apps/questInterface/CMakeLists.txt
new file mode 100644
index 0000000000..97ca46f6e5
--- /dev/null
+++ b/android/apps/questInterface/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(TARGET_NAME questInterface)
+setup_hifi_library()
+link_hifi_libraries(
+    shared task networking qml
+    image fbx hfm render-utils physics entities octree 
+    oculusMobile oculusMobilePlugin
+    gl gpu ${PLATFORM_GL_BACKEND}
+)
+target_opengl()
+target_bullet()
+target_oculus_mobile()
+
+add_subdirectory("${CMAKE_SOURCE_DIR}/interface" "libraries/interface")
+include_directories("${CMAKE_SOURCE_DIR}/interface/src")
+add_subdirectory("${CMAKE_SOURCE_DIR}/plugins/hifiCodec" "libraries/hifiCodecPlugin")
+target_link_libraries(questInterface android log m interface)
diff --git a/android/apps/questInterface/build.gradle b/android/apps/questInterface/build.gradle
new file mode 100644
index 0000000000..cbf575d7b0
--- /dev/null
+++ b/android/apps/questInterface/build.gradle
@@ -0,0 +1,149 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+apply plugin: 'com.android.application'
+
+task renameHifiACTaskDebug() {
+    doLast {
+        def sourceFile = new File("${appDir}/build/intermediates/cmake/debug/obj/arm64-v8a/","libhifiCodec.so")
+        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
+        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
+    }
+}
+task renameHifiACTaskRelease(type: Copy) {
+    doLast {
+        def sourceFile = new File("${appDir}/build/intermediates/cmake/release/obj/arm64-v8a/","libhifiCodec.so")
+        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
+        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
+    }
+}
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        applicationId "io.highfidelity.questInterface"
+        minSdkVersion 24
+        targetSdkVersion 28
+        versionCode 1
+        versionName appVersionName
+        ndk { abiFilters 'arm64-v8a' }
+        externalNativeBuild {
+            cmake {
+                arguments '-DHIFI_ANDROID=1',
+                    '-DHIFI_ANDROID_APP=questInterface',
+                    '-DANDROID_TOOLCHAIN=clang',
+                    '-DANDROID_STL=c++_shared',
+                    '-DCMAKE_VERBOSE_MAKEFILE=ON',
+                    '-DRELEASE_NUMBER=' + RELEASE_NUMBER,
+                    '-DRELEASE_TYPE=' + RELEASE_TYPE,
+                    '-DSTABLE_BUILD=' + STABLE_BUILD,
+                    '-DDISABLE_QML=OFF',
+                    '-DDISABLE_KTX_CACHE=OFF',
+                    '-DUSE_BREAKPAD=OFF'
+                targets = ['questInterface']
+            }
+        }
+        signingConfigs {
+            release {
+                storeFile file(HIFI_ANDROID_KEYSTORE)
+                storePassword HIFI_ANDROID_KEYSTORE_PASSWORD
+                keyAlias HIFI_ANDROID_KEY_ALIAS
+                keyPassword HIFI_ANDROID_KEY_PASSWORD
+                v2SigningEnabled false
+            }
+        }
+    }
+
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        debug {
+            buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
+            buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_ID", "\"" + (System.getenv("OAUTH_CLIENT_ID") ? System.getenv("OAUTH_CLIENT_ID") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"" + (System.getenv("OAUTH_CLIENT_SECRET") ? System.getenv("OAUTH_CLIENT_SECRET") : '') + "\""
+            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"" + (System.getenv("OAUTH_REDIRECT_URI") ? System.getenv("OAUTH_REDIRECT_URI") : '') + "\""
+        }
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+            buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
+            buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_ID", "\"" + (System.getenv("OAUTH_CLIENT_ID") ? System.getenv("OAUTH_CLIENT_ID") : '') + "\""
+            buildConfigField "String", "OAUTH_CLIENT_SECRET", "\"" + (System.getenv("OAUTH_CLIENT_SECRET") ? System.getenv("OAUTH_CLIENT_SECRET") : '') + "\""
+            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"" + (System.getenv("OAUTH_REDIRECT_URI") ? System.getenv("OAUTH_REDIRECT_URI") : '') + "\""
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path '../../../CMakeLists.txt'
+        }
+    }
+
+    applicationVariants.all { variant ->
+        // Our asset contents depend on items produced in the CMake build
+        // so our merge has to depend on the external native build
+        variant.externalNativeBuildTasks.each { task ->
+            variant.mergeResources.dependsOn(task)
+            if (Os.isFamily(Os.FAMILY_UNIX)) {
+                // FIXME
+                def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
+                def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first()
+                def renameHifiACTask = rootProject.getTasksByName("renameHifiACTask${variant.name.capitalize()}", false).first()
+                runDumpSymsTask.dependsOn(task)
+                variant.assemble.dependsOn(uploadDumpSymsTask)
+                variant.mergeResources.dependsOn(renameHifiACTask)
+            }
+        }
+
+        variant.mergeAssets.doLast {
+            def assetList = new LinkedList<String>()
+            def youngestLastModified = 0
+
+            // Copy the compiled resources generated by the external native build
+            copy {
+                from new File(projectDir, "../../../interface/compiledResources")
+                into outputDir
+                duplicatesStrategy DuplicatesStrategy.INCLUDE
+                eachFile { details ->
+                    youngestLastModified = Math.max(youngestLastModified, details.lastModified)
+                    assetList.add(details.path)
+                }
+            }
+
+            // Copy the scripts directory
+            copy {
+                from new File(projectDir, "../../../scripts")
+                into new File(outputDir, "scripts")
+                duplicatesStrategy DuplicatesStrategy.INCLUDE
+                eachFile { details->
+                    youngestLastModified = Math.max(youngestLastModified, details.lastModified)
+                    assetList.add("scripts/" + details.path)
+                }
+            }
+
+            // Write a list of files to be unpacked to the cache folder
+            new File(outputDir, 'cache_assets.txt').withWriter { out ->
+                out.println(Long.toString(youngestLastModified))
+                assetList.each { file -> out.println(file) }
+            }
+        }
+
+        variant.outputs.all {
+            if (RELEASE_NUMBER != '0') {
+                outputFileName = "app_" + RELEASE_NUMBER + "_" + RELEASE_TYPE + ".apk"
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
+    implementation project(':oculus')
+    implementation project(':qt')
+}
diff --git a/android/apps/questInterface/proguard-rules.pro b/android/apps/questInterface/proguard-rules.pro
new file mode 100644
index 0000000000..b3c0078513
--- /dev/null
+++ b/android/apps/questInterface/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/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..c23f14ee15
--- /dev/null
+++ b/android/apps/questInterface/src/main/AndroidManifest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.highfidelity.questInterface"
+    android:installLocation="auto">
+
+    <uses-feature android:glEsVersion="0x00030002" android:required="true" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <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="true"/>
+    <uses-feature android:name="android.hardware.vr.high_performance" android:required="true"/>
+
+    <application
+        android:name="org.qtproject.qt5.android.bindings.QtApplication"
+        android:label="@string/app_name"
+        android:allowBackup="true">
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+        <activity
+            android:name=".PermissionsChecker"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.INFO" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:name=".QuestActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"/>
+        <activity
+            android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTask">
+            <meta-data android:name="android.app.lib_name" android:value="questInterface"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+            <meta-data android:name="android.app.extract_android_style" android:value="full"/>
+        </activity>
+    </application>
+</manifest>
diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
new file mode 100644
index 0000000000..b7422b3b66
--- /dev/null
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -0,0 +1,86 @@
+#include <functional>
+
+#include <QtCore/QBuffer>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QThread>
+#include <QtCore/QStringList>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QTextStream>
+#include <QtCore/QObject>
+
+#include <QtAndroidExtras/QAndroidJniObject>
+#include <QtAndroidExtras/QtAndroid>
+#include <android/log.h>
+#include <android/asset_manager.h>
+#include <android/asset_manager_jni.h>
+
+#include <shared/Storage.h>
+
+#include <AddressManager.h>
+#include <AndroidHelper.h>
+#include <udt/PacketHeaders.h>
+
+#include <OVR_Platform.h>
+#include <OVR_Functions_Voip.h>
+
+void initOculusPlatform(JNIEnv* env, jobject obj) {
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        // static const char* appID = "2343652845669354";
+        // if (ovr_PlatformInitializeAndroid(appID, obj, env) != ovrPlatformInitialize_Success) {
+        //     __android_log_write(ANDROID_LOG_WARN, "QQQ", "Failed to init platform SDK");
+        //     return;
+        // }
+        // ovr_Voip_SetSystemVoipSuppressed(true);
+    });
+}
+
+extern "C" {
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_MainActivity_nativeInitOculusPlatform(JNIEnv* env, jobject obj) {
+    initOculusPlatform(env, obj);
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_MainActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
+    initOculusPlatform(env, obj);
+    qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject");
+    QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
+        qWarning() << "QQQ" << __FUNCTION__ << "scheduling onAppLoadedComplete";
+        AndroidHelper::instance().moveToThread(qApp->thread());
+        QtAndroid::androidActivity().callMethod<void>("onAppLoadedComplete", "()V");
+        QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, nullptr, nullptr);
+    });
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_MainActivity_nativeOnDestroy(JNIEnv* env, jobject obj) {
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_SplashActivity_registerLoadCompleteListener(JNIEnv *env,
+                                                                               jobject instance) {
+
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_MainActivity_nativeOnPause(JNIEnv *env, jobject obj) {
+    AndroidHelper::instance().notifyEnterBackground();
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_MainActivity_nativeOnResume(JNIEnv *env, jobject obj) {
+    AndroidHelper::instance().notifyEnterForeground();
+}
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_questInterface_receiver_HeadsetStateReceiver_notifyHeadsetOn(JNIEnv *env,
+                                                                                 jobject instance,
+                                                                                 jboolean pluggedIn) {
+    AndroidHelper::instance().notifyHeadsetOn(pluggedIn);
+}
+
+}
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
new file mode 100644
index 0000000000..ce75c54f12
--- /dev/null
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
@@ -0,0 +1,70 @@
+//
+//  MainActivity.java
+//  android/app/src/main/java
+//
+//  Created by Stephen Birarda on 1/26/15.
+//  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
+//
+
+package io.highfidelity.questInterface;
+
+import android.content.Intent;
+import  android.os.Bundle;
+import android.util.Log;
+import android.view.WindowManager;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import io.highfidelity.utils.HifiUtils;
+
+public class MainActivity extends QtActivity {
+    private native void nativeOnCreate();
+    private native void nativeOnDestroy();
+    private native void nativeOnPause();
+    private native void nativeOnResume();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.isLoading = true;
+        super.keepInterfaceRunning = true;
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
+        nativeOnCreate();
+    }
+
+
+    public void onAppLoadedComplete() {
+        Log.w("QQQ", "Returning to quest activity");
+        runOnUiThread(()->{
+            startActivity(new Intent(MainActivity.this, QuestActivity.class));
+            //moveTaskToBack(true);
+        });
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (!super.isLoading) {
+            nativeOnPause();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        nativeOnResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        nativeOnDestroy();
+    }
+}
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
new file mode 100644
index 0000000000..91b5bdcdae
--- /dev/null
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
@@ -0,0 +1,65 @@
+package io.highfidelity.questInterface;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+
+public class PermissionsChecker extends Activity {
+    private static final int REQUEST_PERMISSIONS = 20;
+    private static final String TAG = PermissionsChecker.class.getName();
+    private static final String[] REQUIRED_PERMISSIONS = new String[]{
+        Manifest.permission.READ_EXTERNAL_STORAGE,
+        Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        Manifest.permission.RECORD_AUDIO,
+        Manifest.permission.CAMERA
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestAppPermissions(REQUIRED_PERMISSIONS,REQUEST_PERMISSIONS);
+    }
+
+    public void requestAppPermissions(final String[] requestedPermissions,
+                                      final int requestCode) {
+        int permissionCheck = PackageManager.PERMISSION_GRANTED;
+        boolean shouldShowRequestPermissionRationale = false;
+        for (String permission : requestedPermissions) {
+            permissionCheck = permissionCheck + checkSelfPermission(permission);
+            shouldShowRequestPermissionRationale = shouldShowRequestPermissionRationale || shouldShowRequestPermissionRationale(permission);
+        }
+        if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
+            System.out.println("Permission was not granted. Ask for permissions");
+            if (shouldShowRequestPermissionRationale) {
+                requestPermissions(requestedPermissions, requestCode);
+            } else {
+                requestPermissions(requestedPermissions, requestCode);
+            }
+        } else {
+            System.out.println("Launching the other activity..");
+            launchActivityWithPermissions();
+        }
+    }
+
+    private void launchActivityWithPermissions() {
+        startActivity(new Intent(this, QuestActivity.class));
+        finish();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        int permissionCheck = PackageManager.PERMISSION_GRANTED;
+        for (int permission : grantResults) {
+            permissionCheck = permissionCheck + permission;
+        }
+        if ((grantResults.length > 0) && permissionCheck == PackageManager.PERMISSION_GRANTED) {
+            launchActivityWithPermissions();
+        } else if (grantResults.length > 0) {
+            System.out.println("User has deliberately denied Permissions. Launching anyways");
+            launchActivityWithPermissions();
+        }
+    }
+}
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
new file mode 100644
index 0000000000..6887140de5
--- /dev/null
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
@@ -0,0 +1,25 @@
+//
+//  MainActivity.java
+//  android/app/src/main/java
+//
+//  Created by Stephen Birarda on 1/26/15.
+//  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
+//
+
+package io.highfidelity.questInterface;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import io.highfidelity.oculus.OculusMobileActivity;
+
+public class QuestActivity extends OculusMobileActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        startActivity(new Intent(this, MainActivity.class));
+    }
+}
diff --git a/android/apps/questInterface/src/main/res/drawable/ic_launcher.xml b/android/apps/questInterface/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000000..03b1edc4e9
--- /dev/null
+++ b/android/apps/questInterface/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--suppress AndroidUnknownAttribute -->
+<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="192"
+    android:viewportHeight="192"
+    android:width="192dp"
+    android:height="192dp">
+    <path
+        android:pathData="M189.5 96.5A93.5 93.5 0 0 1 96 190 93.5 93.5 0 0 1 2.5 96.5 93.5 93.5 0 0 1 96 3 93.5 93.5 0 0 1 189.5 96.5Z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M96.2 173.1c-10.3 0 -20.4 -2.1 -29.8 -6 -9.2 -3.8 -17.3 -9.4 -24.3 -16.4 -7 -7 -12.6 -15.2 -16.4 -24.3 -4.1 -9.6 -6.2 -19.6 -6.2 -30 0 -10.3 2.1 -20.4 6 -29.8 3.8 -9.2 9.4 -17.3 16.4 -24.3 7 -7 15.2 -12.6 24.3 -16.4 9.5 -4 19.5 -6 29.8 -6 10.3 0 20.4 2.1 29.8 6 9.2 3.8 17.3 9.4 24.3 16.4 7 7 12.6 15.2 16.4 24.3 4 9.5 6 19.5 6 29.8 0 10.3 -2.1 20.4 -6 29.8 -3.8 9.2 -9.4 17.3 -16.4 24.3 -7 7 -15.2 12.6 -24.3 16.4 -9.2 4.1 -19.3 6.2 -29.6 6.2zm0 -145.3c-37.8 0 -68.6 30.8 -68.6 68.6 0 37.8 30.8 68.6 68.6 68.6 37.8 0 68.6 -30.8 68.6 -68.6 0 -37.8 -30.8 -68.6 -68.6 -68.6z"
+        android:fillColor="#00b4f0" />
+    <path
+        android:pathData="M119.6 129l0 -53.8c3.4 -1.1 5.8 -4.3 5.8 -8 0 -4.6 -3.8 -8.4 -8.4 -8.4 -4.6 0 -8.4 3.8 -8.4 8.4 0 3.6 2.2 6.6 5.4 7.9l0 25L79 83.8 79 64c3.4 -1.1 5.8 -4.3 5.8 -8 0 -4.6 -3.8 -8.4 -8.4 -8.4 -4.6 0 -8.4 3.8 -8.4 8.4 0 3.6 2.2 6.6 5.4 7.9l0 54.1c-3.1 1.2 -5.4 4.3 -5.4 7.9 0 4.6 3.8 8.4 8.4 8.4 4.6 0 8.4 -3.8 8.4 -8.4 0 -3.7 -2.4 -6.9 -5.8 -8l0 -27.3 35 16.3 0 22.2c-3.1 1.2 -5.4 4.3 -5.4 7.9 0 4.6 3.8 8.4 8.4 8.4 4.6 0 8.4 -3.8 8.4 -8.4 0 -3.8 -2.4 -6.9 -5.8 -8z"
+        android:fillColor="#00b4f0" />
+</vector>
\ No newline at end of file
diff --git a/android/apps/questInterface/src/main/res/values/strings.xml b/android/apps/questInterface/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..99e8d501ac
--- /dev/null
+++ b/android/apps/questInterface/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name" translatable="false">Interface</string>
+</resources>
diff --git a/android/apps/ui/CMakeLists.txt b/android/apps/ui/CMakeLists.txt
new file mode 100644
index 0000000000..f1f04eb829
--- /dev/null
+++ b/android/apps/ui/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(TARGET_NAME uiApp)
+setup_hifi_library(AndroidExtras)
+link_hifi_libraries(shared ktx shaders gl oculusMobile qml)
+target_link_libraries(${TARGET_NAME} android log m)
+target_opengl()
+target_oculus_mobile()
+
diff --git a/android/apps/ui/proguard-rules.pro b/android/apps/ui/proguard-rules.pro
new file mode 100644
index 0000000000..b3c0078513
--- /dev/null
+++ b/android/apps/ui/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/apps/ui/src/main/AndroidManifest.xml b/android/apps/ui/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..81be094a3c
--- /dev/null
+++ b/android/apps/ui/src/main/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.highfidelity.ui"
+    android:installLocation="auto">
+    <uses-feature android:glEsVersion="0x00030002" android:required="true" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <application android:label="UI Test" android:allowBackup="false" android:name="org.qtproject.qt5.android.bindings.QtApplication">
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+        <activity
+            android:name=".UiActivity"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape"
+            android:excludeFromRecents="false"
+            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode">
+            <meta-data android:name="android.app.lib_name" android:value="uiApp"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/webview/libqtwebview_android.so:plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/android/apps/ui/src/main/cpp/PlayerWindow.cpp b/android/apps/ui/src/main/cpp/PlayerWindow.cpp
new file mode 100644
index 0000000000..1030158daf
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/PlayerWindow.cpp
@@ -0,0 +1,22 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "PlayerWindow.h"
+
+#include <QtWidgets/QFileDialog>
+
+PlayerWindow::PlayerWindow() {
+    installEventFilter(this);
+    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
+    setSurfaceType(QSurface::OpenGLSurface);
+    create();
+    showFullScreen();
+    QCoreApplication::processEvents();
+    _renderThread.initialize(this);
+}
+
diff --git a/android/apps/ui/src/main/cpp/PlayerWindow.h b/android/apps/ui/src/main/cpp/PlayerWindow.h
new file mode 100644
index 0000000000..5aa207b132
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/PlayerWindow.h
@@ -0,0 +1,27 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+#include <QtGui/QWindow>
+#include <QtCore/QSettings>
+
+#include "RenderThread.h"
+
+// Create a simple OpenGL window that renders text in various ways
+class PlayerWindow : public QWindow {
+public:
+    PlayerWindow();
+    virtual ~PlayerWindow() = default;
+
+protected:
+    //bool eventFilter(QObject* obj, QEvent* event) override;
+    //void keyPressEvent(QKeyEvent* event) override;
+
+private:
+    RenderThread _renderThread;
+};
diff --git a/android/apps/ui/src/main/cpp/RenderThread.cpp b/android/apps/ui/src/main/cpp/RenderThread.cpp
new file mode 100644
index 0000000000..f309fb01a8
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/RenderThread.cpp
@@ -0,0 +1,98 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "RenderThread.h"
+
+#include <mutex>
+
+#include <jni.h>
+#include <android/log.h>
+
+#include <QtGui/QWindow>
+
+#include <gl/GLHelpers.h>
+#include <GLMHelpers.h>
+
+#define MARGIN 48
+
+void RenderThread::initialize(QWindow* window) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    setObjectName("RenderThread");
+    Parent::initialize();
+
+    _thread->setObjectName("RenderThread");
+    _size = window->size();
+
+    _glContext.setWindow(window);
+    _glContext.create();
+    _glContext.makeCurrent();
+
+    gl::setSwapInterval(0);
+    glGenFramebuffers(1, &_readFbo);
+    OffscreenSurface::setSharedContext(_glContext.qglContext());
+
+    // GPU library init
+    _glContext.doneCurrent();
+    _glContext.moveToThread(_thread);
+
+    _offscreen = std::make_shared<OffscreenSurface>();
+    _offscreen->resize({ _size.width() - (MARGIN * 2), _size.height() - (MARGIN * 2)});
+    _offscreen->load(QUrl("qrc://qml/main.qml"));
+}
+
+void RenderThread::releaseTexture() {
+    if (_uiTexture != 0) {
+        auto readFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+        glFlush();
+        CHECK_GL_ERROR();
+        _discardLambda(_uiTexture, readFence);
+        _uiTexture = 0;
+    }
+}
+
+void RenderThread::setup() {
+    // Wait until the context has been moved to this thread
+    { std::unique_lock<std::mutex> lock(_frameLock); }
+    _glContext.makeCurrent();
+}
+
+void RenderThread::shutdown() {
+    releaseTexture();
+    _glContext.doneCurrent();
+}
+
+bool RenderThread::process() {
+    float now = secTimestampNow();
+    float red = fabsf(sinf(now * PI));
+    _glContext.makeCurrent();
+    {
+        OffscreenSurface::TextureAndFence newTextureAndFence;
+        if (_offscreen->fetchTexture(newTextureAndFence)) {
+            releaseTexture();
+            const auto& newTexture = newTextureAndFence.first;
+            GLsync writeFence = static_cast<GLsync>(newTextureAndFence.second);
+            _uiTexture = newTexture;
+            glWaitSync(writeFence, 0, GL_TIMEOUT_IGNORED);
+            glDeleteSync(writeFence);
+        }
+    }
+
+    glClearColor(1, red, 1, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+    if (_uiTexture != 0) {
+        auto uiSize = _offscreen->size();
+        glBindFramebuffer(GL_READ_FRAMEBUFFER, _readFbo);
+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _uiTexture, 0);
+        glBlitFramebuffer(
+            0, 0, uiSize.width(), uiSize.height(),
+            MARGIN, MARGIN, uiSize.width()  + MARGIN, uiSize.height() + MARGIN,
+            GL_COLOR_BUFFER_BIT, GL_NEAREST);
+    }
+    _glContext.swapBuffers();
+    return true;
+}
diff --git a/android/apps/ui/src/main/cpp/RenderThread.h b/android/apps/ui/src/main/cpp/RenderThread.h
new file mode 100644
index 0000000000..e04715f7ca
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/RenderThread.h
@@ -0,0 +1,42 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+
+#include <QtCore/QElapsedTimer>
+
+#include <GenericThread.h>
+#include <shared/RateCounter.h>
+#include <gl/Config.h>
+#include <gl/Context.h>
+#include <qml/OffscreenSurface.h>
+
+class RenderThread : public GenericThread {
+    using Parent = GenericThread;
+    using OffscreenSurface = hifi::qml::OffscreenSurface;
+    using OffscreenPtr = std::shared_ptr<OffscreenSurface>;
+    using DiscardLambda = std::function<void(uint32_t, void*)>;
+public:
+    gl::Context _glContext;
+    std::mutex _mutex;
+    std::atomic<size_t> _presentCount{ 0 };
+    std::mutex _frameLock;
+    OffscreenPtr _offscreen;
+    QSize _size;
+    DiscardLambda _discardLambda { OffscreenSurface::getDiscardLambda() };
+    GLuint _readFbo { 0 };
+    GLuint _uiTexture { 0 };
+
+    void setup() override;
+    bool process() override;
+    void shutdown() override;
+    void initialize(QWindow* window);
+
+private:
+    void releaseTexture();
+};
diff --git a/android/apps/ui/src/main/cpp/main.cpp b/android/apps/ui/src/main/cpp/main.cpp
new file mode 100644
index 0000000000..611f652fad
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/main.cpp
@@ -0,0 +1,58 @@
+
+//
+//  Created by Bradley Austin Davis on 2018/11/22
+//  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 <android/log.h>
+
+#include <QtGui/QGuiApplication>
+
+#include <Trace.h>
+
+#include "PlayerWindow.h"
+
+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    if (!message.isEmpty()) {
+        const char * local=message.toStdString().c_str();
+        switch (type) {
+            case QtDebugMsg:
+                __android_log_write(ANDROID_LOG_DEBUG,"QQ",local);
+                break;
+            case QtInfoMsg:
+                __android_log_write(ANDROID_LOG_INFO,"QQ",local);
+                break;
+            case QtWarningMsg:
+                __android_log_write(ANDROID_LOG_WARN,"QQ",local);
+                break;
+            case QtCriticalMsg:
+                __android_log_write(ANDROID_LOG_ERROR,"QQ",local);
+                break;
+            case QtFatalMsg:
+            default:
+                __android_log_write(ANDROID_LOG_FATAL,"QQ",local);
+                abort();
+        }
+    }
+}
+
+void initWebView();
+
+int main(int argc, char** argv) {
+    setupHifiApplication("uiApp");
+    QGuiApplication app(argc, argv);
+    initWebView();
+    auto oldMessageHandler = qInstallMessageHandler(messageHandler);
+    {
+        DependencyManager::set<tracing::Tracer>();
+        PlayerWindow window;
+        app.exec();
+    }
+    qInstallMessageHandler(oldMessageHandler);
+    return 0;
+}
+
+
diff --git a/android/apps/ui/src/main/cpp/main.qml b/android/apps/ui/src/main/cpp/main.qml
new file mode 100644
index 0000000000..8a99918152
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/main.qml
@@ -0,0 +1,21 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtWebView 1.1
+
+WebView {
+    url: "https://old.reddit.com"
+    width: 640; height: 480
+
+    Rectangle {
+        id: blue
+        color: "blue"
+        anchors { margins: 48; top: parent.top; bottom: parent.bottom; left: parent.left;  }
+        width: parent.width / 3
+        ColorAnimation on color {
+            from: "yellow";
+            to: "red";
+            loops:  Animation.Infinite;
+            duration: 1000;
+        }
+    }
+}
diff --git a/android/apps/ui/src/main/cpp/mainqt.cpp b/android/apps/ui/src/main/cpp/mainqt.cpp
new file mode 100644
index 0000000000..c4c05569c0
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/mainqt.cpp
@@ -0,0 +1,5 @@
+#include <QtWebView/QtWebView>
+
+void initWebView() {
+    QtWebView::initialize();
+}
\ No newline at end of file
diff --git a/android/apps/ui/src/main/cpp/resources.qrc b/android/apps/ui/src/main/cpp/resources.qrc
new file mode 100644
index 0000000000..f06d416800
--- /dev/null
+++ b/android/apps/ui/src/main/cpp/resources.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource prefix="/">
+    <file>main.qml</file>
+  </qresource>
+</RCC>
diff --git a/android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java b/android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java
new file mode 100644
index 0000000000..bc6dcb3cd3
--- /dev/null
+++ b/android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java
@@ -0,0 +1,21 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+package io.highfidelity.ui;
+
+import android.os.Bundle;
+import org.qtproject.qt5.android.bindings.QtActivity;
+
+
+
+public class UiActivity extends QtActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        //System.loadLibrary("uiApp");
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/android/apps/ui/src/main/res/drawable/ic_launcher.xml b/android/apps/ui/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000000..03b1edc4e9
--- /dev/null
+++ b/android/apps/ui/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--suppress AndroidUnknownAttribute -->
+<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="192"
+    android:viewportHeight="192"
+    android:width="192dp"
+    android:height="192dp">
+    <path
+        android:pathData="M189.5 96.5A93.5 93.5 0 0 1 96 190 93.5 93.5 0 0 1 2.5 96.5 93.5 93.5 0 0 1 96 3 93.5 93.5 0 0 1 189.5 96.5Z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M96.2 173.1c-10.3 0 -20.4 -2.1 -29.8 -6 -9.2 -3.8 -17.3 -9.4 -24.3 -16.4 -7 -7 -12.6 -15.2 -16.4 -24.3 -4.1 -9.6 -6.2 -19.6 -6.2 -30 0 -10.3 2.1 -20.4 6 -29.8 3.8 -9.2 9.4 -17.3 16.4 -24.3 7 -7 15.2 -12.6 24.3 -16.4 9.5 -4 19.5 -6 29.8 -6 10.3 0 20.4 2.1 29.8 6 9.2 3.8 17.3 9.4 24.3 16.4 7 7 12.6 15.2 16.4 24.3 4 9.5 6 19.5 6 29.8 0 10.3 -2.1 20.4 -6 29.8 -3.8 9.2 -9.4 17.3 -16.4 24.3 -7 7 -15.2 12.6 -24.3 16.4 -9.2 4.1 -19.3 6.2 -29.6 6.2zm0 -145.3c-37.8 0 -68.6 30.8 -68.6 68.6 0 37.8 30.8 68.6 68.6 68.6 37.8 0 68.6 -30.8 68.6 -68.6 0 -37.8 -30.8 -68.6 -68.6 -68.6z"
+        android:fillColor="#00b4f0" />
+    <path
+        android:pathData="M119.6 129l0 -53.8c3.4 -1.1 5.8 -4.3 5.8 -8 0 -4.6 -3.8 -8.4 -8.4 -8.4 -4.6 0 -8.4 3.8 -8.4 8.4 0 3.6 2.2 6.6 5.4 7.9l0 25L79 83.8 79 64c3.4 -1.1 5.8 -4.3 5.8 -8 0 -4.6 -3.8 -8.4 -8.4 -8.4 -4.6 0 -8.4 3.8 -8.4 8.4 0 3.6 2.2 6.6 5.4 7.9l0 54.1c-3.1 1.2 -5.4 4.3 -5.4 7.9 0 4.6 3.8 8.4 8.4 8.4 4.6 0 8.4 -3.8 8.4 -8.4 0 -3.7 -2.4 -6.9 -5.8 -8l0 -27.3 35 16.3 0 22.2c-3.1 1.2 -5.4 4.3 -5.4 7.9 0 4.6 3.8 8.4 8.4 8.4 4.6 0 8.4 -3.8 8.4 -8.4 0 -3.8 -2.4 -6.9 -5.8 -8z"
+        android:fillColor="#00b4f0" />
+</vector>
\ No newline at end of file
diff --git a/android/apps/ui/src/main/res/values/strings.xml b/android/apps/ui/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..8bf550f74e
--- /dev/null
+++ b/android/apps/ui/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name" translatable="false">GPU Frame Player</string>
+</resources>
diff --git a/android/apps/ui/src/main/uiApp.pro b/android/apps/ui/src/main/uiApp.pro
new file mode 100644
index 0000000000..812ea8e1b8
--- /dev/null
+++ b/android/apps/ui/src/main/uiApp.pro
@@ -0,0 +1,22 @@
+TEMPLATE = app
+
+QT += gui qml quick xml webview widgets
+
+CONFIG += c++11
+
+SOURCES += \
+    cpp/main.cpp \
+    cpp/PlayerWindow.cpp \
+    cpp/RenderThread.cpp \
+    cpp/resources.qrc
+
+HEADERS += \
+    cpp/PlayerWindow.h \
+    cpp/RenderThread.h
+
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH = cpp
+
+#DISTFILES += \
+#    cpp/*.qml
diff --git a/android/build.gradle b/android/build.gradle
index ed2ca1c47e..4affdf65cd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,13 +1,5 @@
-import de.undercouch.gradle.tasks.download.Download
-import de.undercouch.gradle.tasks.download.Verify
-import groovy.io.FileType
-import groovy.json.JsonSlurper
-import groovy.xml.XmlUtil
 import org.apache.tools.ant.taskdefs.condition.Os
 
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
 buildscript {
     repositories {
         google()
@@ -18,12 +10,6 @@ buildscript {
     }
 }
 
-plugins {
-    id 'de.undercouch.download' version '3.3.0'
-    id "cz.malohlava" version "1.0.3"
-    id "io.github.http-builder-ng.http-plugin" version "0.1.1"
-}
-
 allprojects {
     repositories {
         google()
@@ -32,16 +18,14 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
 ext {
     RELEASE_NUMBER = project.hasProperty('RELEASE_NUMBER') ? project.getProperty('RELEASE_NUMBER') : '0'
     VERSION_CODE = project.hasProperty('VERSION_CODE') ? project.getProperty('VERSION_CODE') : '0'
     RELEASE_TYPE = project.hasProperty('RELEASE_TYPE') ? project.getProperty('RELEASE_TYPE') : 'DEV'
     STABLE_BUILD = project.hasProperty('STABLE_BUILD') ? project.getProperty('STABLE_BUILD') : '0'
     EXEC_SUFFIX = Os.isFamily(Os.FAMILY_WINDOWS) ? '.exe' : ''
+    appVersionCode = Integer.valueOf(VERSION_CODE ?: 1)
+    appVersionName = RELEASE_NUMBER ?: "1.0"
 }
 
 def appDir = new File(projectDir, 'apps/interface')
@@ -142,108 +126,6 @@ task setupDependencies() {
 task cleanDependencies(type: Delete) {
 }
 
-def runBreakpadDumpSyms = { buildType ->
-    gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS
-
-    def objDir = new File("${appDir}/build/intermediates/cmake/${buildType}/obj/arm64-v8a")
-    def stripDebugSymbol = "${appDir}/build/intermediates/transforms/stripDebugSymbol/${buildType}/0/lib/arm64-v8a/"
-    def outputDir = new File(breakpadDumpSymsDir, buildType)
-    if (!outputDir.exists()) {
-        outputDir.mkdirs()
-    }
-
-    objDir.eachFileRecurse (FileType.FILES) { file ->
-        if (file.name.endsWith('.so')) {
-            def output = file.name + ".sym"
-            def cmdArgs = [
-                    file.toString(),
-                    stripDebugSymbol
-            ]
-            def result = exec {
-                workingDir HIFI_ANDROID_PRECOMPILED + '/breakpad/bin'
-                commandLine './dump_syms'
-                args cmdArgs
-                ignoreExitValue true
-                standardOutput = new BufferedOutputStream(new FileOutputStream(new File(outputDir, output)))
-            }
-        }
-    }
-}
-
-task runBreakpadDumpSymsDebug() {
-    doLast {
-        runBreakpadDumpSyms("debug");
-    }
-}
-
-task runBreakpadDumpSymsRelease() {
-    doLast {
-        runBreakpadDumpSyms("release");
-    }
-}
-
-task zipDumpSymsDebug(type: Zip, dependsOn: runBreakpadDumpSymsDebug) {
-    from (new File(breakpadDumpSymsDir, "debug").absolutePath)
-    archiveName "symbols-${RELEASE_NUMBER}-debug.zip"
-    destinationDir(new File("${appDir}/build/tmp/"))
-}
-
-task zipDumpSymsRelease(type: Zip, dependsOn: runBreakpadDumpSymsRelease) {
-    from (new File(breakpadDumpSymsDir, "release").absolutePath)
-    archiveName "symbols-${RELEASE_NUMBER}-release.zip"
-    destinationDir(new File("${appDir}/build/tmp/"))
-}
-
-task uploadBreakpadDumpSymsDebug(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsDebug) {
-    onlyIf {
-        System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
-    }
-    config {
-        request.uri = System.getenv("CMAKE_BACKTRACE_URL")
-    }
-    post {
-        request.uri.path = '/post'
-        request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
-        request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-debug.zip").bytes
-        request.contentType = 'application/octet-stream'
-        response.success {
-            println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-debug.zip uploaded")
-        }
-    }
-}
-
-task uploadBreakpadDumpSymsRelease(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsRelease) {
-    onlyIf {
-        System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
-    }
-    config {
-        request.uri = System.getenv("CMAKE_BACKTRACE_URL")
-    }
-    post {
-        request.uri.path = '/post'
-        request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
-        request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-release.zip").bytes
-        request.contentType = 'application/octet-stream'
-        response.success {
-            println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-release.zip uploaded")
-        }
-    }
-}
-
-task renameHifiACTaskDebug() {
-    doLast {
-        def sourceFile = new File("${appDir}/build/intermediates/cmake/debug/obj/arm64-v8a/","libhifiCodec.so")
-        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
-        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
-    }
-}
-task renameHifiACTaskRelease(type: Copy) {
-    doLast {
-        def sourceFile = new File("${appDir}/build/intermediates/cmake/release/obj/arm64-v8a/","libhifiCodec.so")
-        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
-        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
-    }
-}
 
 // FIXME this code is prototyping the desired functionality for doing build time binary dependency resolution.
 // See the comment on the qtBundle task above
diff --git a/android/gradle.properties b/android/gradle.properties
index ac639c5ae7..4236282c8b 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xms2g -Xmx4g
+android.debug.obsoleteApi=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 36dba9b2f5..4c0f3c1035 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 01 08:32:47 PST 2018
+#Wed Dec 19 13:46:46 PST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle
new file mode 100644
index 0000000000..b072f99eb7
--- /dev/null
+++ b/android/libraries/oculus/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
diff --git a/android/libraries/oculus/src/main/AndroidManifest.xml b/android/libraries/oculus/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..57df1a4226
--- /dev/null
+++ b/android/libraries/oculus/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.highfidelity.shared.oculus"/>
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
new file mode 100644
index 0000000000..01d74ea94d
--- /dev/null
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -0,0 +1,103 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+package io.highfidelity.oculus;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.WindowManager;
+
+/**
+ * Contains a native surface and forwards the activity lifecycle and surface lifecycle
+ * events to the OculusMobileDisplayPlugin
+ */
+public class OculusMobileActivity extends Activity implements SurfaceHolder.Callback {
+    private static final String TAG = OculusMobileActivity.class.getSimpleName();
+    static { System.loadLibrary("oculusMobile"); }
+    private native void nativeOnCreate();
+    private native static void nativeOnResume();
+    private native static void nativeOnPause();
+    private native static void nativeOnDestroy();
+    private native static void nativeOnSurfaceChanged(Surface s);
+
+    private SurfaceView mView;
+    private SurfaceHolder mSurfaceHolder;
+
+
+    public static void launch(Activity activity) {
+        if (activity != null) {
+            activity.runOnUiThread(()->{
+                activity.startActivity(new Intent(activity, OculusMobileActivity.class));
+            });
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Log.w(TAG, "QQQ onCreate");
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        // Create a native surface for VR rendering (Qt GL surfaces are not suitable
+        // because of the lack of fine control over the surface callbacks)
+        mView = new SurfaceView(this);
+        setContentView(mView);
+        mView.getHolder().addCallback(this);
+
+        // Forward the create message to the JNI code
+        nativeOnCreate();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.w(TAG, "QQQ onDestroy");
+        if (mSurfaceHolder != null) {
+            nativeOnSurfaceChanged(null);
+        }
+        nativeOnDestroy();
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.w(TAG, "QQQ onResume");
+        super.onResume();
+        nativeOnResume();
+    }
+
+    @Override
+    protected void onPause() {
+        Log.w(TAG, "QQQ onPause");
+        nativeOnPause();
+        super.onPause();
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.w(TAG, "QQQ surfaceCreated");
+        nativeOnSurfaceChanged(holder.getSurface());
+        mSurfaceHolder = holder;
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+        Log.w(TAG, "QQQ surfaceChanged");
+        nativeOnSurfaceChanged(holder.getSurface());
+        mSurfaceHolder = holder;
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.w(TAG, "QQQ surfaceDestroyed");
+        nativeOnSurfaceChanged(null);
+        mSurfaceHolder = null;
+    }
+}
\ No newline at end of file
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 93ae2bc227..40e1863d69 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -364,25 +364,7 @@ public class QtActivity extends Activity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        /*
-        cduarte https://highfidelity.manuscript.com/f/cases/16712/App-freezes-on-opening-randomly
-        After Qt upgrade to 5.11 we had a black screen crash after closing the application with
-        the hardware button "Back" and trying to start the app again. It could only be fixed after
-        totally closing the app swiping it in the list of running apps.
-        This problem did not happen with the previous Qt version.
-        After analysing changes we came up with this case and change:
-            https://codereview.qt-project.org/#/c/218882/
-        In summary they've moved libs loading to the same thread as main() and as a matter of correctness
-        in the onDestroy method in QtActivityDelegate, they exit that thread with `QtNative.m_qtThread.exit();`
-        That exit call is the main reason of this problem.
-
-        In this fix we just replace the `QtApplication.invokeDelegate();` call that may end using the
-        entire onDestroy method including that thread exit line for other three lines that purposely
-        terminate qt (borrowed from QtActivityDelegate::onDestroy as well).
-         */
-        QtNative.terminateQt();
-        QtNative.setActivity(null, null);
-        System.exit(0);
+        QtApplication.invokeDelegate();
     }
     //---------------------------------------------------------------------------
 
diff --git a/android/settings.gradle b/android/settings.gradle
index 1e7b3c768a..ffa2c93d6d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,8 +1,29 @@
+//
+// Libraries
+//
+
+include ':oculus'
+project(':oculus').projectDir = new File(settingsDir, 'libraries/oculus')
+
 include ':qt'
 project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
 
-include ':interface'
-project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+//
+// Applications
+//
+
+//include ':interface'
+//project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+
+include ':questInterface'
+project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
+
+//
+// Test projects
+//
 
 //include ':framePlayer'
 //project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+
+//include ':ui'
+//project(':ui').projectDir = new File(settingsDir, 'apps/ui')
diff --git a/cmake/macros/IncludeHifiLibraryHeaders.cmake b/cmake/macros/IncludeHifiLibraryHeaders.cmake
index 913d1e1181..008d76a8dc 100644
--- a/cmake/macros/IncludeHifiLibraryHeaders.cmake
+++ b/cmake/macros/IncludeHifiLibraryHeaders.cmake
@@ -10,5 +10,5 @@
 # 
 
 macro(include_hifi_library_headers LIBRARY)
-  include_directories("${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
+  target_include_directories(${TARGET_NAME} PRIVATE "${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
 endmacro(include_hifi_library_headers _library _root_dir)
\ No newline at end of file
diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake
index 7a6a136799..6a430f5b13 100644
--- a/cmake/macros/LinkHifiLibraries.cmake
+++ b/cmake/macros/LinkHifiLibraries.cmake
@@ -19,8 +19,8 @@ function(LINK_HIFI_LIBRARIES)
   endforeach()
 
   foreach(HIFI_LIBRARY ${LIBRARIES_TO_LINK})
-    include_directories("${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
-    include_directories("${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}")
+    target_include_directories(${TARGET_NAME} PRIVATE "${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
+    target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}")
     # link the actual library - it is static so don't bubble it up
     target_link_libraries(${TARGET_NAME} ${HIFI_LIBRARY})
   endforeach()
diff --git a/cmake/macros/TargetEGL.cmake b/cmake/macros/TargetEGL.cmake
new file mode 100644
index 0000000000..1d8ce26d83
--- /dev/null
+++ b/cmake/macros/TargetEGL.cmake
@@ -0,0 +1,4 @@
+macro(target_egl)
+    find_library(EGL EGL)
+    target_link_libraries(${TARGET_NAME} ${EGL})
+endmacro()
diff --git a/cmake/macros/TargetOculusMobile.cmake b/cmake/macros/TargetOculusMobile.cmake
new file mode 100644
index 0000000000..3eaa008b14
--- /dev/null
+++ b/cmake/macros/TargetOculusMobile.cmake
@@ -0,0 +1,20 @@
+
+macro(target_oculus_mobile)
+    set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculus/VrApi)
+
+    # Mobile SDK
+    set(OVR_MOBILE_INCLUDE_DIRS ${INSTALL_DIR}/Include)
+    target_include_directories(${TARGET_NAME} PRIVATE ${OVR_MOBILE_INCLUDE_DIRS})
+    set(OVR_MOBILE_LIBRARY_DIR  ${INSTALL_DIR}/Libs/Android/arm64-v8a)
+    set(OVR_MOBILE_LIBRARY_RELEASE ${OVR_MOBILE_LIBRARY_DIR}/Release/libvrapi.so)
+    set(OVR_MOBILE_LIBRARY_DEBUG ${OVR_MOBILE_LIBRARY_DIR}/Debug/libvrapi.so)
+    select_library_configurations(OVR_MOBILE)
+    target_link_libraries(${TARGET_NAME} ${OVR_MOBILE_LIBRARIES})
+
+    # Platform SDK
+    set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculusPlatform)
+    set(OVR_PLATFORM_INCLUDE_DIRS ${INSTALL_DIR}/Include)
+    target_include_directories(${TARGET_NAME} PRIVATE ${OVR_PLATFORM_INCLUDE_DIRS})
+    set(OVR_PLATFORM_LIBRARIES ${INSTALL_DIR}/Android/libs/arm64-v8a/libovrplatformloader.so)
+    target_link_libraries(${TARGET_NAME} ${OVR_PLATFORM_LIBRARIES})
+endmacro()
diff --git a/cmake/ports/hifi-client-deps/CONTROL b/cmake/ports/hifi-client-deps/CONTROL
index 7d4727b364..7887930b6b 100644
--- a/cmake/ports/hifi-client-deps/CONTROL
+++ b/cmake/ports/hifi-client-deps/CONTROL
@@ -1,4 +1,4 @@
 Source: hifi-client-deps
 Version: 0
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), vulkanmemoryallocator
+Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2, shaderc, spirv-cross, spirv-tools, vulkanmemoryallocator
diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
deleted file mode 100644
index 72f1096881..0000000000
--- a/gvr-interface/CMakeLists.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-set(TARGET_NAME gvr-interface)
-
-if (ANDROID)
-  set(ANDROID_APK_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk-build")
-  set(ANDROID_APK_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk")
-
-  set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME})
-  set(ANDROID_APP_DISPLAY_NAME Interface)
-  set(ANDROID_API_LEVEL 19)
-  set(ANDROID_APK_PACKAGE io.highfidelity.gvrinterface)
-  set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceActivity)
-  set(ANDROID_APK_VERSION_NAME "0.1")
-  set(ANDROID_APK_VERSION_CODE 1)
-  set(ANDROID_APK_FULLSCREEN TRUE)
-  set(ANDROID_DEPLOY_QT_INSTALL "--install")
-
-  set(BUILD_SHARED_LIBS ON)
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}")
-
-  setup_hifi_library(Gui AndroidExtras)
-else ()
-  setup_hifi_project(Gui)
-endif ()
-
-include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
-
-link_hifi_libraries(shared networking audio-client avatars)
-
-if (ANDROID)
-  find_package(LibOVR)
-
-  if (LIBOVR_FOUND)
-    add_definitions(-DHAVE_LIBOVR)
-    target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES} ${TURBOJPEG_LIBRARY})
-    include_directories(SYSTEM ${LIBOVR_INCLUDE_DIRS})
-
-    # we need VRLib, so add a project.properties to our apk build folder that says that
-    file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${LIBOVR_VRLIB_DIR}")
-    file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
-
-    list(APPEND IGNORE_COPY_LIBS ${LIBOVR_ANDROID_LIBRARIES})
-  endif ()
-
-endif ()
-
-# the presence of a HOCKEY_APP_ID means we are making a beta build
-if (ANDROID AND HOCKEY_APP_ID)
-  set(HOCKEY_APP_ENABLED true)
-  set(HOCKEY_APP_ACTIVITY "<activity android:name='net.hockeyapp.android.UpdateActivity' />\n")
-  set(ANDROID_ACTIVITY_NAME io.highfidelity.gvrinterface.InterfaceBetaActivity)
-  set(ANDROID_DEPLOY_QT_INSTALL "")
-  set(ANDROID_APK_CUSTOM_NAME "Interface-beta.apk")
-
-  # set the ANDROID_APK_VERSION_CODE to the number of git commits
-  execute_process(
-    COMMAND  git rev-list --first-parent --count HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_COUNT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  set(ANDROID_APK_VERSION_CODE ${GIT_COMMIT_COUNT})
-
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/InterfaceBetaActivity.java.in" "${ANDROID_APK_BUILD_DIR}/src/io/highfidelity/gvrinterface/InterfaceBetaActivity.java")
-elseif (ANDROID)
-  set(HOCKEY_APP_ENABLED false)
-endif ()
-
-if (ANDROID)
-
-  set(HIFI_URL_INTENT "<intent-filter>\
-    \n        <action android:name='android.intent.action.VIEW' />\
-    \n        <category android:name='android.intent.category.DEFAULT' />\
-    \n        <category android:name='android.intent.category.BROWSABLE' />\
-    \n        <data android:scheme='hifi' />\
-    \n      </intent-filter>"
-  )
-
-  set(ANDROID_EXTRA_APPLICATION_XML "${HOCKEY_APP_ACTIVITY}")
-  set(ANDROID_EXTRA_ACTIVITY_XML "${HIFI_URL_INTENT}")
-
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/hockeyapp.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/hockeyapp.xml")
-  qt_create_apk()
-
-endif (ANDROID)
diff --git a/gvr-interface/res/drawable/icon.png b/gvr-interface/res/drawable/icon.png
deleted file mode 100644
index 70aaf9b4ed60a80081821907d53086beb249eb3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9914
zcmbWddpuO%7eBnt%rFyT3Q=grM<Nx<HPVbOROC{M2ooitP>P5-NQz2*x*%jKL~?6f
ziexC%M<TgP;}Vhk{Wde_dFlH+zu*7QALs0~FKg}hey_Fm+57c6H?1s8SBk6?0f3bU
z_U}CmfP>|SBn$x40ga0Qu-0#%o!=2}H$VTA7fyrmDQ}n4)C1>Eo;iK^^vP3Kd_SMw
z39#|RfxX5y0qw(`mbXqcC25Qg-H9CM(6v;<NGVd1WkTM2*lSZxb-y<6%G#L5zN+Lt
zwAIA;po`~&z0Y^v9(hq6wsxQFKlkDvcDTF6SDhl3KPzRVe5tB+do3H2zMmB;qpZy!
z9Z3Au={%ER+BTi+aJ1;<XmZ^d8#S%L^F@|N=f;9Ue*d^Qcbc9$b4Pwyod5f<z|Nfc
zek*@2*CNoo&*4DKNx6mI(&^u|(_9Dcr-+&%C!_T2;Oo$TtW_pbWRZ23^4M50d4YCG
zRsV#%h&Z2fml$zqOqdL;v-?7<J`p1X^_PT_J@Mt0Pc3$9NDz(o;BnCSwBCQJTIRao
z%dh4m#O~kWG*MwHaCS!V4?iyFCO?U6>5IQ@97|oFbH>4Jh1_)^0;pbeqX-GC0(CQU
zLW-zioJuJXKM^{h73`%^tMW0~hk<1&dqNqGu|NP>^?B1sk@v?!*yqHB!lrNt4)QNv
z=N=sw3iI-8qelV)>yC}f9C?a)1dhr|Uk<8Cp^v+W5WcF?0bM7}SDiGCjM{a}lPvtT
z!|Db=)0V|=?aZChA?&MZO$z$Sw6Dk2=zuP);g|Ot?MuEA5gL6(R^MBn3=CZ@zIW;~
zZ#?B_ZhQqt%K%RTtB`LkKVMiRAvFXNXu5qHO9`VyaBp8s_mmCT$POhVAR;Yz=;b*l
zuzqeFzSp*^awqB4IuQcAxm-vYTD0b64SheA=S<zr(JID~AV0W}vQ?1%jTO<%&ML(%
zH^q&FX9EeeGspeemg-!5q28NBpH3?(Sj|;XwD|YqYvvd!lq8;S`y}At(&oi)?X)Lu
zymp@Ed%N{F%vRLB*|rJ?N7Z>r+8xf@)>#FT^^=QnMjt`}t&kXDtC6UnIaa|v6jA1>
z&FJ@%-3#>Y$Tbd@3WzZv5J4dzWQcn=?mzj0EkbMDNRnrp0)ie8EvpT-vdoOH4I{xV
zyZPRB{tM|4cXP6Sw>(0CSv8*ccxb;bi;M%qHCWt;;cJ<7g6B_mxX2=?&3sAQu@dHI
zce<z7DTf-|(DmKG3XUkdFH%-AWgL`bY0NsKN`Q82p5^K0h0v{hK5~Vme_E9Qj~(Vq
z+L~v03eS-f*yeva3}}o_D-vkG7&k3%86`&LZmC}_dYv^<NmCyxNtwqBRgOiO4f+!e
zpfPv6I$PjA*U>3)YjgIR8>d58?ok9Qeg#ec%kPwLaPWe`#T$2lo*K>6V}F*2YsiWF
zve6hp4}M*=OpB*+w39v;T1YmoB!lJ<(GUNBinxOlMIR{XBDNxp4=%zVTb|`<hnAVm
z0=o3av1ew3{*ne@{&d{G;Z>QZHX3Db*@-@RN(R*z^OQrC+}a@YWrw+9*Sn`=kS!bU
z7$7!2Tp5M~*ELKzK3dE+&aLpmy>gpy{+#S|lo$FqntL)QjeB+ga!n^<j+ar^u+APc
zlu@T>iQynwotMNL6k><4%3U^fS=+84!PUdOl8pI|J_+qkHxXp$y36}vB#t>jdw4Eu
zZnJ<c_i?P)RzW@mU*BIrp%E<4G%tnD+SgK4PN=Cue#X52_8~r$zXyb+Q(4A5Zl2aB
zp-EOiKYSI9+ZqIJ4m{h}S#k@i0!Y5Wy&0P*Lj~=E`RYLIxDt~4oIU8Tti@QtSd8Gh
z(a>+N+;oW|uu@fUXIe<sahRyTg<u||j1Ed;s*ABwOf+wr8JWgS9e~D{^Bsc{nmcSs
z1JIZ@pQ9>()U}E7Z(LOU;H499WSSUv$2Cbb)^=sMIK3$f^R1*XUVcsE77Tz*+PrDE
z^S0HXmDm2(XCdw+8Kjt?2nc<GNXGqt71p&1N^Hu<tg9s^c-HD>c9w&Pp^g>Ac})1{
zYtU!(4eY>*hg<^!R8r_9`u{441iO!-Q8aqimQ-#h30&(0y@$)P??HOf`9+1V;#-hm
zC!Xys0zGSo%KxkJKXvzQL6E&wP%X_wP3(O)pHx7TqL@-4awhP2#O`-R-_Z|LP!+&#
z6zUs#C@s-d#<b{=jbN`RPKpW-(<MNq^D=e<`bcV-s7cf6I)rX$W-JI`Wtj>WO{$?!
zr})xLbT(?;xW~&CIJ()#>$KlXcydA4S%js)#sZ$k1lHm2zDjAYSIcV0cU_>t<!>)*
z@D7sDa0fH{$%Wyb(83dI>!aYV3}&GwP@lsy^b$4^rXLF=&hgfx`6W|Al@t`WsPlZK
zt#JNHNtOZzx1LGc3Tqp{uN9*<Zq+n+?r=aSC2w5`k;?2YZfibC1I=uG^#Dgmx11O|
zrOQV&-&UO$@%pnGJ;a0uCv)$;^IazclWk?o)w7$L)*!5kN~SW?e!@wJb!u})m9~lN
zETr5QxO`7;ronge5+bhGm%=e2pieuNJotFcLvou4Ud?<;!vkgXeiRL~avyly5vL2e
zVZQZsqCfA$m-^>PqOo<NFtu5b^kqf>Uz|qji0MnKImat0=ngw`o%BKvIcQj0>o{f%
z{V5K=mxLNGte`qh`hO0RKt%#rcVdN`v+;M;7Yv8^!t{NKhYAir-1b-=Vx?U0PCNIQ
z8JwRGrAIXVX)Z5V0U4#MhXe{^+u)_$%hy?aD9~5VwJ-w}X(p(>y5Ho!iM2)nvY6nJ
zvc?Q~C;|2uG@5H<mLH}oJc2u$1<<%(rAb`@UEzj_^AJ|HS}@(J$q@c0JAP1;gUL2#
zzNP#;p6<9c)&AIlhbM483C^(Y+3TW}*&f8Mvy~K7*v?$%5Rt_hE=zdZPeI)>ezd{S
zVQ8Hv(!bke7amoEUu^71yr%$he`4{{_n~#XGRR@z{^sC0(hujSp?MQA2V0pfooxcc
zv2Em)7iN<5*qPpCr>Sv8<<~i;mta>s-(O1(OaISuz?J*ue9*9*@H69|K>}i1|5V*N
z(#vP7<#3s=iCt&Mh+zM0wT|~FLQUr9oU-8ISw@czk9c~+{-Q;r!BU{tB%15w7AQc`
zq7du0L0h8t+MPvk_usmrcSLZ{@UCTxYSxLPH3D#Fzx}DgP)Dc=i|n2PBCGG%;X_`B
zh@2`K#JL_yyaJj_M0CL)>HmiK6w%;K^Orf?7i~yUVwO0afj3p(Y?S0Wkla}bkWRm+
zB?@jB<Yta;DFOB{#PRX;eI9-0IJAuhHkqQDnc}Dt6JhPvx%da6I(7s!4y}L)`J~FX
zz#ag*B_bNt^ff~mUI-A5U0R4iSH9u0J*)C{1_f|;)Yof-0#z5an;P0L!JRV>a|Xg-
zQWWQLb_9o-VZeG;;HQSL{C{;twb8)*r_g?#0$l}2z<^buQ!ov8?`RGOlmbgC>8!lO
z&fDT>0Ta>#&TZ8J{aG1Edp6x0S~L0=^U7j4O+=-0B*1)MhE8EVbT!Z*?&V>P6<gT&
z@i#5PkoGd)-r*qZmy;}Zl7YCF=Z_~KHGiO$M+CO@!P>2x;Z=YUFg6~{cq>U<hQLTW
z*d}IYLhQ<P5{0;oo1SBP5zc2OXv#<?i|L;w(kF=MjtKOMFqB{jW7kFlNyaeL8(#3)
zbg{!3;$l;6qR;$9d?qQ-m@le%0CEKqFr{;O>-x>$j^XLbepQabvPF2t6a{QP*wsL<
zFpMxE{rbar0{Zh_xHV6KFA7b$aUN5Rh7fs62W<ZPRB$B`SbPa++TJOSc4A<4K*@Qf
zrU#MJO#`b#N=*aScyyKqHsAN_6#KybB86dDXGl-^s#-)^pNeP9O2EoN+^yB{-s1$q
zY7lApvwN9+hCJ`PPBvJb?X+Q=4K44#R`<zPZcr~EqJgS5>`MT2V%PUX0TBug57==2
zQ2;g*-0fso`@v_92I;Xzo<-sS18^eK{}<zG=)PVO6uf@ZvI{LW_!|zErYb9-8ADi4
z#1E~8N4F@@*bra_XGb`TG-&*uy#$ws!0)yKG}`+o0)tP1KO^<}$lu-$cQYteA{xd|
zVF+u~AR|rYe=ZL%0Yf1e!k}I((r+0dqXp`9oS>f6xf@~RBoF~+UOS%SX5*;<bheZT
z%*m;M`-7#w%b^3H%|z7C{;nb5=<F>{%zwIO6wo`{aHvVU4*1=c0PVy6MKCVZi-+6O
z5uG@C^*qp(E?pJ{$K|HRPF)!GD`Nm_?R8JS&tHRX9lD?oBzS!8YzcG$72FFeM{pd)
zUL4%Myq^f*2aCf9pl&6XCFo<HjF(vqHLi7DPT1K?h%iDY0<;@1zkVVB_NT~@hyaZE
zEbH3;L<VF<z&+v)0Bn^2phs_+z9T=pP8i%{()k7e^;P1iBA}Or;RWF6C0q7^4+X$I
zcAptQ{q9w8UP}z>)r#8i03+;ED*){G0{{ZxZUzIg!r=b!uj!Ql^coTX_3st$|5t$m
z011G8A5X8-1bXH)0l@t%0N9)SpBY;<m(j?rf}dLAP_H(290%x{D9Al43#_BMBM6|g
zZMg)1ts4O7a(MdhioQ!907h07I4={_itMj5+Jit=y(9puZ+R8>jNy&DDzK#0|12-T
z5G?Qn^m41LIE)ejMshRo0Ov-*PyIwQ0_YmqMqb2_Bm(urZP*M#mjQTu?qUgaZ2@pE
zj5YvZ;p@*x0BCm<20>tz5Uk6Z%Ygc~KF0x2VY%#?7Op6xa~$YOjz@ZPB%m0e-n_IE
z$EjNmo`yPqQ5dQs!n(7;MNqG`3+nfmD&Xnu3IlX1xId~L%9(X&?GKkH5ukQ5qg@>U
zh5ET-UmR+3#qn>f>{0*&8Ff*BdTK}0Y=pwD%bh+5UCGPgyT8ca*~H|Y6VT`?QCQdg
z>~H=J%R|FiV<T5#C}=Jb5ICg<f5+9gVNM8V7eIPZbT0wD)GG`Hg}W}m{z&0BT2yHK
z-hV!FY3uOB=UD{kMkDqg=0xDH=$N<x67@pB%B-Y$JUA%$^4O<x|EU-IdiOgFmko`2
zVM%kcH-z6Veobg=D&lS@=O1{5ao-P(72}*w88PK`9_6Rm{fgL~2Oj5xb0q9k$M+56
z0S#<pUzS+`LshHbaTC&N`zv$$j{H?6<{w#0NPnk~VL!M34>zj~Q$@P=^{#*dt8}*^
z092eaYapZUErNg*zbDz_@>vCxu@>NEmQU7tWzb(E`&U$#UnXvD^2L)pA@ty%RC~uy
zf>mV!8=`wlf;lUl-)SuIXoA)n0Of_cvc>4(B5Z=);D#w(f`2at1=FvF+j4#H7{CKX
z50B6u=X8^pzmD)eCG-f{6*!{ev<*~^%OAI!=>&Qxpt)zFyFbJ>zjFbrurQrVziuxs
zRnI&1i0>&G#ostqSw~sSane!yUA08{dp_Wwk)5BPNp>4E!omewjg6oDM?3YtavKaU
zjCb<RehYX${ym>MUf%98`^_^)R_xCy_QmeW5%vIFbJuw#d-3HcN2#W*RzhPlPf9#$
z;>ID{F(b_Da^;1MGn&mijCwD_qsbR$Rf%dcf{yh|ZiU#_l9j@)l7#e|M3YX?zYO~o
zyKeI`Tz^>4uOcwcyUbywy;plG2+WM<p&8dA@I`LXSH6`kCAY8*-}4{zSPu3WNsna(
z#O(WYO=NA!8p{SGSB&#R6w9jF+_tqQW)2f$kCHyRmD5gK;i8(Bt_7Hi2y7zk1-tD6
zRbIZe6eiL9_4HUymI&_42NNeAMRxA~oaKCMvLwVk<okDaI&*2`xofsGt$6Nx<?J<U
zV|0hU-e(odc4Xj}rT6fRum9EGo67PtHV}^$bjUa@_=nT`_TIfZ_f{qP>Okr9AN;W+
z$mM^%xAQB5&eP|+Of#LVL6tS|t?a%Ob`wvZ>~W%yP4P1C?yrLUX41@L<pC`FCZ7I;
z?h;t`_KXbUkPN`V^oI!<vlgeE*K&QvK9#><8=WT;3~vs-^gizN`TTrOuyA-)$>gLx
zwz^{Z@TV!;62B7?(+|SHDIr~a#Y_Y@BbbB>1EmuGh8e5@M;AeI`Yj!EL`7&MoOx}a
z6Hg*`B4Rdn{!o%6wBGy>#E7Kx#xG!sB+cDfTPxphFU$OSFMO=uGTMnE6(U<#or7sh
z;AjK150_k~xFe^7^Z3fli<$AY=qZO6vkC$8o+7kc1AhaGCkPJ%!=~1T2c5{kDP4Tw
z`*Fi;89zc?)L~uhkTRr@$9D_-8i!KG@nMj9^FFpd%Zo@ALeC4PU$(qdc;<LzN~z{A
z%$Dw*@XFQzQpn^QP{^@mi!y%*ZG95jR<iijfuAXyEoG?pBygy&68rhOY#<-UIVkXJ
z_Doy0D`|MF>RXxC3fM$=vmw`5{wF>RE?WOdWqw$bHh+lLd&$$J`~QZNg!CF(^2Eh;
zw48~HX0GO0k1W`DG8@yI{e$~BIuY>waJjRpf2Y>mGi>ytW${Dp0x7+sV*bss+5#n?
znGwBGvh++%8Fv2O5lXK`iSHn{U;BL||NCNfrCwqrI<-Kty&QZ$4arUWa{1YO$B0<(
zC4%3`%S|CKq<2m(@baUWc5#zsQ-1d(qRi}pwbCU0%8M5Z!R9)UA{l)wIz^Ga6WTSG
zH0;KX)$E+{He5>M$7~JU=`$?U%KUBgQ$b5pzaU3^q}&cS|KZ_Wse7Zv54_SWVpA#`
zoLl%9yA|9elyEO|?A`HvKGS;yPZvRaw=-JIoNrf*HSS_iakE6v->>JEjOne}HyUF2
zNoU|j&sad$j+-kV6>Z5mr5C)Q7>*1N{8!`2XA?xeTE#zE9_0Y_LUGRB{vH%6sqw$%
zfU4`!czhb_g{<ZgV^rje;LJMkL(=MeOHnFg*0~8-qO4`tTztZ>+X(}>2P*2@qB?m+
zSI_P1Cc6E3-r_Xqyla5>Xz{Dyw=@_W550)Az8&Wlzx%iIH7@|GgQ?XB)uKR>aB$nq
zkl^=vI84${81an(sSrBZ{igoRSnDgS;ffGAqG7_3b3dk2BbR$Lmva1}UP#qxKB=8Z
z!ri{SQA428KOs}61zXb8InP?0yNQogM*CJJ2<5!Xchf8^ig&{jrsiwrYNwo^M50F)
zz8@GvBIls?(o9m(VyuJ+F8P9ihTuj2Ol+MYd>qCO3kFnqA~Y%~f4>HEr)EwY_G6jk
z%?sb#3QH$_U7x%$j;W9!;j;X;Xb3W=c*3(sPfAUa$&P5M?z<j~5xjdax%E>thMy8_
ze7PEmkAH|E9h*lki{mK$ie3DIreO)&pWYv6SJF%c$Ck5UIe+pG<mC1SB2m#jSb6)~
zG-Bw~l?i6P2zUQO99^ZOoou&MgG*{BQb}G)x;!Jzm_1B2g=NMbHqF1LM^NbG*2)ta
zOPPMKUy&+K{L?rneJMZ!rRLgRsfor)k1k$+DGSBN%U6abW7U*1dRHgj9~00&Zc9k0
zqYdfdHEp98eyM!je)hTk;5ZHYqY)JnpsXuc>5$%zrXdE-zg(FM{@j`GM9zs@R^eZ5
zv*vBL!v<g1Yetr)QPa{|Cm}91-N-szq}5y}>w?-^Xb}JWecvwK=4(Cc4ntf-`VQ+L
z5d+7Ej#x{FZJ+UzxfP+l0d=(!8iv_2tc}_4-Zj%4$NzLZjFUaq^RcX07*!R-_FFG|
z*lLVQejysdTeSSWaPFfHCWqt9D|XrFK4&9RA*kC;AP>!4B;g(w_m^cOjF&}X>*ar5
zyy(P}4gq7<t%irS3&+ZClVB6UkNvOrnqQ5(z?gAR+;-x1nY}P7g?sWf`Oan@*yxiI
zKSyIX4Q?4H;W&HEkUK*{j1ua2ca3M;!`SA7n~ok|X^$0%{<X6z7AF+~v#VQXtNX$w
zg+uN01)gi+FiG{Dluxz)lf(0f>?YE?sTRyN@gl+F`y$0Iy?aPfg|MbLdvea(P?3!G
z^qdcOmBMbn>KZICfcyT42!-6(Zzzn@eEg=wxm-&Sd32GJyzvse)~=6eXx6X@Dg8PZ
zBg`=Q89e&gHwqgxScA1M!?)<O9103Pk$)j%VeY(~80YJ*z>$a6=f|~joo2oZ)~$tq
zU5|%$2*)f`;OcRC6W+IO_PD(?E;u>_chBe94G77y3-I(0{2uRWd$nE1nmTxesd%zt
z*HwXET79$^4PcK;KdtK5xcN(?g2MW{ExGlnp?Q=p8I|PmJ46<<rfZwHAfr#2d3z-c
zwpQ+5LWF<Q@bymHhGJ5?SIu}Ha=f#6&Wy<LIm>u@Bu=;YO?7Mwj{x~rTZCfXZn*j^
zJC>)joB+9xX<2I)>=JND`(RR;pvKo?$>ESr+O}DpiOLa$9kMS7>LWA0zRy{8*oT<T
zHL@&am+xHtA;FaiChM$gUVVMb{I^$}5OhC!kAS$p*Ozd+)l(Mlaj;i=JEVAOiIy_*
z#JW=Gs9Q9?yQ+1%CE2Q(ABZJgP0P@jjn@llG8CL)t}~PG{6~@DEMV&W#8}Cz(d#$4
z6TU0vDa@q=Yub$8_hx?Ni07gx*YLu)mmvS}FW0g8uSeQKBV+mbpuKl^nmME)5yS4K
z>GBmkCtJ7Vcg@6@;YA$_Cu+);vNz*loej@5xka|JZ2WYe0W^)_{3c(#+0O8-+w0fW
zJp6SGJ97Dh%-Ga-yp^jpuXns?Rb^Tk@p17ew@{qJIMUU<NyP-z{?YZ1vF3f~)|JAV
z38)nAS?UpYBU2Kj`%h4MFO>PbI-tT|0WH_jrdM4_cvlUS3|1PhKf6>C&raUKnu(|s
z&c)UAsZ85i1ZLC(dGSGFnHjqI|Lr#8szl_7-T0t%4bZAJ*s<Yx?$`H)?~ezXidRV^
zzNhIgK2=i!PVFe^?XX<fginua9oFm58!h$ntj65rs<W~b&@H815u<DCEn_vZ1_@yE
zrRzc2wrNkgLo_qf5cVXYZ#=s)kB4gE{BZE{D6jg*D}{ZSPr_y15O{G{$e!h^7$AAg
z1p3x!rvA6to*cZ-ITeO7)4*Z6w^I*Tk18>{4)wW?&u7HSA8C2>JbLGo`GY|V6fEdo
z3^wDLb82a<xcXi>%sgJe!mS&T)(lCj`O(nt1B8#06_FapUEpzFzv&|tf#Z&o6W+W|
zzDWU>d}8xY>J`$bsOxC?r5C3oP;ME&`OR-zyiN1%Ia>O>?Uyjc)?I{CLYAWP*U-6^
zV=Lu3QmO(RJ#`PKq|RtC5umb6cNl5iGxn)mUy0=~-K%1x()GvC`?M`L<U0p{dv!wE
z9QVrHmS}AGlPb61=p?x(_l5pe&E1^C_axT;i17G9Cex_T1$RNamT+b%^7eFzoC12Y
z1fri`L$@0s5QVi?Vm=8m^U|P3#<{c%{kEXRZk2!21h{1+3A^d?QhvYZumdD$-Q$(^
zq$^6TlDRh<Cu<z&TAB9m%(G;z){m<bmY~(?#6BJ431?g0C2(t7DLeR)GXQ&4IN!=4
z`G$hPnnw#9dFWeq&5Tb#1Fxa2lA41z?cmTR!8gU*78yOXphvJ#^Uq1+aJ`a_75H;{
zcI%JwE`fd13R01J&Z#2Wgi$y#zi>Y03MZz=d36z9y*yqoWTr>8Xtj9RLYv9#lK;;?
z8pPp}Znp3$_lN;hz%5%yZd=YT-?F_w8s@xjrHIp;43KX^`iB4geq&B{k6xiMC0ae%
zQ|7Tj2vv(jUrbfIe5><~fcjI)!_!=IEoP-Nq+cc72oG~o&>?($g5o7K<mjwzJz@`>
zc_S?<ZNn`zrm}`W&g2NBA0Y)OGW|>zb|&CM)BawN%JdgLZb;w<F7#S28*(MdE(~<}
ze2=C4;qL$R9$48fS+r)JN|(Dc!dj(Boh7`wHF;%etk`hr#~`I$1{x23ndS1k?_*f=
zfUA9NVKYyfiLh1~Q+IPFtanwv2bP6P5^eOCUU?u>|Gtbs(&PxZ+mmjnbK0zFb?<@o
z$0d?EJe|xarM>xL3GRL**#(hMvKf-R#HD?i<z6W=Ca9%e8(JEfmH~T7oIzW&G*0Q9
z_$}qoR(aV30@9y#&5XBOir+fO)p~}bJM8AzCE&xA5ysDh9t)-&95))mDlqP{5%^tb
ztcz9-HGDtyAd`T`M}=WOr)Y8ceaWd6%&HqAa83g0^zuBwNC`&rHu!Y7atHhgkd~F=
zDA?8!^9U<mB@LgdxH4pUd4jpa3gQxBh>wF3Lg*WFpI@7TrLelBkZfkqN%Zwcld`y(
z>b&=o_O+teHYGL44I<qD%?1S_qRS5IBOyOLdf;LHx4I-A0Zhb@JSlP~dM}pHBin7a
zx_%{8Syzk%5uf!jzs&G)@H`S7fREC+>gt87oxreQ3&@5%%aV_lz<5pd(Y}N?aavY#
z+d0HFXA7oGjsh!@Tz^23W%%{?-_43Y#QnY!b}3(;uP)##e_3ofGBLLHD1uIgb27Yc
zg@=bdzZQB@d30Rj+bHd{jS!^C;i`U8WnFeqEmrxtD!S*yO?dCZyw*DZXF@~JwUOve
zUDEZ+>i2Ej4WxY2FSD*$*q;vXhZB8X(~=P9N*+i%Pd}4bS9E~fuGr2W+cn4huk}|8
z)^y*EKV)(YSpA()gR3{s%Nq+XxX8a9qU<%PH6#P>E_&3DuQ^+5VoK~`UDtm#o^3&O
zG>2m)+*i)P67EEM+v03RuBi%&XcMKwoDVg^QXZ<!3$FK_50or@7>rv;m=T3WC6c*c
zDm|A5f0UaST&tLUsRgg!rzi+;pd*e8KhNoT<E(_EpV&$z(RC`@L%z(rCY5d2_C4m3
zK+D7ySU(k6_s?}Yjt^{bRuLx`^KW9OpHpqp$7A1>YkXYwUL~<#1?pc>>uWdu*dW_u
z*WIyxDUAxXYCP-lbCZ(b9zfQANDJPaz&K7Pqg7G@_c>axtTTenUPA|P=I^#pN%V7~
zOuO2`=EWeB<G>0wW+jAi8d99i$Y{HiptXs)yTln#5^i%_a}zG<K-r^AVa9gf9b6*K
zeuVPt$c65))V0`4YZGAT6U4+<Jq}=UsH7jfPp|P2EEZQ#T{pQF^N4SmkeF^+(2883
zf)$nY@iph*T4xP$sp8XDQYi%aZDPr5^agHLIQM)G{@_x`+}&*oj0e>E&xMbK4z9pi
z^Ln?0lJI(0CwAe@GxvGY?0MGnW(Jwek_zu|3JxTRq53qILvu_1PP)UPyjofpl|q1n
z61dLBRjOM_du^$^Ia{3_d}rYHlM&{$M$WX}>^_M5cSgI{S+9o#jT=c~{zB&$8}`hK
z)RXeku<ja9zK-Bu|EbM95_~ZteU!$V*6@nMOL2O%cf*Hwd#I>)FO8=b4F6X{d)(YE
zpyw|pThFh8xHIH|Q_APp$gi;_|CmnAvHOSBAiPze$~)5jndYU#ek*~XQNp1Eq%Dv5
zGrj+X3RaiLmi;4U75@wyY6)rZp0I3ldpxl`sf_{YK_Kg{CfzJrz#2E?5E0b=dg#Mf
zDN5JpMDTgeoCTaVYhaG)x7~F1AE>`et*=eXJvkm2ZiL7BY9!j|pITj%xTaUiu}e<l
zXL8eMU#fNyV4WPnU=wNY8HVp;rtOJCKD~VAlgQAV=?`cs?y@9%iTkTk@SM5uIp2TG
zS;KxQGh=-2-D(o#D~jzU1?=3suroC2<0PFBTGt;#68^f*y-5GAird`9xIT%GTd+i3
z8V-taS_2|tC3zIWKV;t9zOXgYytqClZ?Vi`im{#@OaNK-=J6)4|AK`4NRPcUTQN_k
zdF<R1AttqX)>*s56i^q(P!f{2H&;7mOi@?LM0MV)xR@TxYG*G6@J1(_w=koAkHokr
zF%zSEybEIhdLu$pr3n9!{rVS5_mbaqcLld4f4mqtAoV4uRib_IXkbZNTga;s?|=d_
zuzqN2zDe}S6X7256Pe{+u`Js&9xq59Yu>7wQD1$Y$DI)sl+9o#?#1(GgohTRcH!WQ
zs@PtVzD>ke&gExXWQ8ze`uzQnqOLXFUB&-UJf|jj)tf2PXQslj?8Od^+G&mceb_tO
z)d=)=tWE#8-Pk(3FT8x}{Z4r?i|t+&4HYaMEb?70rY=2Qj(J<n56$Y<<j<`FR>Miw
z{V@88L-kopWoPuowoLD-V3zbVDO(Js22F-HSiCP;oJ|M{(a6gbwATeqJ>GLst#G~b
z^%>rTi<=S!2aW1tThhpyB)r1&iuG)s@i%9G{CWboTTtx|8h2R*I%%tA6~>DQDs9FK
zW>*1gUnnCt-sb?-eP20uzYz8=EC#@<MezpB|JK1$=Z2?Y-q$5?ASF&nk|GF)vOI0n
z&IPA;dAGhH;^0B2@{MZ#U|U1^@JjoIi2x(%Aa)QL80tx37JtZBPY%>Q(8`R7=hYFJ
zx@;l>e^!eLJBIBUyz+VAgsW2R9}V%^QRzT3u<ms;d{t$|aOF>@cap?!&%a1BeI&y3
zDd+lR8Igc9Yy8x3I{CxW%JUs*_cd#~G*5hrJTp3$N|SIK{lEWcVJaM;h=d-vW20vZ
P0B~TR#op}QjIjR)wK5d}

diff --git a/gvr-interface/src/Client.cpp b/gvr-interface/src/Client.cpp
deleted file mode 100644
index 8f064c7fd5..0000000000
--- a/gvr-interface/src/Client.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  Client.cpp
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/20/15.
-//  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 "Client.h"
-
-#include <AccountManager.h>
-#include <AddressManager.h>
-#include <HifiSockAddr.h>
-#include <NodeList.h>
-#include <PacketHeaders.h>
-
-Client::Client(QObject* parent) :
-    QObject(parent)
-{   
-    // we need to make sure that required dependencies are created
-    DependencyManager::set<AddressManager>();
-    
-    setupNetworking();
-}
-
-void Client::setupNetworking() {
-    // once Application order of instantiation is fixed this should be done from AccountManager
-    AccountManager::getInstance().setAuthURL(DEFAULT_NODE_AUTH_URL);
-    
-    // setup the NodeList for this client
-    DependencyManager::registerInheritance<LimitedNodeList, NodeList>(); 
-    auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, 0);
-    
-    // while datagram processing remains simple for targets using Client, we'll handle datagrams
-    connect(&nodeList->getNodeSocket(), &QUdpSocket::readyRead, this, &Client::processDatagrams);
-    
-    // every second, ask the NodeList to check in with the domain server
-    QTimer* domainCheckInTimer = new QTimer(this);
-    domainCheckInTimer->setInterval(DOMAIN_SERVER_CHECK_IN_MSECS);
-    connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
-    
-    // TODO: once the Client knows its Address on start-up we should be able to immediately send a check in here
-    domainCheckInTimer->start();
-    
-    // handle the case where the domain stops talking to us
-    // TODO: can we just have the nodelist do this when it sets up? Is there a user of the NodeList that wouldn't want this?
-    connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset);
-}
-
-void Client::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) {
-    DependencyManager::get<NodeList>()->processNodeData(senderSockAddr, incomingPacket);
-}
-
-void Client::processDatagrams() {
-    HifiSockAddr senderSockAddr;
-    
-    static QByteArray incomingPacket;
-    
-    auto nodeList = DependencyManager::get<NodeList>();
-    
-    while (DependencyManager::get<NodeList>()->getNodeSocket().hasPendingDatagrams()) {
-        incomingPacket.resize(nodeList->getNodeSocket().pendingDatagramSize());
-        nodeList->getNodeSocket().readDatagram(incomingPacket.data(), incomingPacket.size(),
-                                               senderSockAddr.getAddressPointer(), senderSockAddr.getPortPointer());
-        
-        if (nodeList->packetVersionAndHashMatch(incomingPacket)) {
-            processVerifiedPacket(senderSockAddr, incomingPacket);
-        }
-    }
-}
diff --git a/gvr-interface/src/Client.h b/gvr-interface/src/Client.h
deleted file mode 100644
index 6fbe40f165..0000000000
--- a/gvr-interface/src/Client.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  Client.h
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/20/15.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_Client_h
-#define hifi_Client_h
-
-#include <QtCore/QObject>
-
-#include <HifiSockAddr.h>
-
-class Client : public QObject {
-    Q_OBJECT
-public:
-    Client(QObject* parent = 0);
-    
-    virtual void cleanupBeforeQuit() = 0;
-protected:
-    
-    void setupNetworking();
-    virtual void processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket);
-private slots:
-    void processDatagrams();
-};
-
-#endif // hifi_Client_h
diff --git a/gvr-interface/src/GVRInterface.cpp b/gvr-interface/src/GVRInterface.cpp
deleted file mode 100644
index f9a29d4ac4..0000000000
--- a/gvr-interface/src/GVRInterface.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-//  GVRInterface.cpp
-//  gvr-interface/src
-//
-//  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
-//
-
-#include "GVRInterface.h"
-
-#ifdef ANDROID
-
-#include <jni.h>
-
-#include <qpa/qplatformnativeinterface.h>
-#include <QtAndroidExtras/QAndroidJniEnvironment>
-#include <QtAndroidExtras/QAndroidJniObject>
-
-#ifdef HAVE_LIBOVR
-
-#include <KeyState.h>
-#include <VrApi/VrApi.h>
-
-#endif
-#endif
-
-#include <QtCore/QTimer>
-#include <QtGui/QKeyEvent>
-#include <QtWidgets/QMenuBar>
-
-#include "GVRMainWindow.h"
-#include "RenderingClient.h"
-
-static QString launchURLString = QString();
-
-#ifdef ANDROID
-
-extern "C" {
-    
-JNIEXPORT void Java_io_highfidelity_gvrinterface_InterfaceActivity_handleHifiURL(JNIEnv *jni, jclass clazz, jstring hifiURLString) {
-    launchURLString = QAndroidJniObject(hifiURLString).toString();
-}
-
-}
-
-#endif
-
-GVRInterface::GVRInterface(int argc, char* argv[]) : 
-    QApplication(argc, argv),
-    _mainWindow(NULL),
-    _inVRMode(false)
-{
-    setApplicationName("gvr-interface");
-    setOrganizationName("highfidelity");
-    setOrganizationDomain("io");
-    
-    if (!launchURLString.isEmpty()) {
-        // did we get launched with a lookup URL? If so it is time to give that to the AddressManager
-        qDebug() << "We were opened via a hifi URL -" << launchURLString;
-    }
-    
-    _client = new RenderingClient(this, launchURLString);
-    
-    launchURLString = QString();
-    
-    connect(this, &QGuiApplication::applicationStateChanged, this, &GVRInterface::handleApplicationStateChange);
-
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    QAndroidJniEnvironment jniEnv;
-    
-    QPlatformNativeInterface* interface = QApplication::platformNativeInterface();
-    jobject activity = (jobject) interface->nativeResourceForIntegration("QtActivity");
-
-    ovr_RegisterHmtReceivers(&*jniEnv, activity);
-    
-    // PLATFORMACTIVITY_REMOVAL: Temp workaround for PlatformActivity being
-    // stripped from UnityPlugin. Alternate is to use LOCAL_WHOLE_STATIC_LIBRARIES
-    // but that increases the size of the plugin by ~1MiB
-    OVR::linkerPlatformActivity++;
-#endif
-    
-    // call our idle function whenever we can
-    QTimer* idleTimer = new QTimer(this);
-    connect(idleTimer, &QTimer::timeout, this, &GVRInterface::idle);
-    idleTimer->start(0);
-    
-    // call our quit handler before we go down
-    connect(this, &QCoreApplication::aboutToQuit, this, &GVRInterface::handleApplicationQuit);
-}
-
-void GVRInterface::handleApplicationQuit() {
-    _client->cleanupBeforeQuit();
-}
-
-void GVRInterface::idle() {
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    if (!_inVRMode && ovr_IsHeadsetDocked()) {
-        qDebug() << "The headset just got docked - enter VR mode.";
-        enterVRMode();
-    } else if (_inVRMode) {
-        
-        if (ovr_IsHeadsetDocked()) {
-            static int counter = 0;
-            
-            // Get the latest head tracking state, predicted ahead to the midpoint of the time
-            // it will be displayed.  It will always be corrected to the real values by
-            // time warp, but the closer we get, the less black will be pulled in at the edges.
-            const double now = ovr_GetTimeInSeconds();
-            static double prev;
-            const double rawDelta = now - prev;
-            prev = now;
-            const double clampedPrediction = std::min( 0.1, rawDelta * 2);
-            ovrSensorState sensor = ovrHmd_GetSensorState(OvrHmd, now + clampedPrediction, true );   
-            
-            auto ovrOrientation = sensor.Predicted.Pose.Orientation;
-            glm::quat newOrientation(ovrOrientation.w, ovrOrientation.x, ovrOrientation.y, ovrOrientation.z);
-            _client->setOrientation(newOrientation);
-            
-            if (counter++ % 100000 == 0) {
-                qDebug() << "GetSensorState in frame" << counter << "-" 
-                    << ovrOrientation.x <<  ovrOrientation.y <<  ovrOrientation.z <<  ovrOrientation.w;
-            }
-        } else {
-            qDebug() << "The headset was undocked - leaving VR mode.";
-            
-            leaveVRMode();
-        }
-    } 
-    
-    OVR::KeyState& backKeyState = _mainWindow->getBackKeyState();
-    auto backEvent = backKeyState.Update(ovr_GetTimeInSeconds());
-
-    if (backEvent == OVR::KeyState::KEY_EVENT_LONG_PRESS) {
-        qDebug() << "Attemping to start the Platform UI Activity.";
-        ovr_StartPackageActivity(_ovr, PUI_CLASS_NAME, PUI_GLOBAL_MENU);
-    } else if (backEvent == OVR::KeyState::KEY_EVENT_DOUBLE_TAP || backEvent == OVR::KeyState::KEY_EVENT_SHORT_PRESS) {
-        qDebug() << "Got an event we should cancel for!";
-    } else if (backEvent == OVR::KeyState::KEY_EVENT_DOUBLE_TAP) {
-        qDebug() << "The button is down!";
-    }
-#endif
-}
-
-void GVRInterface::handleApplicationStateChange(Qt::ApplicationState state) {
-    switch(state) {
-        case Qt::ApplicationActive:
-            qDebug() << "The application is active.";
-            break;
-        case Qt::ApplicationSuspended:
-            qDebug() << "The application is being suspended.";
-            break;
-        default:
-            break;
-    }
-}
-
-void GVRInterface::enterVRMode() {
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    // Default vrModeParms
-    ovrModeParms vrModeParms;
-    vrModeParms.AsynchronousTimeWarp = true;
-    vrModeParms.AllowPowerSave = true;
-    vrModeParms.DistortionFileName = NULL;
-    vrModeParms.EnableImageServer = false;
-    vrModeParms.CpuLevel = 2;
-    vrModeParms.GpuLevel = 2;
-    vrModeParms.GameThreadTid = 0;
-    
-    QAndroidJniEnvironment jniEnv;
-    
-    QPlatformNativeInterface* interface = QApplication::platformNativeInterface();
-    jobject activity = (jobject) interface->nativeResourceForIntegration("QtActivity");
-    
-    vrModeParms.ActivityObject = activity;
-    
-    ovrHmdInfo hmdInfo;
-    _ovr = ovr_EnterVrMode(vrModeParms, &hmdInfo);
-    
-    _inVRMode = true;
-#endif
-}
-
-void GVRInterface::leaveVRMode() {
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    ovr_LeaveVrMode(_ovr);
-    _inVRMode = false;
-#endif
-}
diff --git a/gvr-interface/src/GVRInterface.h b/gvr-interface/src/GVRInterface.h
deleted file mode 100644
index 9ffbd52909..0000000000
--- a/gvr-interface/src/GVRInterface.h
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  GVRInterface.h
-//  gvr-interface/src
-//
-//  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
-//
-
-#ifndef hifi_GVRInterface_h
-#define hifi_GVRInterface_h
-
-#include <QtWidgets/QApplication>
-
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-class ovrMobile;
-class ovrHmdInfo;
-
-// This is set by JNI_OnLoad() when the .so is initially loaded.
-// Must use to attach each thread that will use JNI:
-namespace OVR {
-    // PLATFORMACTIVITY_REMOVAL: Temp workaround for PlatformActivity being
-    // stripped from UnityPlugin. Alternate is to use LOCAL_WHOLE_STATIC_LIBRARIES
-    // but that increases the size of the plugin by ~1MiB
-    extern int linkerPlatformActivity;
-}
-
-#endif 
-
-class GVRMainWindow;
-class RenderingClient;
-class QKeyEvent;
-
-#if defined(qApp)
-#undef qApp
-#endif
-#define qApp (static_cast<GVRInterface*>(QApplication::instance()))
-
-class GVRInterface : public QApplication {
-    Q_OBJECT
-public:
-    GVRInterface(int argc, char* argv[]);   
-    RenderingClient* getClient() { return _client; }
-    
-    void setMainWindow(GVRMainWindow* mainWindow) { _mainWindow = mainWindow; }
-    
-protected:
-    void keyPressEvent(QKeyEvent* event);
-        
-private slots:
-    void handleApplicationStateChange(Qt::ApplicationState state);
-    void idle();
-private:
-    void handleApplicationQuit();
-    
-    void enterVRMode();
-    void leaveVRMode();
-    
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    ovrMobile* _ovr;
-    ovrHmdInfo* _hmdInfo;
-#endif
-    
-    GVRMainWindow* _mainWindow;
-    
-    RenderingClient* _client;
-    bool _inVRMode;
-};
-
-#endif // hifi_GVRInterface_h
diff --git a/gvr-interface/src/GVRMainWindow.cpp b/gvr-interface/src/GVRMainWindow.cpp
deleted file mode 100644
index 5495354233..0000000000
--- a/gvr-interface/src/GVRMainWindow.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//
-//  GVRMainWindow.cpp
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/20/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 "GVRMainWindow.h"
-
-#include <QtGui/QKeyEvent>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QVBoxLayout>
-
-#ifndef ANDROID
-
-#include <QtWidgets/QDesktopWidget>
-
-#elif defined(HAVE_LIBOVR)
-
-#include <OVR_CAPI.h>
-
-const float LIBOVR_DOUBLE_TAP_DURATION = 0.25f;
-const float LIBOVR_LONG_PRESS_DURATION = 0.75f;
-
-#endif
-
-#include <AddressManager.h>
-
-#include "InterfaceView.h"
-#include "LoginDialog.h"
-#include "RenderingClient.h"
-
-
-
-GVRMainWindow::GVRMainWindow(QWidget* parent) :
-    QMainWindow(parent),
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    _backKeyState(LIBOVR_DOUBLE_TAP_DURATION, LIBOVR_LONG_PRESS_DURATION),
-    _wasBackKeyDown(false),
-#endif
-    _mainLayout(NULL),
-    _menuBar(NULL),
-    _loginAction(NULL)
-{
-    
-#ifndef ANDROID
-    const int NOTE_4_WIDTH = 2560;
-    const int NOTE_4_HEIGHT = 1440;
-    setFixedSize(NOTE_4_WIDTH / 2, NOTE_4_HEIGHT / 2);
-#endif
-    
-    setupMenuBar();
-    
-    QWidget* baseWidget = new QWidget(this);
-    
-    // setup a layout so we can vertically align to top
-    _mainLayout = new QVBoxLayout(baseWidget);
-    _mainLayout->setAlignment(Qt::AlignTop);
-    
-    // set the layout on the base widget
-    baseWidget->setLayout(_mainLayout);
-    
-    setCentralWidget(baseWidget);
-    
-    // add the interface view
-    new InterfaceView(baseWidget);
-}
-
-GVRMainWindow::~GVRMainWindow() {
-    delete _menuBar;
-}
-
-void GVRMainWindow::keyPressEvent(QKeyEvent* event) {
-#ifdef ANDROID
-    if (event->key() == Qt::Key_Back) {
-        // got the Android back key, hand off to OVR KeyState
-        _backKeyState.HandleEvent(ovr_GetTimeInSeconds(), true, (_wasBackKeyDown ? 1 : 0));
-        _wasBackKeyDown = true;
-        return;
-    }
-#endif
-    QWidget::keyPressEvent(event);
-}
-
-void GVRMainWindow::keyReleaseEvent(QKeyEvent* event) {
-#ifdef ANDROID
-    if (event->key() == Qt::Key_Back) {
-        // release on the Android back key, hand off to OVR KeyState
-        _backKeyState.HandleEvent(ovr_GetTimeInSeconds(), false, 0);
-        _wasBackKeyDown = false;
-    }
-#endif
-    QWidget::keyReleaseEvent(event);
-}
-
-void GVRMainWindow::setupMenuBar() {
-    QMenu* fileMenu = new QMenu("File");
-    QMenu* helpMenu = new QMenu("Help");
-    
-    _menuBar = new QMenuBar(0);
-    
-    _menuBar->addMenu(fileMenu);
-    _menuBar->addMenu(helpMenu);
-    
-    QAction* goToAddress = new QAction("Go to Address", fileMenu);
-    connect(goToAddress, &QAction::triggered, this, &GVRMainWindow::showAddressBar);
-    fileMenu->addAction(goToAddress);
-    
-    _loginAction = new QAction("Login", fileMenu);
-    fileMenu->addAction(_loginAction);
-    
-    // change the login action depending on our logged in/out state
-    AccountManager& accountManager = AccountManager::getInstance();
-    connect(&accountManager, &AccountManager::loginComplete, this, &GVRMainWindow::refreshLoginAction);
-    connect(&accountManager, &AccountManager::logoutComplete, this, &GVRMainWindow::refreshLoginAction);
-    
-    // refresh the state now
-    refreshLoginAction();
-    
-    QAction* aboutQt = new QAction("About Qt", helpMenu);
-    connect(aboutQt, &QAction::triggered, qApp, &QApplication::aboutQt);
-    helpMenu->addAction(aboutQt);
-    
-    setMenuBar(_menuBar);
-}
-
-void GVRMainWindow::showAddressBar() {
-    // setup the address QInputDialog
-    QInputDialog* addressDialog = new QInputDialog(this);
-    addressDialog->setLabelText("Address");
-    
-    // add the address dialog to the main layout
-    _mainLayout->addWidget(addressDialog);
-    
-    connect(addressDialog, &QInputDialog::textValueSelected, 
-            DependencyManager::get<AddressManager>().data(), &AddressManager::handleLookupString);
-}
-
-void GVRMainWindow::showLoginDialog() {
-    LoginDialog* loginDialog = new LoginDialog(this);
-    
-    // have the acccount manager handle credentials from LoginDialog
-    AccountManager& accountManager = AccountManager::getInstance();
-    connect(loginDialog, &LoginDialog::credentialsEntered, &accountManager, &AccountManager::requestAccessToken);
-    connect(&accountManager, &AccountManager::loginFailed, this, &GVRMainWindow::showLoginFailure);
-    
-    _mainLayout->addWidget(loginDialog);
-}
-
-void GVRMainWindow::showLoginFailure() {
-    QMessageBox::warning(this, "Login Failed",
-                         "Could not log in with that username and password. Please try again!");
-}
-
-void GVRMainWindow::refreshLoginAction() {
-    AccountManager& accountManager = AccountManager::getInstance();
-    disconnect(_loginAction, &QAction::triggered, &accountManager, 0);
-    
-    if (accountManager.isLoggedIn()) {
-        _loginAction->setText("Logout");
-        connect(_loginAction, &QAction::triggered, &accountManager, &AccountManager::logout);
-    } else {
-        _loginAction->setText("Login");
-        connect(_loginAction, &QAction::triggered, this, &GVRMainWindow::showLoginDialog);
-    }
-    
-}
diff --git a/gvr-interface/src/GVRMainWindow.h b/gvr-interface/src/GVRMainWindow.h
deleted file mode 100644
index c28c19a6c1..0000000000
--- a/gvr-interface/src/GVRMainWindow.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-//  GVRMainWindow.h
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/20/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
-//
-
-#ifndef hifi_GVRMainWindow_h
-#define hifi_GVRMainWindow_h
-
-#include <QtWidgets/QMainWindow>
-
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-#include <KeyState.h>
-#endif
-
-class QKeyEvent;
-class QMenuBar;
-class QVBoxLayout;
-
-class GVRMainWindow : public QMainWindow {
-    Q_OBJECT
-public:
-    GVRMainWindow(QWidget* parent = 0);
-    ~GVRMainWindow();
-public slots:
-    void showAddressBar();
-    void showLoginDialog();
-    
-    void showLoginFailure();
-    
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    OVR::KeyState& getBackKeyState() { return _backKeyState; }
-#endif
-    
-protected:
-    void keyPressEvent(QKeyEvent* event);
-    void keyReleaseEvent(QKeyEvent* event);
-private slots:
-    void refreshLoginAction();
-private:
-    void setupMenuBar();
-    
-#if defined(ANDROID) && defined(HAVE_LIBOVR)
-    OVR::KeyState _backKeyState;
-    bool _wasBackKeyDown;
-#endif
-    
-    QVBoxLayout* _mainLayout;
-    QMenuBar* _menuBar;
-    QAction* _loginAction;
-};
-
-#endif // hifi_GVRMainWindow_h
diff --git a/gvr-interface/src/InterfaceView.cpp b/gvr-interface/src/InterfaceView.cpp
deleted file mode 100644
index e7992d3921..0000000000
--- a/gvr-interface/src/InterfaceView.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  InterfaceView.cpp
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/28/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 "InterfaceView.h"
-
-InterfaceView::InterfaceView(QWidget* parent,  Qt::WindowFlags flags) :
-    QOpenGLWidget(parent, flags)
-{
-    
-}
\ No newline at end of file
diff --git a/gvr-interface/src/InterfaceView.h b/gvr-interface/src/InterfaceView.h
deleted file mode 100644
index 3d358a3e64..0000000000
--- a/gvr-interface/src/InterfaceView.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  InterfaceView.h
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/28/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
-//
-
-#ifndef hifi_InterfaceView_h
-#define hifi_InterfaceView_h
-
-#include <QtWidgets/QOpenGLWidget>
-
-class InterfaceView : public QOpenGLWidget {
-    Q_OBJECT
-public:
-    InterfaceView(QWidget* parent = 0, Qt::WindowFlags flags = 0);
-};
-
-#endif // hifi_InterfaceView_h
diff --git a/gvr-interface/src/LoginDialog.cpp b/gvr-interface/src/LoginDialog.cpp
deleted file mode 100644
index d4efd425bd..0000000000
--- a/gvr-interface/src/LoginDialog.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-//  LoginDialog.cpp
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 2015-02-03.
-//  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 "LoginDialog.h"
-
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPushButton>
-
-LoginDialog::LoginDialog(QWidget* parent) :
-    QDialog(parent)
-{
-    setupGUI();
-    setWindowTitle("Login");
-    setModal(true);
-}
-
-void LoginDialog::setupGUI() {
-    // setup a grid layout
-    QGridLayout* formGridLayout = new QGridLayout(this);
- 
-    _usernameLineEdit = new QLineEdit(this);
-    
-    QLabel* usernameLabel = new QLabel(this);
-    usernameLabel->setText("Username");
-    usernameLabel->setBuddy(_usernameLineEdit);
-    
-    formGridLayout->addWidget(usernameLabel, 0, 0);
-    formGridLayout->addWidget(_usernameLineEdit, 1, 0);
-    
-    _passwordLineEdit = new QLineEdit(this);
-    _passwordLineEdit->setEchoMode(QLineEdit::Password);
-
-    QLabel* passwordLabel = new QLabel(this);
-    passwordLabel->setText("Password");
-    passwordLabel->setBuddy(_passwordLineEdit);
-    
-    formGridLayout->addWidget(passwordLabel, 2, 0);
-    formGridLayout->addWidget(_passwordLineEdit, 3, 0);
-    
-    QDialogButtonBox* buttons = new QDialogButtonBox(this);
-    
-    QPushButton* okButton = buttons->addButton(QDialogButtonBox::Ok);
-    QPushButton* cancelButton = buttons->addButton(QDialogButtonBox::Cancel);
-    
-    okButton->setText("Login");
-    
-    connect(cancelButton, &QPushButton::clicked, this, &QDialog::close);
-    connect(okButton, &QPushButton::clicked, this, &LoginDialog::loginButtonClicked);
-    
-    formGridLayout->addWidget(buttons, 4, 0, 1, 2);
-    
-    setLayout(formGridLayout);
-}
-
-void LoginDialog::loginButtonClicked() {
-    emit credentialsEntered(_usernameLineEdit->text(), _passwordLineEdit->text());
-    close();
-}
diff --git a/gvr-interface/src/LoginDialog.h b/gvr-interface/src/LoginDialog.h
deleted file mode 100644
index 13f630818d..0000000000
--- a/gvr-interface/src/LoginDialog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  LoginDialog.h
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 2015-02-03.
-//  Copyright 2015 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#ifndef hifi_LoginDialog_h
-#define hifi_LoginDialog_h
-
-#include <QtWidgets/QDialog>
-
-class QLineEdit;
-
-class LoginDialog : public QDialog {
-    Q_OBJECT
-public:
-    LoginDialog(QWidget* parent = 0);
-signals:
-    void credentialsEntered(const QString& username, const QString& password);
-private slots:
-    void loginButtonClicked();
-private:
-    void setupGUI();
-    
-    QLineEdit* _usernameLineEdit;
-    QLineEdit* _passwordLineEdit;
-};
-
-#endif // hifi_LoginDialog_h
\ No newline at end of file
diff --git a/gvr-interface/src/RenderingClient.cpp b/gvr-interface/src/RenderingClient.cpp
deleted file mode 100644
index 4c691a48e6..0000000000
--- a/gvr-interface/src/RenderingClient.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//
-//  RenderingClient.cpp
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/20/15.
-//  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 "RenderingClient.h"
-
-#include <QtCore/QThread>
-#include <QtWidgets/QInputDialog>
-
-#include <AddressManager.h>
-#include <AudioClient.h>
-#include <AvatarHashMap.h>
-#include <NodeList.h>
-
-RenderingClient* RenderingClient::_instance = NULL;
-
-RenderingClient::RenderingClient(QObject *parent, const QString& launchURLString) :
-    Client(parent)
-{
-    _instance = this;
-    
-    // connect to AddressManager and pass it the launch URL, if we have one
-    auto addressManager = DependencyManager::get<AddressManager>();
-    connect(addressManager.data(), &AddressManager::locationChangeRequired, this, &RenderingClient::goToLocation);
-    addressManager->loadSettings(launchURLString);
-    
-    // tell the NodeList which node types all rendering clients will want to know about
-    DependencyManager::get<NodeList>()->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer);
-
-    DependencyManager::set<AvatarHashMap>();
-    
-    // get our audio client setup on its own thread
-    auto audioClient = DependencyManager::set<AudioClient>();
-    audioClient->setPositionGetter(getPositionForAudio);
-    audioClient->setOrientationGetter(getOrientationForAudio);
-    audioClient->startThread();
-    
-   
-    connect(&_avatarTimer, &QTimer::timeout, this, &RenderingClient::sendAvatarPacket);
-    _avatarTimer.setInterval(16); // 60 FPS
-    _avatarTimer.start();
-    _fakeAvatar.setDisplayName("GearVR");
-    _fakeAvatar.setFaceModelURL(QUrl(DEFAULT_HEAD_MODEL_URL));
-    _fakeAvatar.setSkeletonModelURL(QUrl(DEFAULT_BODY_MODEL_URL));
-    _fakeAvatar.toByteArray(); // Creates HeadData
-}
-
-void RenderingClient::sendAvatarPacket() {
-    _fakeAvatar.setPosition(_position);
-    _fakeAvatar.setHeadOrientation(_orientation);
-
-    QByteArray packet = byteArrayWithPopulatedHeader(PacketTypeAvatarData);
-    packet.append(_fakeAvatar.toByteArray());
-    DependencyManager::get<NodeList>()->broadcastToNodes(packet, NodeSet() << NodeType::AvatarMixer);
-    _fakeAvatar.sendIdentityPacket();
-}
-
-void RenderingClient::cleanupBeforeQuit() {
-    DependencyManager::get<AudioClient>()->cleanupBeforeQuit();
-    // destroy the AudioClient so it and its thread will safely go down
-    DependencyManager::destroy<AudioClient>();
-}
-
-void RenderingClient::processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket) {
-    auto nodeList = DependencyManager::get<NodeList>();
-    PacketType incomingType = packetTypeForPacket(incomingPacket);
-    
-    switch (incomingType) {
-        case PacketTypeAudioEnvironment:
-        case PacketTypeAudioStreamStats:
-        case PacketTypeMixedAudio:
-        case PacketTypeSilentAudioFrame: {
-        
-            if (incomingType == PacketTypeAudioStreamStats) {
-                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioStreamStatsPacket",
-                                          Qt::QueuedConnection,
-                                          Q_ARG(QByteArray, incomingPacket));
-            } else if (incomingType == PacketTypeAudioEnvironment) {
-                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "parseAudioEnvironmentData",
-                                          Qt::QueuedConnection,
-                                          Q_ARG(QByteArray, incomingPacket));
-            } else {
-                QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "addReceivedAudioToStream",
-                                          Qt::QueuedConnection,
-                                          Q_ARG(QByteArray, incomingPacket));
-            }
-        
-            // update having heard from the audio-mixer and record the bytes received
-            SharedNodePointer audioMixer = nodeList->sendingNodeForPacket(incomingPacket);
-        
-            if (audioMixer) {
-                audioMixer->setLastHeardMicrostamp(usecTimestampNow());
-            }
-        
-            break;
-        }
-        case PacketTypeBulkAvatarData:
-        case PacketTypeKillAvatar:
-        case PacketTypeAvatarIdentity:
-        case PacketTypeAvatarBillboard: {
-            // update having heard from the avatar-mixer and record the bytes received
-            SharedNodePointer avatarMixer = nodeList->sendingNodeForPacket(incomingPacket);
-        
-            if (avatarMixer) {
-                avatarMixer->setLastHeardMicrostamp(usecTimestampNow());
-            
-                QMetaObject::invokeMethod(DependencyManager::get<AvatarHashMap>().data(),
-                                          "processAvatarMixerDatagram",
-                                          Q_ARG(const QByteArray&, incomingPacket),
-                                          Q_ARG(const QWeakPointer<Node>&, avatarMixer));
-            }
-            break;
-        }
-        default:
-            Client::processVerifiedPacket(senderSockAddr, incomingPacket);
-            break;
-    }
-}
-
-void RenderingClient::goToLocation(const glm::vec3& newPosition,
-                                   bool hasOrientationChange, const glm::quat& newOrientation,
-                                   bool shouldFaceLocation) {
-    qDebug().nospace() << "RenderingClient goToLocation - moving to " << newPosition.x << ", "
-       << newPosition.y << ", " << newPosition.z;
-
-    glm::vec3 shiftedPosition = newPosition;
-
-    if (hasOrientationChange) {
-       qDebug().nospace() << "RenderingClient goToLocation - new orientation is "
-           << newOrientation.x << ", " << newOrientation.y << ", " << newOrientation.z << ", " << newOrientation.w;
-
-       // orient the user to face the target
-       glm::quat quatOrientation = newOrientation;
-
-       if (shouldFaceLocation) {
-
-           quatOrientation = newOrientation * glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
-
-           // move the user a couple units away
-           const float DISTANCE_TO_USER = 2.0f;
-           shiftedPosition = newPosition - quatOrientation * glm::vec3( 0.0f, 0.0f,-1.0f) * DISTANCE_TO_USER;
-       }
-
-       _orientation = quatOrientation;
-    }
-
-    _position = shiftedPosition;
-    
-}
diff --git a/gvr-interface/src/RenderingClient.h b/gvr-interface/src/RenderingClient.h
deleted file mode 100644
index c4724bc086..0000000000
--- a/gvr-interface/src/RenderingClient.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  RenderingClient.h
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 1/20/15.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-
-#ifndef hifi_RenderingClient_h
-#define hifi_RenderingClient_h
-
-#include <glm/glm.hpp>
-#include <glm/gtc/quaternion.hpp>
-
-#include <QTimer>
-
-#include <AvatarData.h>
-
-#include "Client.h"
-
-class RenderingClient : public Client {
-    Q_OBJECT
-public:
-    RenderingClient(QObject* parent = 0, const QString& launchURLString = QString());
-    
-    const glm::vec3& getPosition() const { return _position; }
-    const glm::quat& getOrientation() const { return _orientation; }
-    void setOrientation(const glm::quat& orientation) { _orientation = orientation; }
-    
-    static glm::vec3 getPositionForAudio() { return _instance->getPosition(); }
-    static glm::quat getOrientationForAudio() { return _instance->getOrientation(); }
-    
-    virtual void cleanupBeforeQuit();
-    
-private slots:
-    void goToLocation(const glm::vec3& newPosition,
-                      bool hasOrientationChange, const glm::quat& newOrientation,
-                      bool shouldFaceLocation);
-    void sendAvatarPacket();
-    
-private:
-    virtual void processVerifiedPacket(const HifiSockAddr& senderSockAddr, const QByteArray& incomingPacket);
-    
-    static RenderingClient* _instance;
-    
-    glm::vec3 _position;
-    glm::quat _orientation;
-
-    QTimer _avatarTimer;
-    AvatarData _fakeAvatar;
-};
-
-#endif // hifi_RenderingClient_h
diff --git a/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java b/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java
deleted file mode 100644
index c7cbdd3dff..0000000000
--- a/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  InterfaceActivity.java
-//  gvr-interface/java
-//
-//  Created by Stephen Birarda on 1/26/15.
-//  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
-//
-
-package io.highfidelity.gvrinterface;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.WindowManager;
-import android.util.Log;
-import org.qtproject.qt5.android.bindings.QtActivity;
-
-public class InterfaceActivity extends QtActivity {
-    
-    public static native void handleHifiURL(String hifiURLString);
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        
-        // Get the intent that started this activity in case we have a hifi:// URL to parse
-        Intent intent = getIntent();
-        if (intent.getAction() == Intent.ACTION_VIEW) {
-            Uri data = intent.getData();
-        
-            if (data.getScheme().equals("hifi")) {
-                handleHifiURL(data.toString());
-            }
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/gvr-interface/src/main.cpp b/gvr-interface/src/main.cpp
deleted file mode 100644
index 26576393fb..0000000000
--- a/gvr-interface/src/main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  main.cpp
-//  gvr-interface/src
-//
-//  Created by Stephen Birarda on 11/17/14.
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "GVRMainWindow.h"
-#include "GVRInterface.h"
-
-int main(int argc, char* argv[]) {
-    GVRInterface app(argc, argv);
-    
-    GVRMainWindow mainWindow;
-#ifdef ANDROID
-    mainWindow.showFullScreen();
-#else
-    mainWindow.showMaximized();
-#endif
-    
-    app.setMainWindow(&mainWindow);
-    
-    return app.exec();
-}
\ No newline at end of file
diff --git a/gvr-interface/templates/InterfaceBetaActivity.java.in b/gvr-interface/templates/InterfaceBetaActivity.java.in
deleted file mode 100644
index 6698cfa409..0000000000
--- a/gvr-interface/templates/InterfaceBetaActivity.java.in
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//  InterfaceBetaActivity.java
-//  gvr-interface/java
-//
-//  Created by Stephen Birarda on 1/27/15.
-//  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
-//
-
-package io.highfidelity.gvrinterface;
-
-import android.os.Bundle;
-import net.hockeyapp.android.CrashManager;
-import net.hockeyapp.android.UpdateManager;
-
-public class InterfaceBetaActivity extends InterfaceActivity {
-    
-    public String _hockeyAppID;
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        _hockeyAppID = getString(R.string.HockeyAppID);
-        
-        checkForUpdates();
-    }
-    
-    @Override
-    protected void onPause() {
-        super.onPause();
-        UpdateManager.unregister();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        checkForCrashes();
-    }
-
-    private void checkForCrashes() {
-        CrashManager.register(this, _hockeyAppID);
-    }
-
-    private void checkForUpdates() {
-        // Remove this for store / production builds!
-        UpdateManager.register(this, _hockeyAppID);
-    }
-}
\ No newline at end of file
diff --git a/gvr-interface/templates/hockeyapp.xml.in b/gvr-interface/templates/hockeyapp.xml.in
deleted file mode 100644
index edf2d0a8aa..0000000000
--- a/gvr-interface/templates/hockeyapp.xml.in
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-  <string name="HockeyAppID">${HOCKEY_APP_ID}</string>
-  <bool name="HockeyAppEnabled">${HOCKEY_APP_ENABLED}</bool>
-</resources>
diff --git a/hifi_android.py b/hifi_android.py
index 13c9cdccf2..2e6a42d127 100644
--- a/hifi_android.py
+++ b/hifi_android.py
@@ -52,6 +52,13 @@ ANDROID_PACKAGES = {
         'sharedLibFolder': 'VrApi/Libs/Android/arm64-v8a/Release',
         'includeLibs': ['libvrapi.so']
     },
+    'oculusPlatform': {
+        'file': 'OVRPlatformSDK_v1.32.0.zip',
+        'versionId': 'jG9DB16zOGxSrmtZy4jcQnwO0TJUuaeL',
+        'checksum': 'ab5b203b3a39a56ab148d68fff769e05',
+        'sharedLibFolder': 'Android/libs/arm64-v8a',
+        'includeLibs': ['libovrplatformloader.so']
+    },
     'openssl': {
         'file': 'openssl-1.1.0g_armv8.tgz',
         'versionId': 'AiiPjmgUZTgNj7YV1EEx2lL47aDvvvAW',
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index c013cfacd3..4eee6242ff 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -202,6 +202,10 @@ if (WIN32)
   set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
 endif()
 
+if (ANDROID)
+    set(PLATFORM_DISPLAY_PLUGINS oculusMobile oculusMobilePlugin)
+endif()
+
 # link required hifi libraries
 link_hifi_libraries(
   shared workload task octree ktx gpu gl procedural graphics graphics-scripting render
@@ -211,7 +215,10 @@ link_hifi_libraries(
   render-utils entities-renderer avatars-renderer ui qml auto-updater midi
   controllers plugins image trackers
   ui-plugins display-plugins input-plugins
+  # Platform specific GL libraries
   ${PLATFORM_GL_BACKEND}
+  # Plaform specific display plugins libraries 
+  ${PLATFORM_DISPLAY_PLUGINS}
   shaders
 )
 
@@ -265,7 +272,7 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
 endforeach()
 
 # include headers for interface and InterfaceConfig.
-include_directories("${PROJECT_SOURCE_DIR}/src")
+target_include_directories(${TARGET_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/src")
 
 if (ANDROID)
   find_library(ANDROID_LOG_LIB log)
@@ -276,7 +283,7 @@ target_link_libraries(
   ${TARGET_NAME}
   Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::Widgets
   Qt5::Qml Qt5::Quick Qt5::Script Qt5::Svg
-  Qt5::WebChannel
+  Qt5::WebChannel 
   ${PLATFORM_QT_LIBRARIES}
 )
 
diff --git a/interface/resources/qml/+android/StatText.qml b/interface/resources/qml/+android/StatText.qml
deleted file mode 100644
index 5dc8377030..0000000000
--- a/interface/resources/qml/+android/StatText.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-
-Text {
-    color: "white";
-    style: Text.Outline;
-    styleColor: "black";
-    font.pixelSize: 15;
-}
diff --git a/interface/resources/qml/+android/Stats.qml b/interface/resources/qml/+android/Stats.qml
deleted file mode 100644
index fe56f3797b..0000000000
--- a/interface/resources/qml/+android/Stats.qml
+++ /dev/null
@@ -1,410 +0,0 @@
-import Hifi 1.0 as Hifi
-import QtQuick 2.3
-import '.'
-
-Item {
-    id: stats
-
-    anchors.leftMargin: 300
-    objectName: "StatsItem"
-    property int modality: Qt.NonModal
-    implicitHeight: row.height
-    implicitWidth: row.width
-    visible: false
-
-    Component.onCompleted: {
-        stats.parentChanged.connect(fill);
-        fill();
-    }
-    Component.onDestruction: {
-        stats.parentChanged.disconnect(fill);
-    }
-
-    function fill() {
-        // This will cause a  warning at shutdown, need to find another way to remove
-        // the warning other than filling the anchors to the parent
-        anchors.horizontalCenter = parent.horizontalCenter
-    }
-
-    Hifi.Stats {
-        id: root
-        objectName: "Stats"
-        implicitHeight: row.height
-        implicitWidth: row.width
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        readonly property string bgColor: "#AA111111"
-
-        Row {
-            id: row
-            spacing: 8
-            Rectangle {
-                width: generalCol.width + 8;
-                height: generalCol.height + 8;
-                color: root.bgColor;
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: { root.expanded = !root.expanded; }
-                    hoverEnabled: true
-                }
-
-                Column {
-                    id: generalCol
-                    spacing: 4; x: 4; y: 4;
-                    StatText {
-                        text: "Servers: " + root.serverCount
-                    }
-                    StatText {
-                        text: "Avatars: " + root.avatarCount
-                    }
-                    StatText {
-                        text: "Game Rate: " + root.gameLoopRate
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: root.gameUpdateStats
-                    }
-                    StatText {
-                        text: "Render Rate: " + root.renderrate.toFixed(2);
-                    }
-                    StatText {
-                        text: "Present Rate: " + root.presentrate.toFixed(2);
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "    Present New Rate: " + root.presentnewrate.toFixed(2);
-                    }
-                    StatText {
-                        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: "Missed Frame Count: " + root.appdropped;
-                        visible: root.appdropped > 0;
-                    }
-                    StatText {
-                        text: "Long Render Count: " + root.longrenders;
-                        visible: root.longrenders > 0;
-                    }
-                    StatText {
-                        text: "Long Submit Count: " + root.longsubmits;
-                        visible: root.longsubmits > 0;
-                    }
-                    StatText {
-                        text: "Long Frame Count: " + root.longframes;
-                        visible: root.longframes > 0;
-                    }
-                    StatText {
-                        text: "Packets In/Out: " + root.packetInCount + "/" + root.packetOutCount
-                    }
-                    StatText {
-                        text: "Mbps In/Out: " + root.mbpsIn.toFixed(2) + "/" + root.mbpsOut.toFixed(2)
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "Asset Mbps In/Out: " + root.assetMbpsIn.toFixed(2) + "/" + root.assetMbpsOut.toFixed(2)
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "Avatars Updated: " + root.updatedAvatarCount
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "Avatars NOT Updated: " + root.notUpdatedAvatarCount
-                    }
-                }
-            }
-
-            Rectangle {
-                width: pingCol.width + 8
-                height: pingCol.height + 8
-                color: root.bgColor;
-                visible: root.audioPing != -2
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: { root.expanded = !root.expanded; }
-                    hoverEnabled: true
-                }
-                Column {
-                    id: pingCol
-                    spacing: 4; x: 4; y: 4;
-                    StatText {
-                        text: "Audio ping/loss: " + root.audioPing + "/" + root.audioPacketLoss + "%"
-                    }
-                    StatText {
-                        text: "Avatar ping: " + root.avatarPing
-                    }
-                    StatText {
-                        text: "Entities avg ping: " + root.entitiesPing
-                    }
-                    StatText {
-                        text: "Asset ping: " + root.assetPing
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Messages max ping: " + root.messagePing
-                    }
-                }
-            }
-
-            Rectangle {
-                width: geoCol.width + 8
-                height: geoCol.height + 8
-                color: root.bgColor;
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: { root.expanded = !root.expanded; }
-                    hoverEnabled: true
-                }
-                Column {
-                    id: geoCol
-                    spacing: 4; x: 4; y: 4;
-                    StatText {
-                        text: "Position: " + root.position.x.toFixed(1) + ", " +
-                            root.position.y.toFixed(1) + ", " + root.position.z.toFixed(1)
-                    }
-                    StatText {
-                        text: "Speed: " + root.speed.toFixed(1)
-                    }
-                    StatText {
-                        text: "Yaw: " + root.yaw.toFixed(1)
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Avatar Mixer In: " + root.avatarMixerInKbps + " kbps, " +
-                            root.avatarMixerInPps + "pps";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Avatar Mixer Out: " + root.avatarMixerOutKbps + " kbps, " +
-                            root.avatarMixerOutPps + "pps, " +
-                            root.myAvatarSendRate.toFixed(2) + "hz";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Audio Mixer In: " + root.audioMixerInKbps + " kbps, " +
-                            root.audioMixerInPps + "pps";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Audio Mixer Out: " + root.audioMixerOutKbps + " kbps, " +
-                        root.audioMixerOutPps + "pps";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Audio In Audio: " + root.audioAudioInboundPPS + " pps, " +
-                            "Silent: " + root.audioSilentInboundPPS + " pps";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Audio Out Mic: " + root.audioOutboundPPS + " pps, " +
-                            "Silent: " + root.audioSilentOutboundPPS + " pps";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        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 +
-                              ", Pending: " + root.downloadsPending;
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Processing: " + root.processing +
-                              ", Pending: " + root.processingPending;
-                    }
-                    StatText {
-                        visible: root.expanded && root.downloadUrls.length > 0;
-                        text: "Download URLs:"
-                    }
-                    ListView {
-                        width: geoCol.width
-                        height: root.downloadUrls.length * 15
-
-                        visible: root.expanded && root.downloadUrls.length > 0;
-
-                        model: root.downloadUrls
-                        delegate: StatText {
-                            visible: root.expanded;
-                            text: modelData.length > 30
-                                ?  modelData.substring(0, 5) + "..." + modelData.substring(modelData.length - 22)
-                                : modelData
-                        }
-                    }
-                }
-            }
-            Rectangle {
-                width: octreeCol.width + 8
-                height: octreeCol.height + 8
-                color: root.bgColor;
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: { root.expanded = !root.expanded; }
-                    hoverEnabled: true
-                }
-                Column {
-                    id: octreeCol
-                    spacing: 4; x: 4; y: 4;
-                    StatText {
-                        text: "Render Engine: " + root.engineFrameTime.toFixed(1) + " ms"
-                    }
-                    StatText {
-                        text: "Batch: " + root.batchFrameTime.toFixed(1) + " ms"
-                    }
-                    StatText {
-                        text: "GPU: " + root.gpuFrameTime.toFixed(1) + " ms"
-                    }
-                    StatText {
-                        text: "Drawcalls: " + root.drawcalls
-                    }
-                    StatText {
-                        text: "Triangles: " + root.triangles +
-                            " / Material Switches: " + root.materialSwitches
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "GPU Free Memory: " + root.gpuFreeMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "GPU Textures: ";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  Count: " + root.gpuTextures;
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  Pressure State: " + root.gpuTextureMemoryPressureState;
-                    }
-                    StatText {
-                        text: "  Resource Allocated / Populated / Pending: ";
-                    }
-                    StatText {
-                        text: "       " + root.gpuTextureResourceMemory + " / " + root.gpuTextureResourcePopulatedMemory + " / " + root.texturePendingTransfers + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  Resident Memory: " + root.gpuTextureResidentMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  Framebuffer Memory: " + root.gpuTextureFramebufferMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  External Memory: " + root.gpuTextureExternalMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "GPU Buffers: "
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  Count: " + root.gpuBuffers;
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "  Memory: " + root.gpuBufferMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "GL Swapchain Memory: " + root.glContextSwapchainMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "QML Texture Memory: " + root.qmlTextureMemory + " MB";
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Items rendered / considered: " +
-                            root.itemRendered + " / " + root.itemConsidered;
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: " out of view: " + root.itemOutOfView +
-                            " too small: " + root.itemTooSmall;
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: "Shadows rendered / considered: " +
-                            root.shadowRendered + " / " + root.shadowConsidered;
-                    }
-                    StatText {
-                        visible: root.expanded;
-                        text: " out of view: " + root.shadowOutOfView +
-                            " too small: " + root.shadowTooSmall;
-                    }
-                    StatText {
-                        visible: !root.expanded
-                        text: "Octree Elements Server: " + root.serverElements +
-                            " Local: " + root.localElements;
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "Octree Sending Mode: " + root.sendingMode;
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "Octree Packets to Process: " + root.packetStats;
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "Octree Elements - ";
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "\tServer: " + root.serverElements +
-                            " Internal: " + root.serverInternal +
-                            " Leaves: " + root.serverLeaves;
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "\tLocal: " + root.localElements +
-                            " Internal: " + root.localInternal +
-                            " Leaves: " + root.localLeaves;
-                    }
-                    StatText {
-                        visible: root.expanded
-                        text: "LOD: " + root.lodStatus;
-                    }
-                }
-            }
-        }
-
-        Rectangle {
-            y: 250
-            visible: root.timingExpanded
-            width: perfText.width + 8
-            height: perfText.height + 8
-            color: root.bgColor;
-            StatText {
-                x: 4; y: 4
-                id: perfText
-                font.family: root.monospaceFont
-                text: "------------------------------------------ Function " +
-                    "--------------------------------------- --msecs- -calls--\n" +
-                    root.timingStats;
-            }
-        }
-
-        Connections {
-            target: root.parent
-            onWidthChanged: {
-                root.x = root.parent.width - root.width;
-            }
-        }
-    }
-
-}
diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index 4ddee15a10..cf75f7bff6 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
 import QtWebChannel 1.0
-import QtWebEngine 1.5
+import QtWebView 1.1
 
 import controlsUit 1.0
 import "styles" as HifiStyles
@@ -207,24 +207,6 @@ ScrollingWindow {
             url: "https://highfidelity.com/"
             profile: FileTypeProfile;
 
-            // Create a global EventBridge object for raiseAndLowerKeyboard.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.Deferred
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // Detect when may want to raise and lower keyboard.
-            WebEngineScript {
-                id: raiseAndLowerKeyboard
-                injectionPoint: WebEngineScript.Deferred
-                sourceUrl: resourceDirectoryUrl + "/html/raiseAndLowerKeyboard.js"
-                worldId: WebEngineScript.MainWorld
-            }
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard ]
-
             anchors.top: buttons.bottom
             anchors.topMargin: 8
             anchors.bottom: parent.bottom
@@ -242,7 +224,7 @@ ScrollingWindow {
             }
 
             onLoadingChanged: {
-                if (loadRequest.status === WebEngineView.LoadSucceededStatus) {
+                if (loadRequest.status === WebView.LoadSucceededStatus) {
                     addressBar.text = loadRequest.url
                 }
                 root.loadingChanged(loadRequest.status);
diff --git a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
deleted file mode 100644
index a40110b1e9..0000000000
--- a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
+++ /dev/null
@@ -1,292 +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 controlsUit 1.0
-import stylesUit 1.0
-
-Item {
-    id: linkAccountBody
-
-    clip: true
-    height: 300
-    width: root.pane.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
-        readonly property int minWidth: 1440
-        readonly property int maxWidth: 3840
-        readonly property int minHeight: 150
-        readonly property int maxHeight: 660
-
-        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;
-
-            if (additionalInformation.visible) {
-                targetWidth = Math.max(targetWidth, additionalInformation.width);
-                targetHeight += hifi.dimensions.contentSpacing.y + additionalInformation.height
-            }
-
-            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
-            parent.height = 420;
-            /*root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
-                    + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y);*/
-        }
-    }
-
-    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: 144
-        height: 144
-    }
-
-    ShortcutText {
-        id: mainTextContainer
-        anchors {
-            top: parent.top
-            left: parent.left
-            margins: 0
-            topMargin: hifi.dimensions.contentSpacing.y / 2
-        }
-
-        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: 0 //  hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.y / 2
-
-        TextField {
-            id: usernameField
-            anchors {
-                  horizontalCenter: parent.horizontalCenter
-            }
-            width: 1080
-            placeholderText: qsTr("Username or Email")
-        }
-
-        TextField {
-            id: passwordField
-            anchors {
-                  horizontalCenter: parent.horizontalCenter
-            }
-            width: 1080
-
-            placeholderText: qsTr("Password")
-            echoMode: TextInput.Password
-
-            Keys.onReturnPressed: linkAccountBody.login()
-        }
-    }
-
-    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: 3
-        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
-            top: form.bottom
-            topMargin: hifi.dimensions.contentSpacing.y / 2
-        }
-
-        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
-            top: form.bottom
-            topMargin: hifi.dimensions.contentSpacing.y / 2
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Login")
-            color: hifi.buttons.blue
-
-            onClicked: {
-                Qt.inputMethod.hide();
-                linkAccountBody.login();
-            }
-        }
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Cancel")
-
-            onClicked: {
-                Qt.inputMethod.hide();
-                root.tryDestroy();
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        root.title = qsTr("Sign Into High Fidelity")
-        root.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 })
-                bodyLoader.item.width = root.pane.width
-                bodyLoader.item.height = root.pane.height
-            }
-        }
-        onHandleLoginFailed: {
-            console.log("Login Failed")
-            mainTextContainer.visible = true
-            toggleLoading(false)
-        }
-        onHandleLinkCompleted: {
-            console.log("Link Succeeded")
-
-            bodyLoader.setSource("../WelcomeBody.qml", { "welcomeBack" : true })
-            bodyLoader.item.width = root.pane.width
-            bodyLoader.item.height = root.pane.height
-        }
-        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/LoginDialog/+android/SignUpBody.qml b/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
deleted file mode 100644
index 10909e4c85..0000000000
--- a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
+++ /dev/null
@@ -1,297 +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 controlsUit 1.0
-import stylesUit 1.0
-
-Item {
-    id: signupBody
-
-    clip: true
-    height: root.pane.height
-    width: root.pane.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
-        readonly property int minWidth: 960
-        readonly property int maxWidth: 2560
-        readonly property int minHeight: 240
-        readonly property int maxHeight: 1480
-
-        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;
-
-            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
-            //parent.height = 650;
-            parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight));
-                
-        }
-    }
-
-    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: 0; // 2 * hifi.dimensions.contentSpacing.y
-        }
-        spacing: hifi.dimensions.contentSpacing.y / 2
-
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: emailField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 780
-
-                placeholderText: "Email"
-            }
-        }
-
-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: usernameField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 780
-
-                placeholderText: "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: 780
-
-                placeholderText: "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
-            top: form.bottom
-            topMargin: hifi.dimensions.contentSpacing.y// / 2
-        }
-
-        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
-            top: form.bottom
-            topMargin: hifi.dimensions.contentSpacing.y / 2
-        }
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-
-            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;
-        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 })
-            bodyLoader.item.width = root.pane.width
-            bodyLoader.item.height = root.pane.height
-        }
-        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
-        }
-    }
-
-    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/QmlWebWindow.qml b/interface/resources/qml/QmlWebWindow.qml
index 322535641d..d639ed15d6 100644
--- a/interface/resources/qml/QmlWebWindow.qml
+++ b/interface/resources/qml/QmlWebWindow.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import QtWebEngine 1.1
+import QtWebView 1.1
 import QtWebChannel 1.0
 
 import "windows" as Windows
@@ -62,36 +62,9 @@ Windows.ScrollingWindow {
             url: "about:blank"
             anchors.fill: parent
             focus: true
-            profile: HFWebEngineProfile;
 
             property string userScriptUrl: ""
 
-            // Create a global EventBridge object for raiseAndLowerKeyboard.
-            WebEngineScript {
-                id: createGlobalEventBridge
-                sourceCode: eventBridgeJavaScriptToInject
-                injectionPoint: WebEngineScript.DocumentCreation
-                worldId: WebEngineScript.MainWorld
-            }
-
-            // Detect when may want to raise and lower 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
-            }
-
-            userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
-
             function onWebEventReceived(event) {
                 if (event.slice(0, 17) === "CLARA.IO DOWNLOAD") {
                     ApplicationInterface.addAssetToWorldFromURL(event.slice(18));
diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index 720a904231..523f5f3e54 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
 import QtWebChannel 1.0
-import QtWebEngine 1.5
+import QtWebView 1.1
 
 import "controls"
 import controlsUit 1.0 as HifiControls
@@ -30,7 +30,7 @@ Item {
         webview.profile = profile;
     }
 
-    WebEngineView {
+    WebView {
         id: webview
         objectName: "webEngineView"
         x: 0
@@ -38,36 +38,8 @@ Item {
         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: webview.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: {
@@ -83,17 +55,13 @@ Item {
             web.address = url;
         }
 
-        onFeaturePermissionRequested: {
-            grantFeaturePermission(securityOrigin, feature, true);
-        }
-
         onLoadingChanged: {
             keyboardRaised = false;
             punctuationMode = false;
             keyboard.resetShiftMode(false);
 
             // Required to support clicking on "hifi://" links
-            if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+            if (WebView.LoadStartedStatus == loadRequest.status) {
                 urlAppend(loadRequest.url.toString())
                 var url = loadRequest.url.toString();
                 if (urlHandler.canHandleUrl(url)) {
diff --git a/interface/resources/qml/Web3DSurface.qml b/interface/resources/qml/Web3DSurface.qml
index fdd5d8a7c6..4281755447 100644
--- a/interface/resources/qml/Web3DSurface.qml
+++ b/interface/resources/qml/Web3DSurface.qml
@@ -1,7 +1,7 @@
 //
 //  Web3DOverlay.qml
 //
-//  Created by David Rowe on 16 Dec 2016.
+//  Created by Gabriel Calero & Cristian Duarte on Jun 22, 2018
 //  Copyright 2016 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
@@ -9,23 +9,68 @@
 //
 
 import QtQuick 2.5
+import QtGraphicalEffects 1.0
 
-import "controls" as Controls
+Item {
 
-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));
+    property string url
+    RadialGradient {
+        anchors.fill: parent
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#262626" }
+            GradientStop { position: 1.0; color: "#000000" }
         }
     }
 
-    Component.onCompleted: {
-        eventBridge.webEventReceived.connect(onWebEventReceived);
+    function shortUrl(url) {
+        var hostBegin = url.indexOf("://");
+        if (hostBegin > -1) {
+            url = url.substring(hostBegin + 3);
+        }
+
+        var portBegin = url.indexOf(":");
+        if (portBegin > -1) {
+            url = url.substring(0, portBegin);
+        }
+
+        var pathBegin = url.indexOf("/");
+        if (pathBegin > -1) {
+            url = url.substring(0, pathBegin);
+        }
+
+        if (url.length > 45) {
+            url = url.substring(0, 45);
+        }
+
+        return url;
     }
-}
+
+    Text { 
+        id: urlText
+        text: shortUrl(url)
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        anchors.fill: parent
+        anchors.rightMargin: 10
+        anchors.leftMargin: 10
+        font.family: "Cairo"
+        font.weight: Font.DemiBold
+        font.pointSize: 48
+        fontSizeMode: Text.Fit
+        color: "#FFFFFF"
+        minimumPixelSize: 5
+    }
+
+    Image {
+        id: hand
+        source: "../../icons/hand.svg"
+        width: 300
+        height: 300
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.bottomMargin: 100
+        anchors.rightMargin: 100
+    }
+
+
+}
\ No newline at end of file
diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 823d0107a2..b767b24a94 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtWebEngine 1.5
+import QtWebView 1.1
 import QtWebChannel 1.0
 
 import QtQuick.Controls 2.2
@@ -67,7 +67,7 @@ Item {
     }
 
     function onLoadingChanged(loadRequest) {
-        if (WebEngineView.LoadStartedStatus === loadRequest.status) {
+        if (WebView.LoadStartedStatus === loadRequest.status) {
 
             // Required to support clicking on "hifi://" links
             var url = loadRequest.url.toString();
@@ -79,52 +79,25 @@ Item {
             }
         }
 
-        if (WebEngineView.LoadFailedStatus === loadRequest.status) {
-            console.log("Tablet WebEngineView failed to load url: " + loadRequest.url.toString());
+        if (WebView.LoadFailedStatus === loadRequest.status) {
+            console.log("Tablet Web View failed to load url: " + loadRequest.url.toString());
         }
 
-        if (WebEngineView.LoadSucceededStatus === loadRequest.status) {
+        if (WebView.LoadSucceededStatus === loadRequest.status) {
             //disable Chromium's scroll bars
         }
     }
 
-    WebEngineView {
+    WebView {
         id: webViewCore
 
         width: parent.width
         height: parent.height
 
-        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 ]
-
         Component.onCompleted: {
             webChannel.registerObject("eventBridge", eventBridge);
             webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index 3959dbf01b..9cbbd48a22 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.7
-import QtWebEngine 1.5
 import controlsUit 1.0 as HiFiControls
 import "../styles" as HifiStyles
 import stylesUit 1.0
diff --git a/interface/resources/qml/controlsUit/+android/ImageButton.qml b/interface/resources/qml/controlsUit/+android/ImageButton.qml
deleted file mode 100644
index 88eaf95d76..0000000000
--- a/interface/resources/qml/controlsUit/+android/ImageButton.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-//  ImageButton.qml
-//  interface/resources/qml/controlsUit
-//
-//  Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import QtQuick 2.5
-import QtQuick.Layouts 1.3
-import "../stylesUit" as HifiStyles
-
-Item {
-    id: button
-
-    property string text: ""
-    property string source : ""
-    property string hoverSource : ""
-    property real fontSize: 10
-    property string fontColor: "#FFFFFF"
-    property string hoverFontColor: "#000000"
-
-    signal clicked();
-
-    Rectangle {
-        color: "transparent"
-        anchors.fill: parent
-        Image {
-            id: image
-            anchors.fill: parent
-            source: button.source
-        }
-
-        HifiStyles.FiraSansRegular {
-            id: buttonText
-            anchors.centerIn: parent
-            text: button.text
-            color: button.fontColor
-            font.pixelSize: button.fontSize
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: button.clicked();
-            onEntered: {
-                button.state = "hover state";
-            }
-            onExited: {
-                button.state = "base state";
-            }
-        }
-
-
-    }
-    states: [
-        State {
-            name: "hover state"
-            PropertyChanges {
-                target: image
-                source: button.hoverSource
-            }
-            PropertyChanges {
-                target: buttonText
-                color: button.hoverFontColor                    
-            }
-        },
-        State {
-            name: "base state"
-            PropertyChanges {
-                target: image
-                source: button.source
-            }
-            PropertyChanges {
-                target: buttonText
-                color: button.fontColor                    
-            }
-        }
-    ]
-}
diff --git a/interface/resources/qml/controlsUit/BaseWebView.qml b/interface/resources/qml/controlsUit/BaseWebView.qml
index fdd9c12220..6aae81d14d 100644
--- a/interface/resources/qml/controlsUit/BaseWebView.qml
+++ b/interface/resources/qml/controlsUit/BaseWebView.qml
@@ -9,9 +9,9 @@
 //
 
 import QtQuick 2.7
-import QtWebEngine 1.5
+import QtWebView 1.1
 
-WebEngineView {
+WebView {
     id: root
 
     Component.onCompleted: {
@@ -24,7 +24,7 @@ WebEngineView {
 
     onLoadingChanged: {
         // Required to support clicking on "hifi://" links
-        if (WebEngineView.LoadStartedStatus == loadRequest.status) {
+        if (WebView.LoadStartedStatus == loadRequest.status) {
             var url = loadRequest.url.toString();
             if (urlHandler.canHandleUrl(url)) {
                 if (urlHandler.handleUrl(url)) {
@@ -34,5 +34,11 @@ WebEngineView {
         }
     }
 
+    signal newViewRequested();
+    signal windowCloseRequested();
+    signal featurePermissionRequested();
+
+    property var profile: null;
+
     WebSpinner { }
 }
diff --git a/interface/resources/qml/controlsUit/WebSpinner.qml b/interface/resources/qml/controlsUit/WebSpinner.qml
index e8e01c4865..8f78a1e273 100644
--- a/interface/resources/qml/controlsUit/WebSpinner.qml
+++ b/interface/resources/qml/controlsUit/WebSpinner.qml
@@ -9,10 +9,10 @@
 //
 
 import QtQuick 2.5
-import QtWebEngine 1.5
+import QtWebView 1.1
 
 AnimatedImage {
-    property WebEngineView webview: parent
+    property WebView webview: parent
     source: "../../icons/loader-snake-64-w.gif"
     visible: webview.loading && /^(http.*|)$/i.test(webview.url.toString())
     playing: visible
diff --git a/interface/resources/qml/desktop/+android/FocusHack.qml b/interface/resources/qml/desktop/+android/FocusHack.qml
deleted file mode 100644
index 38253fdec1..0000000000
--- a/interface/resources/qml/desktop/+android/FocusHack.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  FocusHack.qml
-//
-//  Created by Bradley Austin Davis on 21 Jan 2015
-//  Copyright 2016 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import QtQuick 2.5
-
-FocusScope {
-    id: root
-    objectName: "FocusHack"
-
-    TextInput {
-        id: textInput;
-        focus: true
-        width: 10; height: 10
-        onActiveFocusChanged: root.destroy()
-    }
-
-    function start() {
-    }
-}
diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index a1b89e1529..7d71ecf1d9 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -425,11 +425,12 @@ FocusScope {
             console.warn("Could not find top level window for " + item);
             return;
         }
-
+/*
         if (typeof Controller === "undefined") {
             console.warn("Controller not yet available... can't center");
             return;
         }
+*/
 
         var newRecommendedRectJS = (typeof Controller === "undefined") ? Qt.rect(0,0,0,0) : Controller.getRecommendedHUDRect();
         var newRecommendedRect = Qt.rect(newRecommendedRectJS.x, newRecommendedRectJS.y,
@@ -455,15 +456,15 @@ FocusScope {
             console.warn("Could not find top level window for " + item);
             return;
         }
-
+/*
         if (typeof Controller === "undefined") {
             console.warn("Controller not yet available... can't reposition targetWindow:" + targetWindow);
             return;
         }
-
+*/
         var oldRecommendedRect = recommendedRect;
         var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
-        var newRecommendedRect = Controller.getRecommendedHUDRect();
+        var newRecommendedRect = { width: 1280, height: 720, x: 0, y: 0 };
         var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
         repositionWindow(targetWindow, false, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
     }
@@ -480,7 +481,7 @@ FocusScope {
             return;
         }
 
-        var recommended = Controller.getRecommendedHUDRect();
+        var recommended = { width: 1280, height: 720, x: 0, y: 0 }; //Controller.getRecommendedHUDRect();
         var maxX = recommended.x + recommended.width;
         var maxY = recommended.y + recommended.height;
         var newPosition = Qt.vector2d(targetWindow.x, targetWindow.y);
diff --git a/interface/resources/qml/hifi/+android/ActionBar.qml b/interface/resources/qml/hifi/+android/ActionBar.qml
deleted file mode 100644
index 3c58156f30..0000000000
--- a/interface/resources/qml/hifi/+android/ActionBar.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-import Qt.labs.settings 1.0
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControlsUit
-import "../../controls" as HifiControls
-import ".."
-
-Item {
-    id: actionBar
-    x:0
-    y:0
-    width: 300
-    height: 300
-    z: -1
-
-    signal sendToScript(var message);
-    signal windowClosed();
-    
-    property bool shown: true
-
-    onShownChanged: {
-        actionBar.visible = shown;
-    }
-
-	Rectangle {
-        anchors.fill : parent
-        color: "transparent"
-        Flow {
-            id: flowMain
-            spacing: 10
-            flow: Flow.TopToBottom
-            layoutDirection: Flow.TopToBottom
-            anchors.fill: parent
-            anchors.margins: 4
-        }
-    }
-
-    Component.onCompleted: {
-        // put on bottom
-        x = 7;
-        y = 7;
-        width = 300;
-        height = 300;
-    }
-    
-    function addButton(properties) {
-        var component = Qt.createComponent("button.qml");
-        if (component.status == Component.Ready) {
-            var button = component.createObject(flowMain);
-            // copy all properites to button
-            var keys = Object.keys(properties).forEach(function (key) {
-                button[key] = properties[key];
-            });
-            return button;
-        } else if( component.status == Component.Error) {
-            console.log("Load button errors " + component.errorString());
-        }
-    }
-
-    function urlHelper(src) {
-            if (src.match(/\bhttp/)) {
-                return src;
-            } else {
-                return "../../../" + src;
-            }
-        }
-
-}
diff --git a/interface/resources/qml/hifi/+android/AudioBar.qml b/interface/resources/qml/hifi/+android/AudioBar.qml
deleted file mode 100644
index 912572fdf8..0000000000
--- a/interface/resources/qml/hifi/+android/AudioBar.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-import Qt.labs.settings 1.0
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControlsUit
-import "../../controls" as HifiControls
-import ".."
-
-Item {
-    id: bar
-    x:0
-    y:0
-    width: 300
-    height: 300
-    z: -1
-
-    signal sendToScript(var message);
-    signal windowClosed();
-    
-    property bool shown: true
-
-    onShownChanged: {
-        bar.visible = shown;
-    }
-
-	Rectangle {
-        anchors.fill : parent
-        color: "transparent"
-        Flow {
-            id: flowMain
-            spacing: 10
-            flow: Flow.TopToBottom
-            layoutDirection: Flow.TopToBottom
-            anchors.fill: parent
-            anchors.margins: 4
-        }
-    }
-
-    function relocateAndResize(newWindowWidth, newWindowHeight) {
-        x = newWindowWidth-328;
-        y = 19;
-        width = 300;
-        height = 300;
-    }
-
-    function onWindowGeometryChanged(rect) {
-        relocateAndResize(rect.width, rect.height);
-    }
-
-    Component.onCompleted: {
-        relocateAndResize(parent.width, parent.height);
-        Window.geometryChanged.connect(onWindowGeometryChanged); // In devices with bars appearing at startup we should listen for this
-    }
-
-    Component.onDestruction: {
-        Window.geometryChanged.disconnect(onWindowGeometryChanged);
-    }
-
-    
-    function addButton(properties) {
-        var component = Qt.createComponent("button.qml");
-        if (component.status == Component.Ready) {
-            var button = component.createObject(flowMain);
-            // copy all properites to button
-            var keys = Object.keys(properties).forEach(function (key) {
-                button[key] = properties[key];
-            });
-            return button;
-        } else if( component.status == Component.Error) {
-            console.log("Load button errors " + component.errorString());
-        }
-    }
-
-    function urlHelper(src) {
-            if (src.match(/\bhttp/)) {
-                return src;
-            } else {
-                return "../../../" + src;
-            }
-        }
-
-}
diff --git a/interface/resources/qml/hifi/+android/AvatarOption.qml b/interface/resources/qml/hifi/+android/AvatarOption.qml
deleted file mode 100644
index 7eba3c2a67..0000000000
--- a/interface/resources/qml/hifi/+android/AvatarOption.qml
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-//  AvatarOption.qml
-//  interface/resources/qml/hifi/android
-//
-//  Created by Cristian Duarte & Gabriel Calero on 12 Oct 2017
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import QtQuick.Layouts 1.3
-import QtQuick 2.5
-import controlsUit 1.0 as HifiControlsUit
-
-ColumnLayout {
-    id: itemRoot
-
-    property string type: "";
-
-    property string thumbnailUrl: "";
-    property string avatarUrl: "";
-    property string avatarName: "";
-    property bool avatarSelected: false;
-
-    property string methodName: "";
-    property string actionText: "";
-
-    spacing: 4 * 3
-    signal sendToParentQml(var message);
-
-    Image {
-        id: itemImage
-        Layout.preferredWidth: 250 * 3
-        Layout.preferredHeight: 140 * 3
-        source: thumbnailUrl
-        asynchronous: true
-        fillMode: Image.PreserveAspectFit
-
-        MouseArea {
-            id: itemArea
-            anchors.fill: parent
-            hoverEnabled: true
-            enabled: true
-            onClicked: {
-                if (type=="avatar") {
-                    if (!avatarSelected) sendToParentQml({ method: "selectAvatar", params: { avatarUrl: avatarUrl } }); 
-                } else {
-                    sendToParentQml({ method: methodName, params: {  } });
-                }
-            }
-        }
-
-    }
-
-    Text {
-        id: itemName
-        text: avatarName
-        color: "#FFFFFF"
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        anchors.horizontalCenter: itemImage.horizontalCenter
-        font.pointSize: 5*3
-        wrapMode: Text.WordWrap
-        width: parent
-        MouseArea {
-            id: itemNameArea
-            anchors.fill: parent
-            hoverEnabled: true
-            enabled: true
-            onClicked: {
-                if (type=="avatar") {
-                    if (!avatarSelected) sendToParentQml({ method: "selectAvatar", params: { avatarUrl: avatarUrl } }); 
-                } else {
-                    sendToParentQml({ method: methodName, params: {  } });
-                }
-            }
-        }
-    }
-
-    HifiControlsUit.ImageButton {
-        width: 140*3
-        height: 35*3
-        text: type=="extra" ? actionText: "CHOOSE"
-        source: "../../../../icons/button.svg"
-        hoverSource: "../../../../icons/button-a.svg"
-        fontSize: 18*3
-        fontColor: "#2CD8FF"
-        hoverFontColor: "#FFFFFF"
-        anchors {
-            horizontalCenter: itemName.horizontalCenter
-        }
-        visible: !avatarSelected
-        onClicked: {
-            if (type=="avatar") {
-                if (!avatarSelected) sendToParentQml({ method: "selectAvatar", params: { avatarUrl: avatarUrl } }); 
-            } else {
-                sendToParentQml({ method: methodName, params: {  } });
-            }
-        }
-    }
-
-    Image {
-        id: tickImage
-        width: 35 * 3
-        height: 35 * 3
-        source: "../../../icons/tick.svg"
-        anchors {
-            horizontalCenter: itemName.horizontalCenter
-        }
-        visible: avatarSelected
-    }
-
-    Component.onCompleted:{
-        sendToParentQml.connect(sendToScript);
-    }
-}
diff --git a/interface/resources/qml/hifi/+android/Desktop.qml b/interface/resources/qml/hifi/+android/Desktop.qml
deleted file mode 100644
index 99d792b664..0000000000
--- a/interface/resources/qml/hifi/+android/Desktop.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-import Qt.labs.settings 1.0
-
-import "../desktop" as OriginalDesktop
-import ".."
-import "."
-import "./toolbars"
-
-OriginalDesktop.Desktop {
-    id: desktop
-
-    MouseArea {
-        id: hoverWatch
-        anchors.fill: parent
-        hoverEnabled: true
-        propagateComposedEvents: true
-        scrollGestureEnabled: false // we don't need/want these
-        onEntered: ApplicationCompositor.reticleOverDesktop = true
-        onExited: ApplicationCompositor.reticleOverDesktop = false
-        acceptedButtons: Qt.NoButton
-		
-
-    }
-
-
-    Component { id: toolbarBuilder; Toolbar { } }
-    // This used to create sysToolbar dynamically with a call to getToolbar() within onCompleted.
-    // Beginning with QT 5.6, this stopped working, as anything added to toolbars too early got
-    // wiped during startup.
-    Toolbar {
-        id: sysToolbar;
-        objectName: "com.highfidelity.interface.toolbar.system";
-        // Magic: sysToolbar.x and y come from settings, and are bound before the properties specified here are applied.
-        x: sysToolbar.x;
-        y: sysToolbar.y;
-    }
-    property var toolbars: (function (map) { // answer dictionary preloaded with sysToolbar
-        map[sysToolbar.objectName] = sysToolbar;
-        return map; })({});
-
-    Component.onCompleted: {
-    }
-
-    // Accept a download through the webview
-    property bool webViewProfileSetup: false
-    property string currentUrl: ""
-    property string adaptedPath: ""
-    property string tempDir: ""
-
-    // Create or fetch a toolbar with the given name
-    function getToolbar(name) {
-        var result = toolbars[name];
-        if (!result) {
-            result = toolbars[name] = toolbarBuilder.createObject(desktop, {});
-            result.objectName = name;
-        }
-        return result;
-    }
-}
-
-
diff --git a/interface/resources/qml/hifi/+android/HifiConstants.qml b/interface/resources/qml/hifi/+android/HifiConstants.qml
deleted file mode 100644
index 4c161da259..0000000000
--- a/interface/resources/qml/hifi/+android/HifiConstants.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-//  HifiAndroidConstants.qml
-//  interface/resources/qml/+android
-//
-//  Created by Gabriel Calero & Cristian Duarte on 23 Oct 2017
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import QtQuick 2.4
-import QtQuick.Window 2.2
-
-Item {
-
-    id: android
-
-    readonly property alias dimen: dimen
-    readonly property alias color: color
-
-    Item {
-        id: dimen
-        readonly property bool atLeast1440p: Screen.width >= 2560 && Screen.height >= 1440
-        readonly property real windowLessWidth: atLeast1440p ? 378 : 284
-        readonly property real windowLessHeight: atLeast1440p ? 192 : 144
-
-        readonly property real windowZ: 100
-
-        readonly property real headerHeight: atLeast1440p ? 276 : 207
-
-        readonly property real headerIconPosX: atLeast1440p ? 90 : 67
-        readonly property real headerIconPosY: atLeast1440p ? 108 : 81
-        readonly property real headerIconWidth: atLeast1440p ? 111 : 83
-        readonly property real headerIconHeight: atLeast1440p ? 111 : 83
-        readonly property real headerIconTitleDistance: atLeast1440p ? 151 : 113
-
-        readonly property real headerHideWidth: atLeast1440p ? 150 : 112
-        readonly property real headerHideHeight: atLeast1440p ? 150 : 112
-        readonly property real headerHideRightMargin: atLeast1440p ? 110 : 82
-        readonly property real headerHideTopMargin: atLeast1440p ? 90 : 67
-        readonly property real headerHideIconWidth: atLeast1440p ? 70 : 52
-        readonly property real headerHideIconHeight: atLeast1440p ? 45 : 33
-        readonly property real headerHideTextTopMargin: atLeast1440p ? 36 : 27
-
-        readonly property real botomHudWidth: 366
-        readonly property real botomHudHeight: 180
-
-    }
-
-    Item {
-        id: color
-        readonly property color gradientTop: "#4E4E4E"
-        readonly property color gradientBottom: "#242424"
-    }
-}
diff --git a/interface/resources/qml/hifi/+android/StatsBar.qml b/interface/resources/qml/hifi/+android/StatsBar.qml
deleted file mode 100644
index 64e93b4a08..0000000000
--- a/interface/resources/qml/hifi/+android/StatsBar.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-import Qt.labs.settings 1.0
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControlsUit
-import "../../controls" as HifiControls
-import ".."
-
-Item {
-    id: bar
-    x:300
-    y:0
-    width: 300
-    height: 300
-    z: -1
-
-    signal sendToScript(var message);
-    signal windowClosed();
-    
-    property bool shown: true
-
-    onShownChanged: {
-        bar.visible = shown;
-    }
-
-	Rectangle {
-        anchors.fill : parent
-        color: "transparent"
-        Flow {
-            id: flowMain
-            spacing: 10
-            flow: Flow.TopToBottom
-            layoutDirection: Flow.TopToBottom
-            anchors.fill: parent
-            anchors.margins: 4
-        }
-    }
-
-    Component.onCompleted: {
-        // put on bottom
-        x = 300;
-        y = 0;
-        width = 300;
-        height = 300;
-    }
-    
-    function addButton(properties) {
-        var component = Qt.createComponent("button.qml");
-        if (component.status == Component.Ready) {
-            var button = component.createObject(flowMain);
-            // copy all properites to button
-            var keys = Object.keys(properties).forEach(function (key) {
-                button[key] = properties[key];
-            });
-            return button;
-        } else if( component.status == Component.Error) {
-            console.log("Load button errors " + component.errorString());
-        }
-    }
-
-    function urlHelper(src) {
-            if (src.match(/\bhttp/)) {
-                return src;
-            } else {
-                return "../../../" + src;
-            }
-        }
-
-}
diff --git a/interface/resources/qml/hifi/+android/WindowHeader.qml b/interface/resources/qml/hifi/+android/WindowHeader.qml
deleted file mode 100644
index 5316fc4786..0000000000
--- a/interface/resources/qml/hifi/+android/WindowHeader.qml
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-//  WindowHeader.qml
-//  interface/resources/qml/android
-//
-//  Created by Gabriel Calero & Cristian Duarte on 23 Oct 2017
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-import Qt.labs.settings 1.0
-import "."
-import "../styles" as HifiStyles
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControlsUit
-import "../controls" as HifiControls
-import ".."
-
-
-// header
-Rectangle {
-    id: header
-
-    // properties
-    property string iconSource: ""
-    property string titleText: ""
-    property var extraItemInCenter: Item {}
-
-    HifiStyles.HifiConstants { id: hifiStylesConstants }
-
-    /*property var mockRectangle: Rectangle {
-        anchors.fill: parent
-        color: "#44FFFF00"
-    }*/
-    color: "#00000000"
-    //color: "#55FF0000"
-    width: parent.width
-    height: android.dimen.headerHeight
-    anchors.top : parent.top
-
-    Image {
-        id: windowIcon
-        source: iconSource
-        x: android.dimen.headerIconPosX
-        y: android.dimen.headerIconPosY
-        width: android.dimen.headerIconWidth
-        height: android.dimen.headerIconHeight
-    }
-
-    /*HifiStylesUit.*/FiraSansSemiBold {
-        id: windowTitle
-        x: windowIcon.x + android.dimen.headerIconTitleDistance
-        anchors.verticalCenter: windowIcon.verticalCenter
-        text: titleText
-        color: "#FFFFFF"
-        font.letterSpacing: 2
-        font.pixelSize: hifiStylesConstants.fonts.headerPixelSize * 2.15
-    }
-    Item {
-    	height: 60
-        anchors {
-            left: windowTitle.right
-            right: hideButton.left
-            verticalCenter: windowIcon.verticalCenter
-        }
-        children: [ extraItemInCenter/*, mockRectangle */]
-    }
-
-    Rectangle {
-        id: hideButton
-        height: android.dimen.headerHideWidth
-        width: android.dimen.headerHideHeight
-        color: "#00000000"
-        //color: "#CC00FF00"
-        anchors {
-            top: parent.top
-            right: parent.right
-            rightMargin: android.dimen.headerHideRightMargin
-            topMargin: android.dimen.headerHideTopMargin
-        }
-        Image {
-            id: hideIcon
-            source: "../../../icons/hide.svg"
-            width: android.dimen.headerHideIconWidth
-            height: android.dimen.headerHideIconHeight
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-            }
-        }
-        /*HifiStyles.*/FiraSansRegular {
-            anchors {
-                top: hideIcon.bottom
-                horizontalCenter: hideIcon.horizontalCenter
-                topMargin: android.dimen.headerHideTextTopMargin
-            }
-            text: "HIDE"
-            color: "#FFFFFF"
-            font.pixelSize: hifiStylesConstants.fonts.pixelSize * 2.15
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                hide();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/interface/resources/qml/hifi/+android/bottomHudOptions.qml b/interface/resources/qml/hifi/+android/bottomHudOptions.qml
deleted file mode 100644
index 6b830d94c2..0000000000
--- a/interface/resources/qml/hifi/+android/bottomHudOptions.qml
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-//  bottomHudOptions.qml
-//  interface/resources/qml/android
-//
-//  Created by Cristian Duarte & Gabriel Calero on 24 Nov 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 Hifi 1.0
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-import Qt.labs.settings 1.0
-import "../../styles" as HifiStyles
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControlsUit
-import "../../controls" as HifiControls
-import ".."
-import "."
-
-Item {
-    id: bottomHud
-
-    property bool shown: false
-
-    signal sendToScript(var message);
-
-    HifiConstants { id: android }
-
-    onShownChanged: {
-        bottomHud.visible = shown;
-    }
-
-    function hide() {
-        shown = false;
-    }
-
-	Rectangle {
-        anchors.fill : parent
- 		color: "transparent"
-        Flow {
-            id: flowMain
-            spacing: 0
-            flow: Flow.LeftToRight
-            layoutDirection: Flow.LeftToRight
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.margins: 12
-
-            Rectangle {
-                id: hideButton
-                height: android.dimen.headerHideHeight
-                width: android.dimen.headerHideWidth
-                color: "#00000000"
-                Image {
-                    id: hideIcon
-                    source: "../../../icons/show-up.svg"
-                    width: android.dimen.headerHideIconWidth
-                    height: android.dimen.headerHideIconHeight
-                    anchors {
-                        horizontalCenter: parent.horizontalCenter
-                        verticalCenter: parent.verticalCenter
-                    }
-                }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        sendToScript ({ method: "showUpBar" });
-                    }
-                }
-            }
-        }
-	}
-
-    Component.onCompleted: {
-        width = android.dimen.botomHudWidth;
-        height = android.dimen.botomHudHeight;
-        x=Window.innerWidth - width;
-        y=Window.innerHeight - height;
-    }
-
-}
diff --git a/interface/resources/qml/hifi/+android/button.qml b/interface/resources/qml/hifi/+android/button.qml
deleted file mode 100644
index a4c65b3c6f..0000000000
--- a/interface/resources/qml/hifi/+android/button.qml
+++ /dev/null
@@ -1,225 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-
-Item {
-    id: button
-    property string icon: "icons/edit-icon.svg"
-    property string hoverIcon: button.icon
-    property string activeIcon: button.icon
-    property string activeHoverIcon: button.activeIcon
-    property int stableOrder: 0
-
-    property int iconSize: 165
-    property string text: "."
-    property string hoverText: button.text
-    property string activeText: button.text
-    property string activeHoverText: button.activeText
-    
-    property string bgColor: "#ffffff"
-    property string hoverBgColor: button.bgColor
-    property string activeBgColor: button.bgColor
-    property string activeHoverBgColor: button.bgColor
-
-    property real bgOpacity: 0
-    property real hoverBgOpacity: 1
-    property real activeBgOpacity: 0.5
-    property real activeHoverBgOpacity: 1
-
-    property string textColor: "#ffffff"
-    property int textSize: 54
-    property string hoverTextColor: "#ffffff"
-    property string activeTextColor: "#ffffff"
-    property string activeHoverTextColor: "#ffffff"
-    property string fontFamily: "FiraSans"
-    property bool fontBold: false
-
-    property int bottomMargin: 30
-    
-    property bool isEntered: false
-    property double sortOrder: 100
-
-    property bool isActive: false
-
-    signal clicked()
-    signal entered()
-    signal exited()
-
-    onIsActiveChanged: {
-        if (button.isEntered) {
-            button.state = (button.isActive) ? "hover active state" : "hover state";
-        } else {
-            button.state = (button.isActive) ? "active state" : "base state";
-        }
-    }
-
-    function editProperties(props) {
-        for (var prop in props) {
-            button[prop] = props[prop];
-        }
-    }
-
-
-    width: 300
-    height: 300
-
-    Rectangle {
-        id: buttonBg
-        color: bgColor
-        opacity: bgOpacity
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-        anchors.top: parent.top
-        anchors.topMargin: 0
-    }
-    Image {
-        id: icon
-        width: iconSize
-        height: iconSize
-        anchors.bottom: text.top
-        anchors.bottomMargin: 6
-        anchors.horizontalCenter: parent.horizontalCenter
-        fillMode: Image.Stretch
-        source: urlHelper(button.icon)
-    }
-    FontLoader {
-        id: firaSans
-        source: "../../../fonts/FiraSans-Regular.ttf"
-    }
-    Text {
-        id: text
-        color: "#ffffff"
-        text: button.text
-        font.family: button.fontFamily
-        font.bold: button.fontBold
-        font.pixelSize: textSize
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: bottomMargin
-        anchors.horizontalCenter: parent.horizontalCenter
-        horizontalAlignment: Text.AlignHCenter
-    }
-    MouseArea {
-        anchors.fill: parent
-        hoverEnabled: true
-        enabled: true
-        onClicked: {
-            console.log("Bottom bar button clicked!!");
-            /*if (tabletButton.inDebugMode) {
-                if (tabletButton.isActive) {
-                    tabletButton.isActive = false;
-                } else {
-                    tabletButton.isActive = true;
-                }
-            }*/
-            button.clicked();
-            /*if (tabletRoot) {
-                tabletRoot.playButtonClickSound();
-            }*/
-        }
-        onPressed: {
-            button.isEntered = true;
-            button.entered();
-            if (button.isActive) {
-                button.state = "hover active state";
-            } else {
-                button.state = "hover state";
-            }
-        }
-        onReleased: {
-            button.isEntered = false;
-            button.exited()
-            if (button.isActive) {
-                button.state = "active state";
-            } else {
-                button.state = "base state";
-            }
-        }
-    }
-    states: [
-        State {
-            name: "hover state"
-
-            PropertyChanges {
-                target: buttonBg
-                color: button.hoverBgColor
-                opacity: button.hoverBgOpacity
-            }
-
-            PropertyChanges {
-                target: text
-                color: button.hoverTextColor
-                text: button.hoverText
-            }
-
-            PropertyChanges {
-                target: icon
-                source: urlHelper(button.hoverIcon)
-            }
-        },
-        State {
-            name: "active state"
-
-            PropertyChanges {
-                target: buttonBg
-                color: button.activeBgColor
-                opacity: button.activeBgOpacity
-            }
-
-            PropertyChanges {
-                target: text
-                color: button.activeTextColor
-                text: button.activeText
-            }
-
-            PropertyChanges {
-                target: icon
-                source: urlHelper(button.activeIcon)
-            }
-        },
-        State {
-            name: "hover active state"
-
-            PropertyChanges {
-                target: buttonBg
-                color: button.activeHoverBgColor
-                opacity: button.activeHoverBgOpacity
-            }
-
-            PropertyChanges {
-                target: text
-                color: button.activeHoverTextColor
-                text: button.activeHoverText
-            }
-
-            PropertyChanges {
-                target: icon
-                source: urlHelper(button.activeHoverIcon)
-            }
-        },
-        State {
-            name: "base state"
-
-            PropertyChanges {
-                target: buttonBg
-                color: button.bgColor
-                opacity: button.bgOpacity
-            }
-
-            PropertyChanges {
-                target: text
-                color: button.textColor
-                text: button.text
-            }
-
-            PropertyChanges {
-                target: icon
-                source: urlHelper(button.icon)
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android/modesbar.qml
deleted file mode 100644
index 1bf04fb8d9..0000000000
--- a/interface/resources/qml/hifi/+android/modesbar.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
-import Qt.labs.settings 1.0
-import stylesUit 1.0
-import controlsUit 1.0 as HifiControlsUit
-import "../../controls" as HifiControls
-import ".."
-
-Item {
-    id: modesbar
-    y:5
-
-    function relocateAndResize(newWindowWidth, newWindowHeight) {
-        width = 300;
-        height = 300;
-        x = newWindowWidth - 565;
-    }
-
-    function onWindowGeometryChanged(rect) {
-        relocateAndResize(rect.width, rect.height);
-    }
-
-    Component.onCompleted: {
-        relocateAndResize(parent.width, parent.height);
-        Window.geometryChanged.connect(onWindowGeometryChanged); // In devices with bars appearing at startup we should listen for this
-    }
-
-    Component.onDestruction: {
-        Window.geometryChanged.disconnect(onWindowGeometryChanged);
-    }
-    
-    function addButton(properties) {
-        var component = Qt.createComponent("button.qml");
-        console.log("load button");
-        if (component.status == Component.Ready) {
-            console.log("load button 2");
-            var button = component.createObject(modesbar);
-            // copy all properites to button
-            var keys = Object.keys(properties).forEach(function (key) {
-                button[key] = properties[key];
-            });
-            return button;
-        } else if( component.status == Component.Error) {
-            console.log("Load button errors " + component.errorString());
-        }
-    }
-
-    function removeButton(name) {
-    }
-
-    function urlHelper(src) {
-        if (src.match(/\bhttp/)) {
-            return src;
-        } else {
-            return "../../../" + src;
-        }
-    }
-
-    function fromScript(message) {
-        switch (message.type) {
-            case "switch":
-                    // message.params.to
-                    // still not needed 
-                break;
-            default:
-                break;
-        }
-    }
-
-}
diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml
index 731477e2ae..3a235c3377 100644
--- a/interface/resources/qml/hifi/Desktop.qml
+++ b/interface/resources/qml/hifi/Desktop.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import QtWebEngine 1.5;
+import QtWebView 1.1
 import Qt.labs.settings 1.0 as QtSettings
 
 import QtQuick.Controls 2.3
@@ -19,8 +19,8 @@ OriginalDesktop.Desktop {
         hoverEnabled: true
         propagateComposedEvents: true
         scrollGestureEnabled: false // we don't need/want these
-        onEntered: ApplicationCompositor.reticleOverDesktop = true
-        onExited: ApplicationCompositor.reticleOverDesktop = false
+        onEntered: if (typeof ApplicationCompositor !== "undefined") ApplicationCompositor.reticleOverDesktop = true
+        onExited: if (typeof ApplicationCompositor !== "undefined") ApplicationCompositor.reticleOverDesktop = false
         acceptedButtons: Qt.NoButton
     }
 
@@ -87,13 +87,6 @@ OriginalDesktop.Desktop {
         return map;
     })({});
 
-    Component.onCompleted: {
-        WebEngine.settings.javascriptCanOpenWindows = true;
-        WebEngine.settings.javascriptCanAccessClipboard = false;
-        WebEngine.settings.spatialNavigationEnabled = false;
-        WebEngine.settings.localContentCanAccessRemoteUrls = true;
-    }
-
     // Accept a download through the webview
     property bool webViewProfileSetup: false
     property string currentUrl: ""
@@ -103,28 +96,6 @@ OriginalDesktop.Desktop {
     property bool autoAdd: false
 
     function initWebviewProfileHandlers(profile) {
-        downloadUrl = currentUrl;
-        if (webViewProfileSetup) return;
-        webViewProfileSetup = true;
-
-        profile.downloadRequested.connect(function(download){
-            adaptedPath = File.convertUrlToPath(downloadUrl);
-            tempDir = File.getTempDir();
-            download.path = tempDir + "/" + adaptedPath;
-            download.accept();
-            if (download.state === WebEngineDownloadItem.DownloadInterrupted) {
-                console.log("download failed to complete");
-            }
-        })
-
-        profile.downloadFinished.connect(function(download){
-            if (download.state === WebEngineDownloadItem.DownloadCompleted) {
-                File.runUnzip(download.path, downloadUrl, autoAdd);
-            } else {
-                console.log("The download was corrupted, state: " + download.state);
-            }
-            autoAdd = false;
-        })
     }
 
     function setAutoAdd(auto) {
diff --git a/interface/resources/qml/hifi/WebBrowser.qml b/interface/resources/qml/hifi/WebBrowser.qml
index c05de26471..6012e9be40 100644
--- a/interface/resources/qml/hifi/WebBrowser.qml
+++ b/interface/resources/qml/hifi/WebBrowser.qml
@@ -15,7 +15,7 @@ import QtQuick.Controls 2.2 as QQControls
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 
-import QtWebEngine 1.5
+import QtWebView 1.1
 import QtWebChannel 1.0
 
 import stylesUit 1.0
@@ -188,13 +188,13 @@ Rectangle {
                     }
 
                     HifiControls.WebGlyphButton {
-                        glyph: webStack.currentItem.webEngineView.loading ? hifi.glyphs.closeSmall : hifi.glyphs.reloadSmall;
+                        glyph: webStack.currentItem.WebView.Loading ? hifi.glyphs.closeSmall : hifi.glyphs.reloadSmall;
                         anchors.verticalCenter: parent.verticalCenter;
                         width: hifi.dimensions.controlLineHeight
                         z: 2
                         x: addressBarInput.width - implicitWidth
                         onClicked: {
-                            if (webStack.currentItem.webEngineView.loading) {
+                            if (webStack.currentItem.WebView.Loading) {
                                 webStack.currentItem.webEngineView.stop();
                             } else {
                                 webStack.currentItem.reloadTimer.start();
@@ -259,7 +259,7 @@ Rectangle {
             width: parent.width;
             from: 0
             to: 100
-            value: webStack.currentItem.webEngineView.loadProgress
+            value: webStack.currentItem.WebView.LoadProgress
             height: 2
         }
 
@@ -269,7 +269,7 @@ Rectangle {
                 property alias webEngineView: webEngineView
                 property alias reloadTimer: reloadTimer
 
-                property WebEngineNewViewRequest request: null
+                property var request: null
 
                 property bool isDialog: QQControls.StackView.index > 0
                 property real margins: isDialog ? 10 : 0
@@ -303,7 +303,6 @@ Rectangle {
                     focus: true
                     objectName: "tabletWebEngineView"
 
-                    //profile: HFWebEngineProfile;
                     profile.httpUserAgent: "Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0"
 
                     property string userScriptUrl: ""
@@ -320,94 +319,10 @@ Rectangle {
                         //TODO: change cursor shape?
                     }
 
-                    // creates a global EventBridge object.
-                    WebEngineScript {
-                        id: createGlobalEventBridge
-                        sourceCode: eventBridgeJavaScriptToInject
-                        injectionPoint: WebEngineScript.Deferred
-                        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: true
-                    settings.autoLoadIconsForPage: true
-                    settings.touchIconsEnabled: true
-
-                    onCertificateError: {
-                        error.defer();
-                    }
-
                     Component.onCompleted: {
                         webChannel.registerObject("eventBridge", eventBridge);
                         webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
                     }
-
-                    onFeaturePermissionRequested: {
-                        grantFeaturePermission(securityOrigin, feature, true);
-                    }
-
-                    onNewViewRequested: {
-                        if (request.destination == WebEngineView.NewViewInDialog) {
-                            webStack.push(webViewComponent, {"request": request});
-                        } else {
-                            request.openIn(webEngineView);
-                        }
-                    }
-
-                    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;
-                        }
-
-                        console.error("Render process exited with code " + exitCode + " " + status);
-                        reloadTimer.running = true;
-                    }
-
-                    onFullScreenRequested: {
-                        if (request.toggleOn) {
-                            webEngineView.state = "FullScreen";
-                        } else {
-                            webEngineView.state = "";
-                        }
-                        request.accept();
-                    }
-
-                    onWindowCloseRequested: {
-                        webStack.pop();
-                    }
                 }
                 Timer {
                     id: reloadTimer
diff --git a/interface/resources/qml/hifi/avatarapp/Spinner.qml b/interface/resources/qml/hifi/avatarapp/Spinner.qml
index 3fc331346d..14f8e922d7 100644
--- a/interface/resources/qml/hifi/avatarapp/Spinner.qml
+++ b/interface/resources/qml/hifi/avatarapp/Spinner.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.5
-import QtWebEngine 1.5
 
 AnimatedImage {
     source: "../../../icons/loader-snake-64-w.gif"
diff --git a/interface/resources/qml/hifi/tablet/BlocksWebView.qml b/interface/resources/qml/hifi/tablet/BlocksWebView.qml
index 1e9eb3beb4..0267724ca1 100644
--- a/interface/resources/qml/hifi/tablet/BlocksWebView.qml
+++ b/interface/resources/qml/hifi/tablet/BlocksWebView.qml
@@ -1,10 +1,9 @@
 import QtQuick 2.0
-import QtWebEngine 1.2
+import QtWebView 1.1
 
 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/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index 267fb9f0cf..2b5e26ab4d 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -3,8 +3,6 @@ import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.4
 import QtQml 2.2
 import QtWebChannel 1.0
-import QtWebEngine  1.1
-
 
 import "."
 import stylesUit 1.0
diff --git a/interface/resources/qml/hifi/tablet/TabletWebView.qml b/interface/resources/qml/hifi/tablet/TabletWebView.qml
index ff6be0480f..9dcfdda5be 100644
--- a/interface/resources/qml/hifi/tablet/TabletWebView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletWebView.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.0
-import QtWebEngine 1.2
 
 import "../../controls" as Controls
 
diff --git a/interface/resources/qml/hifi/tablet/WindowWebView.qml b/interface/resources/qml/hifi/tablet/WindowWebView.qml
index 0f697d634e..3dfe48a4e4 100644
--- a/interface/resources/qml/hifi/tablet/WindowWebView.qml
+++ b/interface/resources/qml/hifi/tablet/WindowWebView.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.0
-import QtWebEngine 1.2
 
 import "../../controls" as Controls
 
diff --git a/interface/resources/qml/stylesUit/+android/HifiConstants.qml b/interface/resources/qml/stylesUit/+android/HifiConstants.qml
deleted file mode 100644
index d5fab57501..0000000000
--- a/interface/resources/qml/stylesUit/+android/HifiConstants.qml
+++ /dev/null
@@ -1,358 +0,0 @@
-//
-//  HiFiConstants.qml
-//
-//  Created by Bradley Austin Davis on 28 Apr 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
-//
-
-import QtQuick 2.5
-import QtQuick.Window 2.2
-
-Item {
-    readonly property alias colors: colors
-    readonly property alias colorSchemes: colorSchemes
-    readonly property alias dimensions: dimensions
-    readonly property alias fontSizes: fontSizes
-    readonly property alias glyphs: glyphs
-    readonly property alias icons: icons
-    readonly property alias buttons: buttons
-    readonly property alias effects: effects
-
-    function glyphForIcon(icon) {
-        // Translates icon enum to glyph char.
-        var glyph;
-        switch (icon) {
-            case hifi.icons.information:
-                glyph = hifi.glyphs.info;
-                break;
-            case hifi.icons.question:
-                glyph = hifi.glyphs.question;
-                break;
-            case hifi.icons.warning:
-                glyph = hifi.glyphs.alert;
-                break;
-            case hifi.icons.critical:
-                glyph = hifi.glyphs.error;
-                break;
-            case hifi.icons.placemark:
-                glyph = hifi.glyphs.placemark;
-                break;
-            default:
-                glyph = hifi.glyphs.noIcon;
-        }
-        return glyph;
-    }
-
-    Item {
-        id: colors
-
-        // Base colors
-        readonly property color baseGray: "#393939"
-        readonly property color darkGray: "#121212"
-        readonly property color baseGrayShadow: "#252525"
-        readonly property color baseGrayHighlight: "#575757"
-        readonly property color lightGray: "#6a6a6a"
-        readonly property color lightGrayText: "#afafaf"
-        readonly property color faintGray: "#e3e3e3"
-        readonly property color primaryHighlight: "#00b4ef"
-        readonly property color blueHighlight: "#00b4ef"
-        readonly property color blueAccent: "#0093C5"
-        readonly property color redHighlight: "#EA4C5F"
-        readonly property color redAccent: "#C62147"
-        readonly property color greenHighlight: "#1ac567"
-        readonly property color greenShadow: "#359D85"
-        readonly property color orangeHighlight: "#FFC49C"
-        readonly property color orangeAccent: "#FF6309"
-        readonly property color indigoHighlight: "#C0D2FF"
-        readonly property color indigoAccent: "#9495FF"
-        readonly property color magentaHighlight: "#EF93D1"
-        readonly property color magentaAccent: "#A2277C"
-        readonly property color checkboxCheckedRed: "#FF0000"
-        readonly property color checkboxCheckedBorderRed: "#D00000"
-        readonly property color lightBlueHighlight: "#d6f6ff"
-
-        // Semitransparent
-        readonly property color darkGray30: "#4d121212"
-        readonly property color darkGray0: "#00121212"
-        readonly property color baseGrayShadow60: "#99252525"
-        readonly property color baseGrayShadow50: "#80252525"
-        readonly property color baseGrayShadow25: "#40252525"
-        readonly property color baseGrayHighlight40: "#66575757"
-        readonly property color baseGrayHighlight15: "#26575757"
-        readonly property color lightGray50: "#806a6a6a"
-        readonly property color lightGrayText80: "#ccafafaf"
-        readonly property color faintGray80: "#cce3e3e3"
-        readonly property color faintGray50: "#80e3e3e3"
-
-        // Other colors
-        readonly property color white: "#ffffff"
-        readonly property color gray: "#808080"
-        readonly property color black: "#000000"
-        readonly property color locked: "#252525"
-        // Semitransparent
-        readonly property color white50: "#80ffffff"
-        readonly property color white30: "#4dffffff"
-        readonly property color white25: "#40ffffff"
-        readonly property color transparent: "#00ffffff"
-
-        // Control specific colors
-        readonly property color tableRowLightOdd: "#fafafa"
-        readonly property color tableRowLightEven: "#eeeeee" // Equivavlent to "#1a575757" over #e3e3e3 background
-        readonly property color tableRowDarkOdd: "#2e2e2e"   // Equivalent to "#80393939" over #404040 background
-        readonly property color tableRowDarkEven: "#1c1c1c"  // Equivalent to "#a6181818" over #404040 background
-        readonly property color tableBackgroundLight: tableRowLightEven
-        readonly property color tableBackgroundDark: tableRowDarkEven
-        readonly property color tableScrollHandleLight: "#DDDDDD"
-        readonly property color tableScrollHandleDark: "#707070"
-        readonly property color tableScrollBackgroundLight: tableRowLightOdd
-        readonly property color tableScrollBackgroundDark: "#323232"
-        readonly property color checkboxLightStart: "#ffffff"
-        readonly property color checkboxLightFinish: "#afafaf"
-        readonly property color checkboxDarkStart: "#7d7d7d"
-        readonly property color checkboxDarkFinish: "#6b6a6b"
-        readonly property color checkboxChecked: primaryHighlight
-        readonly property color checkboxCheckedBorder: "#36cdff"
-        readonly property color sliderGutterLight: "#d4d4d4"
-        readonly property color sliderGutterDark: "#252525"
-        readonly property color sliderBorderLight: "#afafaf"
-        readonly property color sliderBorderDark: "#7d7d7d"
-        readonly property color sliderLightStart: "#ffffff"
-        readonly property color sliderLightFinish: "#afafaf"
-        readonly property color sliderDarkStart: "#7d7d7d"
-        readonly property color sliderDarkFinish: "#6b6a6b"
-        readonly property color dropDownPressedLight: "#d4d4d4"
-        readonly property color dropDownPressedDark: "#afafaf"
-        readonly property color dropDownLightStart: "#ffffff"
-        readonly property color dropDownLightFinish: "#afafaf"
-        readonly property color dropDownDarkStart: "#7d7d7d"
-        readonly property color dropDownDarkFinish: "#6b6a6b"
-        readonly property color textFieldLightBackground: "#d4d4d4"
-        readonly property color tabBackgroundDark: "#252525"
-        readonly property color tabBackgroundLight: "#d4d4d4"
-    }
-
-    Item {
-        id: colorSchemes
-        readonly property int light: 0
-        readonly property int dark: 1
-        readonly property int faintGray: 2
-    }
-
-    Item {
-        id: dimensions
-        readonly property bool largeScreen: Screen.width >= 1920 && Screen.height >= 1080
-        readonly property real borderRadius: largeScreen ? 7.5 : 5.0
-        readonly property real borderWidth: largeScreen ? 2 : 1
-        readonly property vector2d contentMargin: Qt.vector2d(21, 21)
-        readonly property vector2d contentSpacing: Qt.vector2d(11, 14)
-        readonly property real labelPadding: 40
-        readonly property real textPadding: 8
-        readonly property real sliderHandleSize: 18
-        readonly property real sliderGrooveHeight: 8
-        readonly property real frameIconSize: 22
-        readonly property real spinnerSize: 50
-        readonly property real tablePadding: 12
-        readonly property real tableRowHeight: largeScreen ? 26 : 23
-        readonly property real tableHeaderHeight: 29
-        readonly property vector2d modalDialogMargin: Qt.vector2d(50, 30)
-        readonly property real modalDialogTitleHeight: 120
-        readonly property real controlLineHeight: 84 // Height of spinbox control on 1920 x 1080 monitor
-        readonly property real controlInterlineHeight: 21  // 75% of controlLineHeight
-        readonly property vector2d menuPadding: Qt.vector2d(14, 102)
-        readonly property real scrollbarBackgroundWidth: 20
-        readonly property real scrollbarHandleWidth: scrollbarBackgroundWidth - 2
-        readonly property real tabletMenuHeader: 90
-        readonly property real buttonWidth: 360
-    }
-
-    Item {
-        id: fontSizes  // In pixels
-        readonly property real overlayTitle: dimensions.largeScreen ? 54 : 42
-        readonly property real tabName: dimensions.largeScreen ? 12 : 10
-        readonly property real sectionName: dimensions.largeScreen ? 36 : 30
-        readonly property real inputLabel: dimensions.largeScreen ? 14 : 10
-        readonly property real textFieldInput: dimensions.largeScreen ? 48 : 36
-        readonly property real textFieldInputLabel: dimensions.largeScreen ? 13 : 9
-        readonly property real textFieldSearchIcon: dimensions.largeScreen ? 30 : 24
-        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 ? 42 : 27
-        readonly property real iconButton: dimensions.largeScreen ? 13 : 9
-        readonly property real listItem: dimensions.largeScreen ? 15 : 11
-        readonly property real tabularData: dimensions.largeScreen ? 15 : 11
-        readonly property real logs: dimensions.largeScreen ? 16 : 12
-        readonly property real code: dimensions.largeScreen ? 16 : 12
-        readonly property real rootMenu: dimensions.largeScreen ? 15 : 11
-        readonly property real rootMenuDisclosure: dimensions.largeScreen ? 20 : 16
-        readonly property real menuItem: dimensions.largeScreen ? 45 : 33
-        readonly property real shortcutText: dimensions.largeScreen ? 39 : 27
-        readonly property real carat: dimensions.largeScreen ? 38 : 30
-        readonly property real disclosureButton: dimensions.largeScreen ? 30 : 22
-    }
-
-    Item {
-        id: icons
-        // Values per OffscreenUi::Icon
-        readonly property int none: 0
-        readonly property int question: 1
-        readonly property int information: 2
-        readonly property int warning: 3
-        readonly property int critical: 4
-        readonly property int placemark: 5
-    }
-
-    Item {
-        id: buttons
-        readonly property int white: 0
-        readonly property int blue: 1
-        readonly property int red: 2
-        readonly property int black: 3
-        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]
-        readonly property int radius: 15
-    }
-
-    QtObject {
-        id: effects
-        readonly property int fadeInDuration: 300
-    }
-    Item {
-        id: glyphs
-        readonly property string noIcon: ""
-        readonly property string hmd: "b"
-        readonly property string screen: "c"
-        readonly property string keyboard: "d"
-        readonly property string handControllers: "e"
-        readonly property string headphonesMic: "f"
-        readonly property string gamepad: "g"
-        readonly property string headphones: "h"
-        readonly property string mic: "i"
-        readonly property string upload: "j"
-        readonly property string script: "k"
-        readonly property string text: "l"
-        readonly property string cube: "m"
-        readonly property string sphere: "n"
-        readonly property string zone: "o"
-        readonly property string light: "p"
-        readonly property string web: "q"
-        readonly property string web2: "r"
-        readonly property string edit: "s"
-        readonly property string market: "t"
-        readonly property string directory: "u"
-        readonly property string menu: "v"
-        readonly property string close: "w"
-        readonly property string closeInverted: "x"
-        readonly property string pin: "y"
-        readonly property string pinInverted: "z"
-        readonly property string resizeHandle: "A"
-        readonly property string disclosureExpand: "B"
-        readonly property string reloadSmall: "a"
-        readonly property string closeSmall: "C"
-        readonly property string forward: "D"
-        readonly property string backward: "E"
-        readonly property string reload: "F"
-        readonly property string unmuted: "G"
-        readonly property string muted: "H"
-        readonly property string minimize: "I"
-        readonly property string maximize: "J"
-        readonly property string maximizeInverted: "K"
-        readonly property string disclosureButtonExpand: "L"
-        readonly property string disclosureButtonCollapse: "M"
-        readonly property string scriptStop: "N"
-        readonly property string scriptReload: "O"
-        readonly property string scriptRun: "P"
-        readonly property string scriptNew: "Q"
-        readonly property string hifiForum: "2"
-        readonly property string hifiLogoSmall: "S"
-        readonly property string avatar1: "T"
-        readonly property string placemark: "U"
-        readonly property string box: "V"
-        readonly property string community: "0"
-        readonly property string grabHandle: "X"
-        readonly property string search: "Y"
-        readonly property string disclosureCollapse: "Z"
-        readonly property string scriptUpload: "R"
-        readonly property string code: "W"
-        readonly property string avatar: "<"
-        readonly property string arrowsH: ":"
-        readonly property string arrowsV: ";"
-        readonly property string arrows: "`"
-        readonly property string compress: "!"
-        readonly property string expand: "\""
-        readonly property string placemark1: "#"
-        readonly property string circle: "$"
-        readonly property string handPointer: "9"
-        readonly property string plusSquareO: "%"
-        readonly property string sliders: "&"
-        readonly property string square: "'"
-        readonly property string alignCenter: "8"
-        readonly property string alignJustify: ")"
-        readonly property string alignLeft: "*"
-        readonly property string alignRight: "^"
-        readonly property string bars: "7"
-        readonly property string circleSlash: ","
-        readonly property string sync: "()"
-        readonly property string key: "-"
-        readonly property string link: "."
-        readonly property string location: "/"
-        readonly property string caratR: "3"
-        readonly property string caratL: "4"
-        readonly property string caratDn: "5"
-        readonly property string caratUp: "6"
-        readonly property string folderLg: ">"
-        readonly property string folderSm: "?"
-        readonly property string levelUp: "1"
-        readonly property string info: "["
-        readonly property string question: "]"
-        readonly property string alert: "+"
-        readonly property string home: "_"
-        readonly property string error: "="
-        readonly property string settings: "@"
-        readonly property string trash: "{"
-        readonly property string objectGroup: "\ue000"
-        readonly property string cm: "}"
-        readonly property string msvg79: "~"
-        readonly property string deg: "\\"
-        readonly property string px: "|"
-        readonly property string editPencil: "\ue00d"
-        readonly property string vol_0: "\ue00e"
-        readonly property string vol_1: "\ue00f"
-        readonly property string vol_2: "\ue010"
-        readonly property string vol_3: "\ue011"
-        readonly property string vol_4: "\ue012"
-        readonly property string vol_x_0: "\ue013"
-        readonly property string vol_x_1: "\ue014"
-        readonly property string vol_x_2: "\ue015"
-        readonly property string vol_x_3: "\ue016"
-        readonly property string vol_x_4: "\ue017"
-        readonly property string source: "\ue01c"
-        readonly property string playback_play: "\ue01d"
-        readonly property string stop_square: "\ue01e"
-        readonly property string avatarTPose: "\ue01f"
-        readonly property string lock: "\ue006"
-        readonly property string checkmark: "\ue020"
-        readonly property string leftRightArrows: "\ue021"
-        readonly property string hfc: "\ue022"
-        readonly property string home2: "\ue023"
-        readonly property string walletKey: "\ue024"
-        readonly property string lightning: "\ue025"
-        readonly property string securityImage: "\ue026"
-        readonly property string wallet: "\ue027"
-        readonly property string paperPlane: "\ue028"
-        readonly property string passphrase: "\ue029"
-    }
-}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 356065a9bb..2d4218d8b7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+
 #include "Application.h"
 
 #include <chrono>
@@ -37,7 +38,6 @@
 
 #include <QtNetwork/QLocalSocket>
 #include <QtNetwork/QLocalServer>
-
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickWindow>
@@ -51,6 +51,7 @@
 #include <QProcessEnvironment>
 #include <QTemporaryDir>
 
+
 #include <gl/QOpenGLContextWrapper.h>
 #include <gl/GLWindow.h>
 #include <gl/GLHelpers.h>
@@ -189,6 +190,9 @@
 #include "scripting/WalletScriptingInterface.h"
 #include "scripting/TTSScriptingInterface.h"
 #include "scripting/KeyboardScriptingInterface.h"
+
+
+
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #include "SpeechRecognizer.h"
 #endif
@@ -239,6 +243,7 @@
 #include "webbrowser/WebBrowserSuggestionsEngine.h"
 #include <DesktopPreviewProvider.h>
 
+
 #include "AboutUtil.h"
 
 #if defined(Q_OS_WIN)
@@ -601,8 +606,9 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
                 __android_log_write(ANDROID_LOG_FATAL,"Interface",local);
                 abort();
         }
-#endif
+#else
         qApp->getLogger()->addMessage(qPrintable(logMessage));
+#endif
     }
 }
 
@@ -978,7 +984,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     QApplication(argc, argv),
     _window(new MainWindow(desktop())),
     _sessionRunTimer(startupTimer),
+#ifndef Q_OS_ANDROID
     _logger(new FileLogger(this)),
+#endif
     _previousSessionCrashed(setupEssentials(argc, argv, runningMarkerExisted)),
     _entitySimulation(new PhysicalEntitySimulation()),
     _physicsEngine(new PhysicsEngine(Vectors::ZERO)),
@@ -1112,7 +1120,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     }
     auto accountManager = DependencyManager::get<AccountManager>();
 
+#ifndef Q_OS_ANDROID
     _logger->setSessionID(accountManager->getSessionID());
+#endif
 
     setCrashAnnotation("metaverse_session_id", accountManager->getSessionID().toString().toStdString());
     setCrashAnnotation("main_thread_id", std::to_string((size_t)QThread::currentThreadId()));
@@ -1750,7 +1760,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     });
     _applicationStateDevice->setInputVariant(STATE_PLATFORM_ANDROID, []() -> float {
 #if defined(Q_OS_ANDROID)
-        return 1;
+        return 1 ;
 #else
         return 0;
 #endif
@@ -1853,6 +1863,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     this->installEventFilter(this);
 
+
+
 #ifdef HAVE_DDE
     auto ddeTracker = DependencyManager::get<DdeFaceTracker>();
     ddeTracker->init();
@@ -1987,6 +1999,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
         return false;
     });
 
+
     // Keyboard focus handling for Web overlays.
     auto overlays = &(qApp->getOverlays());
     connect(overlays, &Overlays::overlayDeleted, [this](const OverlayID& overlayID) {
@@ -3060,11 +3073,11 @@ void Application::initializeUi() {
         if (TouchscreenVirtualPadDevice::NAME == inputPlugin->getName()) {
             _touchscreenVirtualPadDevice = std::dynamic_pointer_cast<TouchscreenVirtualPadDevice>(inputPlugin);
 #if defined(Q_OS_ANDROID)
-            auto& virtualPadManager = VirtualPad::Manager::instance();
-            connect(&virtualPadManager, &VirtualPad::Manager::hapticFeedbackRequested,
-                    this, [](int duration) {
-                        AndroidHelper::instance().performHapticFeedback(duration);
-                    });
+ //          auto& virtualPadManager = VirtualPad::Manager::instance();
+ //          connect(&virtualPadManager, &VirtualPad::Manager::hapticFeedbackRequested,
+ //                  this, [](int duration) {
+ //                      AndroidHelper::instance().performHapticFeedback(duration);
+ //                  });
 #endif
         }
     }
@@ -3226,9 +3239,9 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
     surfaceContext->setContextProperty("AnimStats", AnimStats::getInstance());
 
 #if !defined(Q_OS_ANDROID)
-    auto offscreenUi = getOffscreenUI();
-    auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
-    offscreenUi->show(qml, "AvatarInputsBar");
+//  auto offscreenUi = getOffscreenUI();
+//  auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
+//  offscreenUi->show(qml, "AvatarInputsBar");
 #endif
 }
 
@@ -3591,10 +3604,14 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
     }
 
     // Get controller availability
+    #ifdef Q_OS_ANDROID
+    bool hasHandControllers = true;
+    #else
     bool hasHandControllers = false;
     if (PluginUtils::isViveControllerAvailable() || PluginUtils::isOculusTouchControllerAvailable()) {
         hasHandControllers = true;
     }
+    #endif
 
     // Check HMD use (may be technically available without being in use)
     bool hasHMD = PluginUtils::isHMDAvailable();
@@ -4925,7 +4942,11 @@ void Application::idle() {
     // 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.
+#ifndef Q_OS_ANDROID
     bool showWarnings = getLogger()->extraDebugging();
+#else
+    bool showWarnings = false;
+#endif
     PerformanceWarning warn(showWarnings, "idle()");
 
     {
@@ -5063,7 +5084,7 @@ void Application::calibrateEyeTracker5Points() {
 #endif
 
 bool Application::exportEntities(const QString& filename,
-                                 const QVector<QUuid>& entityIDs,
+                                 const QVector<EntityItemID>& entityIDs,
                                  const glm::vec3* givenOffset) {
     QHash<EntityItemID, EntityItemPointer> entities;
 
@@ -5138,12 +5159,16 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa
     glm::vec3 minCorner = center - vec3(scale);
     float cubeSize = scale * 2;
     AACube boundingCube(minCorner, cubeSize);
-    QVector<QUuid> entities;
+    QVector<EntityItemPointer> entities;
+    QVector<EntityItemID> ids;
     auto entityTree = getEntities()->getTree();
     entityTree->withReadLock([&] {
-        entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities);
+        entityTree->findEntities(boundingCube, entities);
+        foreach(EntityItemPointer entity, entities) {
+            ids << entity->getEntityItemID();
+        }
     });
-    return exportEntities(filename, entities, &center);
+    return exportEntities(filename, ids, &center);
 }
 
 void Application::loadSettings() {
@@ -7208,7 +7233,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
 
     bool clientScript = scriptEngine->isClientScript();
     scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor);
-#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
+#if !defined(DISABLE_QML)
     scriptEngine->registerFunction("OverlayWebWindow", clientScript ? QmlWebWindowClass::constructor : QmlWebWindowClass::restricted_constructor);
 #endif
     scriptEngine->registerFunction("QmlFragment", clientScript ? QmlFragmentClass::constructor : QmlFragmentClass::restricted_constructor);
@@ -8256,9 +8281,7 @@ void Application::loadDomainConnectionDialog() {
 }
 
 void Application::toggleLogDialog() {
-    if (getLoginDialogPoppedUp()) {
-        return;
-    }
+#ifndef Q_OS_ANDROID
     if (! _logDialog) {
 
         bool keepOnTop =_keepLogWindowOnTop.get();
@@ -8279,6 +8302,7 @@ void Application::toggleLogDialog() {
     } else {
         _logDialog->show();
     }
+#endif
 }
 
  void Application::recreateLogWindow(int keepOnTop) {
@@ -9138,17 +9162,17 @@ void Application::beforeEnterBackground() {
 void Application::enterBackground() {
     QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
                               "stop", Qt::BlockingQueuedConnection);
-    if (getActiveDisplayPlugin()->isActive()) {
-        getActiveDisplayPlugin()->deactivate();
-    }
+//    if (getActiveDisplayPlugin()->isActive()) {
+//        getActiveDisplayPlugin()->deactivate();
+//    }
 }
 
 void Application::enterForeground() {
     QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
                                   "start", Qt::BlockingQueuedConnection);
-    if (!getActiveDisplayPlugin() || getActiveDisplayPlugin()->isActive() || !getActiveDisplayPlugin()->activate()) {
-        qWarning() << "Could not re-activate display plugin";
-    }
+//    if (!getActiveDisplayPlugin() || getActiveDisplayPlugin()->isActive() || !getActiveDisplayPlugin()->activate()) {
+//        qWarning() << "Could not re-activate display plugin";
+//    }
     auto nodeList = DependencyManager::get<NodeList>();
     nodeList->setSendDomainServerCheckInEnabled(true);
 }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index de79e91cb2..099c5d3d15 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -251,7 +251,9 @@ public:
 
     void setActiveDisplayPlugin(const QString& pluginName);
 
+#ifndef Q_OS_ANDROID
     FileLogger* getLogger() const { return _logger; }
+#endif
 
     float getRenderResolutionScale() const;
 
@@ -357,7 +359,7 @@ signals:
 
 public slots:
     QVector<EntityItemID> pasteEntities(float x, float y, float z);
-    bool exportEntities(const QString& filename, const QVector<QUuid>& entityIDs, const glm::vec3* givenOffset = nullptr);
+    bool exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs, const glm::vec3* givenOffset = nullptr);
     bool exportEntities(const QString& filename, float x, float y, float z, float scale);
     bool importEntities(const QString& url, const bool isObservable = true, const qint64 callerId = -1);
     void updateThreadPoolCount() const;
@@ -599,7 +601,9 @@ private:
 
     bool _aboutToQuit { false };
 
+#ifndef Q_OS_ANDROID
     FileLogger* _logger { nullptr };
+#endif
 
     bool _previousSessionCrashed;
 
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index b6fffbb4bd..282fe3e2eb 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -240,6 +240,7 @@ void LODManager::setAutomaticLODAdjust(bool value) {
 }
 
 bool LODManager::shouldRender(const RenderArgs* args, const AABox& bounds) {
+    return true;
     // To decide if the bound should be rendered or not at the specified Args->lodAngle,
     // we need to compute the apparent angle of the bound from the frustum origin,
     // and compare it against the lodAngle, if it is greater or equal we should render the content of that bound.
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 2c4a141e0a..b5cc681262 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -3755,15 +3755,17 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette
         OctreeElementPointer element;
         float distance;
         BoxFace face;
-        const auto lockType = Octree::Lock; // Should we refactor to take a lock just once?
-        bool* accurateResult = NULL;
-
+        const bool visibleOnly = false;
         // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable.
         // What we really want is to use the collision hull!
         // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders
+        const bool collidableOnly = true;
+        const bool precisionPicking = true;
+        const auto lockType = Octree::Lock; // Should we refactor to take a lock just once?
+        bool* accurateResult = NULL;
+
         QVariantMap extraInfo;
-        EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore,
-            PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE)),
+        EntityItemID entityID = entityTree->findRayIntersection(startPointIn, directionIn, include, ignore, visibleOnly, collidableOnly, precisionPicking,
             element, distance, face, normalOut, extraInfo, lockType, accurateResult);
         if (entityID.isNull()) {
             return false;
diff --git a/interface/src/java/io/highfidelity/interface/InterfaceActivity.java b/interface/src/java/io/highfidelity/interface/InterfaceActivity.java
deleted file mode 100644
index ae10c320f8..0000000000
--- a/interface/src/java/io/highfidelity/interface/InterfaceActivity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  InterfaceActivity.java
-//  gvr-interface/java
-//
-//  Created by Stephen Birarda on 1/26/15.
-//  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
-//
-
-package io.highfidelity.gvrinterface;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.WindowManager;
-import org.qtproject.qt5.android.bindings.QtActivity;
-
-public class InterfaceActivity extends QtActivity {
-    
-    public static native void handleHifiURL(String hifiURLString);
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        
-        // Get the intent that started this activity in case we have a hifi:// URL to parse
-        Intent intent = getIntent();
-        if (intent.getAction() == Intent.ACTION_VIEW) {
-            Uri data = intent.getData();
-        
-            if (data.getScheme().equals("hifi")) {
-                handleHifiURL(data.toString());
-            }
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index 5c8868abdb..c6e0e50bc6 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -38,12 +38,13 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
     PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
                             "OctreePacketProcessor::processPacket()");
 
+#ifndef Q_OS_ANDROID
     const int WAY_BEHIND = 300;
-
     if (packetsToProcessCount() > WAY_BEHIND && qApp->getLogger()->extraDebugging()) {
         qDebug("OctreePacketProcessor::processPacket() packets to process=%d", packetsToProcessCount());
     }
-    
+#endif
+
     bool wasStatsPacket = false;
 
     PacketType octreePacketType = message->getType();
diff --git a/interface/src/raypick/LaserPointer.cpp b/interface/src/raypick/LaserPointer.cpp
index 236512f2fe..1b53f9ab30 100644
--- a/interface/src/raypick/LaserPointer.cpp
+++ b/interface/src/raypick/LaserPointer.cpp
@@ -125,7 +125,7 @@ LaserPointer::RenderState::RenderState(const OverlayID& startID, const OverlayID
     StartEndRenderState(startID, endID), _pathID(pathID)
 {
     if (!_pathID.isNull()) {
-        _pathIgnoreRays = qApp->getOverlays().getProperty(_pathID, "ignorePickIntersection").value.toBool();
+        _pathIgnoreRays = qApp->getOverlays().getProperty(_pathID, "ignoreRayIntersection").value.toBool();
         _lineWidth = qApp->getOverlays().getProperty(_pathID, "lineWidth").value.toFloat();
     }
 }
@@ -142,7 +142,7 @@ void LaserPointer::RenderState::disable() {
     if (!getPathID().isNull()) {
         QVariantMap pathProps;
         pathProps.insert("visible", false);
-        pathProps.insert("ignorePickIntersection", true);
+        pathProps.insert("ignoreRayIntersection", true);
         qApp->getOverlays().editOverlay(getPathID(), pathProps);
     }
 }
@@ -156,7 +156,7 @@ void LaserPointer::RenderState::update(const glm::vec3& origin, const glm::vec3&
         pathProps.insert("start", vec3toVariant(origin));
         pathProps.insert("end", endVariant);
         pathProps.insert("visible", true);
-        pathProps.insert("ignorePickIntersection", doesPathIgnoreRays());
+        pathProps.insert("ignoreRayIntersection", doesPathIgnoreRays());
         pathProps.insert("lineWidth", getLineWidth() * parentScale);
         qApp->getOverlays().editOverlay(getPathID(), pathProps);
     }
diff --git a/interface/src/raypick/LaserPointerScriptingInterface.h b/interface/src/raypick/LaserPointerScriptingInterface.h
index d85e329e9a..5aaacd7960 100644
--- a/interface/src/raypick/LaserPointerScriptingInterface.h
+++ b/interface/src/raypick/LaserPointerScriptingInterface.h
@@ -21,7 +21,7 @@ class LaserPointerScriptingInterface : public QObject, public Dependency {
     SINGLETON_DEPENDENCY
 
 /**jsdoc
- * Synonym for {@link Pointers} as used for laser pointers.  Deprecated.
+ * Synonym for {@link Pointers} as used for laser pointers.
  *
  * @namespace LaserPointers
  *
diff --git a/interface/src/raypick/ParabolaPick.cpp b/interface/src/raypick/ParabolaPick.cpp
index b93ced17c6..571f4a6ea6 100644
--- a/interface/src/raypick/ParabolaPick.cpp
+++ b/interface/src/raypick/ParabolaPick.cpp
@@ -9,7 +9,6 @@
 
 #include "Application.h"
 #include "EntityScriptingInterface.h"
-#include "PickScriptingInterface.h"
 #include "ui/overlays/Overlays.h"
 #include "avatar/AvatarManager.h"
 #include "scripting/HMDScriptingInterface.h"
@@ -58,15 +57,10 @@ PickParabola ParabolaPick::getMathematicalPick() const {
 
 PickResultPointer ParabolaPick::getEntityIntersection(const PickParabola& pick) {
     if (glm::length2(pick.acceleration) > EPSILON && glm::length2(pick.velocity) > EPSILON) {
-        PickFilter searchFilter = getFilter();
-        if (DependencyManager::get<PickManager>()->getForceCoarsePicking()) {
-            searchFilter.setFlag(PickFilter::COARSE, true);
-            searchFilter.setFlag(PickFilter::PRECISE, false);
-        }
-
+        bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
         ParabolaToEntityIntersectionResult entityRes =
-            DependencyManager::get<EntityScriptingInterface>()->evalParabolaIntersectionVector(pick, searchFilter,
-                getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>());
+            DependencyManager::get<EntityScriptingInterface>()->findParabolaIntersectionVector(pick, precisionPicking,
+                getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
         if (entityRes.intersects) {
             return std::make_shared<ParabolaPickResult>(IntersectionType::ENTITY, entityRes.entityID, entityRes.distance, entityRes.parabolicDistance, entityRes.intersection, pick, entityRes.surfaceNormal, entityRes.extraInfo);
         }
@@ -76,7 +70,7 @@ PickResultPointer ParabolaPick::getEntityIntersection(const PickParabola& pick)
 
 PickResultPointer ParabolaPick::getOverlayIntersection(const PickParabola& pick) {
     if (glm::length2(pick.acceleration) > EPSILON && glm::length2(pick.velocity) > EPSILON) {
-        bool precisionPicking = !(getFilter().isCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
+        bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
         ParabolaToOverlayIntersectionResult overlayRes =
             qApp->getOverlays().findParabolaIntersectionVector(pick, precisionPicking,
                 getIncludeItemsAs<OverlayID>(), getIgnoreItemsAs<OverlayID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp
index e45b11b479..162c26276f 100644
--- a/interface/src/raypick/ParabolaPointer.cpp
+++ b/interface/src/raypick/ParabolaPointer.cpp
@@ -404,7 +404,7 @@ void ParabolaPointer::RenderState::ParabolaRenderItem::updateBounds() {
 const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabolaPipeline() {
     if (!_parabolaPipeline || !_transparentParabolaPipeline) {
         {
-            gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola);
+            gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola );
             auto state = std::make_shared<gpu::State>();
             state->setDepthTest(true, true, gpu::LESS_EQUAL);
             state->setBlendFunction(false,
diff --git a/interface/src/raypick/PathPointer.cpp b/interface/src/raypick/PathPointer.cpp
index ae0ce4671b..8a6995936f 100644
--- a/interface/src/raypick/PathPointer.cpp
+++ b/interface/src/raypick/PathPointer.cpp
@@ -253,12 +253,12 @@ StartEndRenderState::StartEndRenderState(const OverlayID& startID, const Overlay
     _startID(startID), _endID(endID) {
     if (!_startID.isNull()) {
         _startDim = vec3FromVariant(qApp->getOverlays().getProperty(_startID, "dimensions").value);
-        _startIgnoreRays = qApp->getOverlays().getProperty(_startID, "ignorePickIntersection").value.toBool();
+        _startIgnoreRays = qApp->getOverlays().getProperty(_startID, "ignoreRayIntersection").value.toBool();
     }
     if (!_endID.isNull()) {
         _endDim = vec3FromVariant(qApp->getOverlays().getProperty(_endID, "dimensions").value);
         _endRot = quatFromVariant(qApp->getOverlays().getProperty(_endID, "rotation").value);
-        _endIgnoreRays = qApp->getOverlays().getProperty(_endID, "ignorePickIntersection").value.toBool();
+        _endIgnoreRays = qApp->getOverlays().getProperty(_endID, "ignoreRayIntersection").value.toBool();
     }
 }
 
@@ -275,13 +275,13 @@ void StartEndRenderState::disable() {
     if (!getStartID().isNull()) {
         QVariantMap startProps;
         startProps.insert("visible", false);
-        startProps.insert("ignorePickIntersection", true);
+        startProps.insert("ignoreRayIntersection", true);
         qApp->getOverlays().editOverlay(getStartID(), startProps);
     }
     if (!getEndID().isNull()) {
         QVariantMap endProps;
         endProps.insert("visible", false);
-        endProps.insert("ignorePickIntersection", true);
+        endProps.insert("ignoreRayIntersection", true);
         qApp->getOverlays().editOverlay(getEndID(), endProps);
     }
     _enabled = false;
@@ -294,7 +294,7 @@ void StartEndRenderState::update(const glm::vec3& origin, const glm::vec3& end,
         startProps.insert("position", vec3toVariant(origin));
         startProps.insert("visible", true);
         startProps.insert("dimensions", vec3toVariant(getStartDim() * parentScale));
-        startProps.insert("ignorePickIntersection", doesStartIgnoreRays());
+        startProps.insert("ignoreRayIntersection", doesStartIgnoreRays());
         qApp->getOverlays().editOverlay(getStartID(), startProps);
     }
 
@@ -346,7 +346,7 @@ void StartEndRenderState::update(const glm::vec3& origin, const glm::vec3& end,
         endProps.insert("position", vec3toVariant(position));
         endProps.insert("rotation", quatToVariant(rotation));
         endProps.insert("visible", true);
-        endProps.insert("ignorePickIntersection", doesEndIgnoreRays());
+        endProps.insert("ignoreRayIntersection", doesEndIgnoreRays());
         qApp->getOverlays().editOverlay(getEndID(), endProps);
     }
     _enabled = true;
diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp
index e8f84e63fe..6e979d2d91 100644
--- a/interface/src/raypick/PickScriptingInterface.cpp
+++ b/interface/src/raypick/PickScriptingInterface.cpp
@@ -49,17 +49,11 @@ unsigned int PickScriptingInterface::createPick(const PickQuery::PickType type,
     }
 }
 
-PickFilter getPickFilter(unsigned int filter) {
-    // FIXME: Picks always intersect visible and collidable things right now
-    filter = filter | (PickScriptingInterface::PICK_INCLUDE_VISIBLE() | PickScriptingInterface::PICK_INCLUDE_COLLIDABLE());
-    return PickFilter(filter);
-}
-
 /**jsdoc
  * A set of properties that can be passed to {@link Picks.createPick} to create a new Ray Pick.
  * @typedef {object} Picks.RayPickProperties
  * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
- * @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+ * @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
  * @property {number} [maxDistance=0.0] The max distance at which this Pick will intersect.  0.0 = no max.  < 0.0 is invalid.
  * @property {Uuid} parentID - The ID of the parent, either an avatar, an entity, an overlay, or a pick.
  * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, the joints on the model of an avatar. (default = 0, no joint)
@@ -79,7 +73,7 @@ unsigned int PickScriptingInterface::createRayPick(const QVariant& properties) {
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = getPickFilter(propMap["filter"].toUInt());
+        filter = PickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
@@ -117,7 +111,7 @@ unsigned int PickScriptingInterface::createRayPick(const QVariant& properties) {
  * @typedef {object} Picks.StylusPickProperties
  * @property {number} [hand=-1] An integer.  0 == left, 1 == right.  Invalid otherwise.
  * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
- * @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+ * @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
  * @property {number} [maxDistance=0.0] The max distance at which this Pick will intersect.  0.0 = no max.  < 0.0 is invalid.
  */
 unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties) {
@@ -138,7 +132,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = getPickFilter(propMap["filter"].toUInt());
+        filter = PickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
@@ -159,7 +153,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties
  * A set of properties that can be passed to {@link Picks.createPick} to create a new Parabola Pick.
  * @typedef {object} Picks.ParabolaPickProperties
  * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
- * @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+ * @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
  * @property {number} [maxDistance=0.0] The max distance at which this Pick will intersect.  0.0 = no max.  < 0.0 is invalid.
  * @property {Uuid} parentID - The ID of the parent, either an avatar, an entity, an overlay, or a pick.
  * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, the joints on the model of an avatar. (default = 0, no joint)
@@ -184,7 +178,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = getPickFilter(propMap["filter"].toUInt());
+        filter = PickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
@@ -256,7 +250,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti
 
 * @typedef {object} Picks.CollisionPickProperties
 * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
-* @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+* @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
 * @property {Shape} shape - The information about the collision region's size and shape. Dimensions are in world space, but will scale with the parent if defined.
 * @property {Vec3} position - The position of the collision region, relative to a parent if defined.
 * @property {Quat} orientation - The orientation of the collision region, relative to a parent if defined.
@@ -279,7 +273,7 @@ unsigned int PickScriptingInterface::createCollisionPick(const QVariant& propert
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = getPickFilter(propMap["filter"].toUInt());
+        filter = PickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
diff --git a/interface/src/raypick/PickScriptingInterface.h b/interface/src/raypick/PickScriptingInterface.h
index e795068cd3..94112d5fae 100644
--- a/interface/src/raypick/PickScriptingInterface.h
+++ b/interface/src/raypick/PickScriptingInterface.h
@@ -14,7 +14,6 @@
 #include <DependencyManager.h>
 #include <PhysicsEngine.h>
 #include <Pick.h>
-#include <PickFilter.h>
 
 /**jsdoc
  * The Picks API lets you create and manage objects for repeatedly calculating intersections in different ways.
@@ -24,62 +23,41 @@
  * @hifi-interface
  * @hifi-client-entity
  *
- * @property {number} PICK_ENTITIES A filter flag. Include domain and avatar entities when intersecting. <em>Read-only.</em>.  Deprecated.
- * @property {number} PICK_OVERLAYS A filter flag. Include local entities when intersecting. <em>Read-only.</em>. Deprecated.
- *
- * @property {number} PICK_DOMAIN_ENTITIES A filter flag. Include domain entities when intersecting. <em>Read-only.</em>.
- * @property {number} PICK_AVATAR_ENTITIES A filter flag. Include avatar entities when intersecting. <em>Read-only.</em>.
- * @property {number} PICK_LOCAL_ENTITIES A filter flag. Include local entities when intersecting. <em>Read-only.</em>.
- * @property {number} PICK_AVATARS A filter flag. Include avatars when intersecting. <em>Read-only.</em>.
- * @property {number} PICK_HUD A filter flag. Include the HUD sphere when intersecting in HMD mode. <em>Read-only.</em>.
- *
- * @property {number} PICK_INCLUDE_VISIBLE A filter flag. Include visible objects when intersecting. <em>Read-only.</em>.
- * @property {number} PICK_INCLUDE_INVISIBLE A filter flag. Include invisible objects when intersecting. <em>Read-only.</em>.
- *
- * @property {number} PICK_INCLUDE_COLLIDABLE A filter flag. Include collidable objects when intersecting. <em>Read-only.</em>.
- * @property {number} PICK_INCLUDE_NONCOLLIDABLE A filter flag. Include non-collidable objects when intersecting. <em>Read-only.</em>.
- *
- * @property {number} PICK_PRECISE A filter flag. Pick against exact meshes. <em>Read-only.</em>.
- * @property {number} PICK_COARSE A filter flag. Pick against coarse meshes. <em>Read-only.</em>.
- *
- * @property {number} PICK_ALL_INTERSECTIONS <em>Read-only.</em>.
- *
- * @property {number} INTERSECTED_NONE An intersection type. Intersected nothing with the given filter flags. <em>Read-only.</em>
+ * @property {number} PICK_NOTHING A filter flag. Don't intersect with anything. <em>Read-only.</em>
+ * @property {number} PICK_ENTITIES A filter flag. Include entities when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_OVERLAYS A filter flag. Include overlays when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_AVATARS A filter flag. Include avatars when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_HUD A filter flag. Include the HUD sphere when intersecting in HMD mode. <em>Read-only.</em>
+ * @property {number} PICK_COARSE A filter flag. Pick against coarse meshes, instead of exact meshes. <em>Read-only.</em>
+ * @property {number} PICK_INCLUDE_INVISIBLE A filter flag. Include invisible objects when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_INCLUDE_NONCOLLIDABLE A filter flag. Include non-collidable objects when intersecting. 
+ *     <em>Read-only.</em>
+ * @property {number} PICK_ALL_INTERSECTIONS <em>Read-only.</em>
+ * @property {number} INTERSECTED_NONE An intersection type. Intersected nothing with the given filter flags. 
+ *     <em>Read-only.</em>
  * @property {number} INTERSECTED_ENTITY An intersection type. Intersected an entity. <em>Read-only.</em>
  * @property {number} INTERSECTED_OVERLAY An intersection type. Intersected an overlay. <em>Read-only.</em>
  * @property {number} INTERSECTED_AVATAR An intersection type. Intersected an avatar. <em>Read-only.</em>
  * @property {number} INTERSECTED_HUD An intersection type. Intersected the HUD sphere. <em>Read-only.</em>
- * @property {number} perFrameTimeBudget - The max number of usec to spend per frame updating Pick results.
+ * @property {number} perFrameTimeBudget - The max number of usec to spend per frame updating Pick results. <em>Read-only.</em>
  */
 
 class PickScriptingInterface : 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_DOMAIN_ENTITIES READ PICK_DOMAIN_ENTITIES CONSTANT)
-    Q_PROPERTY(unsigned int PICK_AVATAR_ENTITIES READ PICK_AVATAR_ENTITIES CONSTANT)
-    Q_PROPERTY(unsigned int PICK_LOCAL_ENTITIES READ PICK_LOCAL_ENTITIES 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_INCLUDE_VISIBLE READ PICK_INCLUDE_VISIBLE CONSTANT)
-    Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT)
-
-    Q_PROPERTY(unsigned int PICK_INCLUDE_COLLIDABLE READ PICK_INCLUDE_COLLIDABLE CONSTANT)
-    Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT)
-
-    Q_PROPERTY(unsigned int PICK_PRECISE READ PICK_PRECISE CONSTANT)
     Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE CONSTANT)
-
+    Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT)
+    Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT)
     Q_PROPERTY(unsigned int PICK_ALL_INTERSECTIONS READ PICK_ALL_INTERSECTIONS CONSTANT)
-
     Q_PROPERTY(unsigned int INTERSECTED_NONE READ INTERSECTED_NONE CONSTANT)
     Q_PROPERTY(unsigned int INTERSECTED_ENTITY READ INTERSECTED_ENTITY CONSTANT)
     Q_PROPERTY(unsigned int INTERSECTED_OVERLAY READ INTERSECTED_OVERLAY CONSTANT)
     Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ INTERSECTED_AVATAR CONSTANT)
     Q_PROPERTY(unsigned int INTERSECTED_HUD READ INTERSECTED_HUD CONSTANT)
-    Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget)
     SINGLETON_DEPENDENCY
 
 public:
@@ -94,13 +72,11 @@ public:
      * Adds a new Pick.
      * Different {@link PickType}s use different properties, and within one PickType, the properties you choose can lead to a wide range of behaviors.  For example,
      *   with PickType.Ray, depending on which optional parameters you pass, you could create a Static Ray Pick, a Mouse Ray Pick, or a Joint Ray Pick.
-     * Picks created with this method always intersect at least visible and collidable things
      * @function Picks.createPick
      * @param {PickType} type A PickType that specifies the method of picking to use
      * @param {Picks.RayPickProperties|Picks.StylusPickProperties|Picks.ParabolaPickProperties|Picks.CollisionPickProperties} properties A PickProperties object, containing all the properties for initializing this Pick
      * @returns {number} The ID of the created Pick.  Used for managing the Pick.  0 if invalid.
      */
-    // TODO: expand Pointers to be able to be fully configurable with PickFilters
     Q_INVOKABLE unsigned int createPick(const PickQuery::PickType type, const QVariant& properties);
 
     /**jsdoc
@@ -251,80 +227,61 @@ public:
      */
     Q_INVOKABLE bool isMouse(unsigned int uid);
 
+    // FIXME: Move to other property definitions.
+    Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget)
+
     unsigned int getPerFrameTimeBudget() const;
     void setPerFrameTimeBudget(unsigned int numUsecs);
 
 public slots:
 
+    /**jsdoc
+     * @function Picks.PICK_NOTHING
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_NOTHING() { return 0; }
+
     /**jsdoc
      * @function Picks.PICK_ENTITIES
      * @returns {number}
      */
-    static constexpr unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); }
+    static constexpr unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ENTITIES); }
+
     /**jsdoc
      * @function Picks.PICK_OVERLAYS
      * @returns {number}
      */
-    static constexpr unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); }
+    static constexpr unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_OVERLAYS); }
 
-    /**jsdoc
-     * @function Picks.PICK_DOMAIN_ENTITIES
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_DOMAIN_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES); }
-    /**jsdoc
-     * @function Picks.PICK_AVATAR_ENTITIES
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_AVATAR_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); }
-    /**jsdoc
-     * @function Picks.PICK_LOCAL_ENTITIES
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_LOCAL_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); }
     /**jsdoc
      * @function Picks.PICK_AVATARS
      * @returns {number}
      */
-    static constexpr unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATARS); }
+    static constexpr unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_AVATARS); }
+
     /**jsdoc
      * @function Picks.PICK_HUD
      * @returns {number}
      */
-    static constexpr unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::HUD); }
+    static constexpr unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_HUD); }
 
-    /**jsdoc
-     * @function Picks.PICK_INCLUDE_VISIBLE
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_INCLUDE_VISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::VISIBLE); }
-    /**jsdoc
-     * @function Picks.PICK_INCLUDE_INVISIBLE
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::INVISIBLE); }
-
-    /**jsdoc
-     * @function Picks.PICK_INCLUDE_COLLIDABLE
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_INCLUDE_COLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE); }
-    /**jsdoc
-     * @function Picks.PICK_INCLUDE_NONCOLLIDABLE
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::NONCOLLIDABLE); }
-
-    /**jsdoc
-     * @function Picks.PICK_PRECISE
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_PRECISE() { return PickFilter::getBitMask(PickFilter::FlagBit::PRECISE); }
     /**jsdoc
      * @function Picks.PICK_COARSE
      * @returns {number}
      */
-    static constexpr unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::COARSE); }
+    static constexpr unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_COARSE); }
+
+    /**jsdoc
+     * @function Picks.PICK_INCLUDE_INVISIBLE
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_INVISIBLE); }
+
+    /**jsdoc
+     * @function Picks.PICK_INCLUDE_NONCOLLIDABLE
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_NONCOLLIDABLE); }
 
     /**jsdoc
      * @function Picks.PICK_ALL_INTERSECTIONS
diff --git a/interface/src/raypick/PointerScriptingInterface.h b/interface/src/raypick/PointerScriptingInterface.h
index a21c1f2470..2677f37fae 100644
--- a/interface/src/raypick/PointerScriptingInterface.h
+++ b/interface/src/raypick/PointerScriptingInterface.h
@@ -41,12 +41,10 @@ public:
     * @property {string} button Which button to trigger.  "Primary", "Secondary", "Tertiary", and "Focus" are currently supported.  Only "Primary" will trigger clicks on web surfaces.  If "Focus" is triggered,
     * it will try to set the entity or overlay focus to the object at which the Pointer is aimed.  Buttons besides the first three will still trigger events, but event.button will be "None".
     */
-
     /**jsdoc
      * Adds a new Pointer
      * Different {@link PickType}s use different properties, and within one PickType, the properties you choose can lead to a wide range of behaviors.  For example,
      *   with PickType.Ray, depending on which optional parameters you pass, you could create a Static Ray Pointer, a Mouse Ray Pointer, or a Joint Ray Pointer.
-     * Pointers created with this method always intersect at least visible and collidable things
      * @function Pointers.createPointer
      * @param {PickType} type A PickType that specifies the method of picking to use
      * @param {Pointers.LaserPointerProperties|Pointers.StylusPointerProperties|Pointers.ParabolaPointerProperties} properties A PointerProperties object, containing all the properties for initializing this Pointer <b>and</b> the {@link Picks.PickProperties} for the Pick that
@@ -60,21 +58,21 @@ public:
      *     dimensions: {x:0.5, y:0.5, z:0.5},
      *     solid: true,
      *     color: {red:0, green:255, blue:0},
-     *     ignorePickIntersection: true
+     *     ignoreRayIntersection: true
      * };
      * var end2 = {
      *     type: "sphere",
      *     dimensions: {x:0.5, y:0.5, z:0.5},
      *     solid: true,
      *     color: {red:255, green:0, blue:0},
-     *     ignorePickIntersection: true
+     *     ignoreRayIntersection: true
      * };
      *
      * var renderStates = [ {name: "test", end: end} ];
      * var defaultRenderStates = [ {name: "test", distance: 10.0, end: end2} ];
      * var pointer = Pointers.createPointer(PickType.Ray, {
      *     joint: "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND",
-     *     filter: Picks.PICK_LOCAL_ENTITIES | Picks.PICK_DOMAIN_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE,
+     *     filter: Picks.PICK_OVERLAYS | Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE,
      *     renderStates: renderStates,
      *     defaultRenderStates: defaultRenderStates,
      *     distanceScaleEnd: true,
@@ -84,7 +82,6 @@ public:
      * });
      * Pointers.setRenderState(pointer, "test");
      */
-    // TODO: expand Pointers to be able to be fully configurable with PickFilters
     Q_INVOKABLE unsigned int createPointer(const PickQuery::PickType& type, const QVariant& properties);
 
     /**jsdoc
diff --git a/interface/src/raypick/RayPick.cpp b/interface/src/raypick/RayPick.cpp
index 507e45b470..a48d858504 100644
--- a/interface/src/raypick/RayPick.cpp
+++ b/interface/src/raypick/RayPick.cpp
@@ -27,15 +27,10 @@ PickRay RayPick::getMathematicalPick() const {
 }
 
 PickResultPointer RayPick::getEntityIntersection(const PickRay& pick) {
-    PickFilter searchFilter = getFilter();
-    if (DependencyManager::get<PickManager>()->getForceCoarsePicking()) {
-        searchFilter.setFlag(PickFilter::COARSE, true);
-        searchFilter.setFlag(PickFilter::PRECISE, false);
-    }
-
+    bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
     RayToEntityIntersectionResult entityRes =
-        DependencyManager::get<EntityScriptingInterface>()->evalRayIntersectionVector(pick, searchFilter,
-            getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>());
+        DependencyManager::get<EntityScriptingInterface>()->findRayIntersectionVector(pick, precisionPicking,
+            getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
     if (entityRes.intersects) {
         return std::make_shared<RayPickResult>(IntersectionType::ENTITY, entityRes.entityID, entityRes.distance, entityRes.intersection, pick, entityRes.surfaceNormal, entityRes.extraInfo);
     } else {
@@ -44,7 +39,7 @@ PickResultPointer RayPick::getEntityIntersection(const PickRay& pick) {
 }
 
 PickResultPointer RayPick::getOverlayIntersection(const PickRay& pick) {
-    bool precisionPicking = !(getFilter().isCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
+    bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
     RayToOverlayIntersectionResult overlayRes =
         qApp->getOverlays().findRayIntersectionVector(pick, precisionPicking,
             getIncludeItemsAs<OverlayID>(), getIgnoreItemsAs<OverlayID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
diff --git a/interface/src/raypick/RayPickScriptingInterface.h b/interface/src/raypick/RayPickScriptingInterface.h
index 3ad0efd439..d5e224018e 100644
--- a/interface/src/raypick/RayPickScriptingInterface.h
+++ b/interface/src/raypick/RayPickScriptingInterface.h
@@ -19,13 +19,14 @@
 #include "PickScriptingInterface.h"
 
 /**jsdoc
- * Synonym for {@link Picks} as used for ray picks.  Deprecated.
+ * Synonym for {@link Picks} as used for ray picks.
  *
  * @namespace RayPick
  *
  * @hifi-interface
  * @hifi-client-entity
  *
+ * @property {number} PICK_NOTHING <em>Read-only.</em>
  * @property {number} PICK_ENTITIES <em>Read-only.</em>
  * @property {number} PICK_OVERLAYS <em>Read-only.</em>
  * @property {number} PICK_AVATARS <em>Read-only.</em>
@@ -43,6 +44,7 @@
 
 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)
@@ -138,6 +140,12 @@ public:
 
 public slots:
 
+    /**jsdoc
+     * @function RayPick.PICK_NOTHING
+     * @returns {number}
+     */
+    static unsigned int PICK_NOTHING() { return PickScriptingInterface::PICK_NOTHING(); }
+
     /**jsdoc
      * @function RayPick.PICK_ENTITIES
      * @returns {number}
diff --git a/interface/src/raypick/StylusPointer.cpp b/interface/src/raypick/StylusPointer.cpp
index 867f896763..5595c54b71 100644
--- a/interface/src/raypick/StylusPointer.cpp
+++ b/interface/src/raypick/StylusPointer.cpp
@@ -61,7 +61,7 @@ OverlayID StylusPointer::buildStylusOverlay(const QVariantMap& properties) {
     overlayProperties["loadPriority"] = 10.0f;
     overlayProperties["solid"] = true;
     overlayProperties["visible"] = false;
-    overlayProperties["ignorePickIntersection"] = true;
+    overlayProperties["ignoreRayIntersection"] = true;
     overlayProperties["drawInFront"] = false;
 
     return qApp->getOverlays().addOverlay("model", overlayProperties);
diff --git a/interface/src/ui/AnimStats.cpp b/interface/src/ui/AnimStats.cpp
index 6317c069f4..162292087d 100644
--- a/interface/src/ui/AnimStats.cpp
+++ b/interface/src/ui/AnimStats.cpp
@@ -17,7 +17,7 @@ HIFI_QML_DEF(AnimStats)
 static AnimStats* INSTANCE{ nullptr };
 
 AnimStats* AnimStats::getInstance() {
-    Q_ASSERT(INSTANCE);
+    //Q_ASSERT(INSTANCE);
     return INSTANCE;
 }
 
diff --git a/interface/src/ui/Keyboard.cpp b/interface/src/ui/Keyboard.cpp
index 9e9a319802..9dd233b85b 100644
--- a/interface/src/ui/Keyboard.cpp
+++ b/interface/src/ui/Keyboard.cpp
@@ -734,6 +734,7 @@ void Keyboard::setLayerIndex(int layerIndex) {
 }
 
 void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
+    return;
     if (keyboardFile.isEmpty()) {
         return;
     }
@@ -781,7 +782,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
             { "isSolid", true },
             { "visible", false },
             { "grabbable", true },
-            { "ignorePickIntersection", false },
+            { "ignoreRayIntersection", false },
             { "dimensions", anchorObject["dimensions"].toVariant() },
             { "position", anchorObject["position"].toVariant() },
             { "orientation", anchorObject["rotation"].toVariant() }
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index cb204c9772..4fc14171e8 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -46,7 +46,7 @@ static Stats* INSTANCE{ nullptr };
 QString getTextureMemoryPressureModeString();
 #endif
 Stats* Stats::getInstance() {
-    Q_ASSERT(INSTANCE);
+    //Q_ASSERT(INSTANCE);
     return INSTANCE;
 }
 
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index a1809f3438..f24ae73855 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -867,7 +867,7 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
 #ifdef Q_OS_ANDROID
     // disable IK on android
-    return underPoses;
+   // return underPoses;
 #endif
 
     // allows solutionSource to be overridden by an animVar
diff --git a/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
index da226d146b..2fcaf72f2d 100644
--- a/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
@@ -20,6 +20,7 @@ const QString& DisplayPlugin::MENU_PATH() {
     return value;
 }
 
+#if !defined(USE_QUEST)
 // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
 DisplayPluginList getDisplayPlugins() {
     DisplayPlugin* PLUGIN_POOL[] = {
@@ -49,3 +50,4 @@ DisplayPluginList getDisplayPlugins() {
     }
     return result;
 }
+#endif
\ No newline at end of file
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 6c59dbd861..60b9e2fd32 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -256,6 +256,7 @@ bool OpenGLDisplayPlugin::activate() {
         return false;
     }
 
+
     // Start the present thread if necessary
     QSharedPointer<PresentThread> presentThread;
     if (DependencyManager::isSet<PresentThread>()) {
@@ -268,6 +269,7 @@ bool OpenGLDisplayPlugin::activate() {
         if (!widget->context()->makeCurrent()) {
             throw std::runtime_error("Failed to make context current");
         }
+        //_nativeContext = QOpenGLContextWrapper::currentContextWrapper()->getNativeContext();
         CHECK_GL_ERROR();
         widget->context()->doneCurrent();
 
@@ -718,9 +720,11 @@ void OpenGLDisplayPlugin::present() {
             PROFILE_RANGE_EX(render, "internalPresent", 0xff00ffff, frameId)
             internalPresent();
         }
-
         gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory());
+    } else {
+        internalPresent();
     }
+
     _movingAveragePresent.addSample((float)(usecTimestampNow() - startPresent));
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index 5c653f8a0a..a14957d1b4 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -22,6 +22,7 @@
 #include <shared/RateCounter.h>
 
 #include <gpu/Batch.h>
+#include <gl/QOpenGLContextWrapper.h>
 
 namespace gpu {
     namespace gl {
@@ -33,6 +34,7 @@ class OpenGLDisplayPlugin : public DisplayPlugin {
     Q_OBJECT
     Q_PROPERTY(float hudAlpha MEMBER _hudAlpha)
     using Parent = DisplayPlugin;
+    using NativeContextPointer = QOpenGLContextWrapper::NativeContextPointer;
 protected:
     using Mutex = std::mutex;
     using Lock = std::unique_lock<Mutex>;
@@ -175,6 +177,7 @@ protected:
     }
 
     gpu::gl::GLBackend* getGLBackend();
+    //NativeContextPointer _nativeContext;
 
     // Any resource shared by the main thread and the presentation thread must
     // be serialized through this mutex
diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
index 9eafe381ab..4d1dfa639b 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
@@ -51,6 +51,19 @@ bool DebugHmdDisplayPlugin::internalActivate() {
     }, true, _isAutoRotateEnabled);
 
     _ipd = 0.0327499993f * 2.0f;
+
+
+    // Quest 
+    _eyeProjections[0][0] = vec4{ 0.91729, 0.0, -0.17407, 0.0  };
+    _eyeProjections[0][1] = vec4{ 0.0, 0.083354, -0.106141, 0.0 };
+    _eyeProjections[0][2] = vec4{ 0.0, 0.0, -1.0, -0.2 };
+    _eyeProjections[0][3] = vec4{ 0.0, 0.0, -1.0, 0.0 };
+    _eyeProjections[1][0] = vec4{ 0.91729, 0.0, 0.17407, 0.0 };
+    _eyeProjections[1][1] = vec4{ 0.0, 0.083354, -0.106141, 0.0 };
+    _eyeProjections[1][2] = vec4{ 0.0, 0.0, -1.0, -0.2 };
+    _eyeProjections[1][3] = vec4{ 0.0, 0.0, -1.0, 0.0 };
+
+
     // Would be nice to know why the left and right projection matrices are slightly dissymetrical
     _eyeProjections[0][0] = vec4{ 0.759056330, 0.000000000, 0.000000000, 0.000000000 };
     _eyeProjections[0][1] = vec4{ 0.000000000, 0.682773232, 0.000000000, 0.000000000 };
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index 4aeacbe05c..e608621b86 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -77,11 +77,11 @@ protected:
     float _ipd { 0.064f };
 
     struct FrameInfo {
+        uint32_t frameId{ 0 };
         mat4 renderPose;
         mat4 presentPose;
         double sensorSampleTime { 0 };
         double predictedDisplayTime { 0 };
-        mat3 presentReprojection;
     };
 
     QMap<uint32_t, FrameInfo> _frameInfos;
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index c71b296a74..5bcf1e6205 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -547,12 +547,11 @@ void EntityTreeRenderer::handleSpaceUpdate(std::pair<int32_t, glm::vec4> proxyUp
 bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityItemID>* entitiesContainingAvatar) {
     bool didUpdate = false;
     float radius = 0.01f; // for now, assume 0.01 meter radius, because we actually check the point inside later
-    QVector<QUuid> entityIDs;
+    QVector<EntityItemPointer> foundEntities;
 
     // find the entities near us
     // don't let someone else change our tree while we search
     _tree->withReadLock([&] {
-        auto entityTree = std::static_pointer_cast<EntityTree>(_tree);
 
         // FIXME - if EntityTree had a findEntitiesContainingPoint() this could theoretically be a little faster
         entityTree->evalEntitiesInSphere(_avatarPosition, radius, PickFilter(), entityIDs);
@@ -561,12 +560,7 @@ bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityIt
         _layeredZones.clear();
 
         // create a list of entities that actually contain the avatar's position
-        for (auto& entityID : entityIDs) {
-            auto entity = entityTree->findEntityByID(entityID);
-            if (!entity) {
-                continue;
-            }
-
+        for (auto& entity : foundEntities) {
             auto isZone = entity->getType() == EntityTypes::Zone;
             auto hasScript = !entity->getScript().isEmpty();
 
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index fcbe563f88..2ae0a8784d 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(gpu)
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 286f0dd650..cdcecb2b15 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -1082,10 +1082,13 @@ QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float
 
     EntityItemID result;
     if (_entityTree) {
-        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+        EntityItemPointer closestEntity;
         _entityTree->withReadLock([&] {
-            result = _entityTree->evalClosestEntity(center, radius, PickFilter(searchFilter));
+            closestEntity = _entityTree->findClosestEntity(center, radius);
         });
+        if (closestEntity) {
+            result = closestEntity->getEntityItemID();
+        }
     }
     return result;
 }
@@ -1104,10 +1107,14 @@ QVector<QUuid> EntityScriptingInterface::findEntities(const glm::vec3& center, f
 
     QVector<QUuid> result;
     if (_entityTree) {
-        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+        QVector<EntityItemPointer> entities;
         _entityTree->withReadLock([&] {
-            _entityTree->evalEntitiesInSphere(center, radius, PickFilter(searchFilter), result);
+            _entityTree->findEntities(center, radius, entities);
         });
+
+        foreach (EntityItemPointer entity, entities) {
+            result << entity->getEntityItemID();
+        }
     }
     return result;
 }
@@ -1117,11 +1124,15 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInBox(const glm::vec3& corn
 
     QVector<QUuid> result;
     if (_entityTree) {
-        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+        QVector<EntityItemPointer> entities;
         _entityTree->withReadLock([&] {
             AABox box(corner, dimensions);
-            _entityTree->evalEntitiesInBox(box, PickFilter(searchFilter), result);
+            _entityTree->findEntities(box, entities);
         });
+
+        foreach (EntityItemPointer entity, entities) {
+            result << entity->getEntityItemID();
+        }
     }
     return result;
 }
@@ -1156,10 +1167,14 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInFrustum(QVariantMap frust
         viewFrustum.calculate();
 
         if (_entityTree) {
-            unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+            QVector<EntityItemPointer> entities;
             _entityTree->withReadLock([&] {
-                _entityTree->evalEntitiesInFrustum(viewFrustum, PickFilter(searchFilter), result);
+                _entityTree->findEntities(viewFrustum, entities);
             });
+
+            foreach(EntityItemPointer entity, entities) {
+                result << entity->getEntityItemID();
+            }
         }
     }
 
@@ -1171,64 +1186,86 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesByType(const QString entity
 
     QVector<QUuid> result;
     if (_entityTree) {
-        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+        QVector<EntityItemPointer> entities;
         _entityTree->withReadLock([&] {
-            _entityTree->evalEntitiesInSphereWithType(center, radius, type, PickFilter(searchFilter), result);
+            _entityTree->findEntities(center, radius, entities);
         });
+
+        foreach(EntityItemPointer entity, entities) {
+            if (entity->getType() == type) {
+                result << entity->getEntityItemID().toString();
+            }
+        }
     }
     return result;
 }
 
 QVector<QUuid> EntityScriptingInterface::findEntitiesByName(const QString entityName, const glm::vec3& center, float radius, bool caseSensitiveSearch) const {
+    
     QVector<QUuid> result;
     if (_entityTree) {
+        QVector<EntityItemPointer> entities;
         _entityTree->withReadLock([&] {
-            unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
-            _entityTree->evalEntitiesInSphereWithName(center, radius, entityName, caseSensitiveSearch, PickFilter(searchFilter), result);
+            _entityTree->findEntities(center, radius, entities);
         });
+
+        if (caseSensitiveSearch) {
+            foreach(EntityItemPointer entity, entities) {
+                if (entity->getName() == entityName) {
+                    result << entity->getEntityItemID();
+                }
+            }
+
+        } else {
+            QString entityNameLowerCase = entityName.toLower();
+
+            foreach(EntityItemPointer entity, entities) {
+                QString entityItemLowerCase = entity->getName().toLower();
+                if (entityItemLowerCase == entityNameLowerCase) {
+                    result << entity->getEntityItemID();
+                }
+            }
+        }
     }
     return result;
 }
 
-RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking,
-        const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) const {
-    PROFILE_RANGE(script_entities, __FUNCTION__);
+RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking, 
+                const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
     QVector<EntityItemID> entitiesToInclude = qVectorEntityItemIDFromScriptValue(entityIdsToInclude);
     QVector<EntityItemID> entitiesToDiscard = qVectorEntityItemIDFromScriptValue(entityIdsToDiscard);
 
-    unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
-
-    if (!precisionPicking) {
-        searchFilter = searchFilter | PickFilter::getBitMask(PickFilter::FlagBit::COARSE);
-    }
-
-    if (visibleOnly) {
-        searchFilter = searchFilter | PickFilter::getBitMask(PickFilter::FlagBit::VISIBLE);
-    }
-
-    if (collidableOnly) {
-        searchFilter = searchFilter | PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE);
-    }
-
-    return evalRayIntersectionWorker(ray, Octree::Lock, PickFilter(searchFilter), entitiesToInclude, entitiesToDiscard);
+    return findRayIntersectionVector(ray, precisionPicking, entitiesToInclude, entitiesToDiscard, visibleOnly, collidableOnly);
 }
 
-RayToEntityIntersectionResult EntityScriptingInterface::evalRayIntersectionVector(const PickRay& ray, PickFilter searchFilter,
-        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) {
+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 evalRayIntersectionWorker(ray, Octree::Lock, searchFilter, entityIdsToInclude, entityIdsToDiscard);
+    return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly);
 }
 
-RayToEntityIntersectionResult EntityScriptingInterface::evalRayIntersectionWorker(const PickRay& ray,
-        Octree::lockType lockType, PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude,
-        const QVector<EntityItemID>& entityIdsToDiscard) const {
+// FIXME - we should remove this API and encourage all users to use findRayIntersection() instead. We've changed
+//         findRayIntersection() to be blocking because it never makes sense for a script to get back a non-answer
+RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionBlocking(const PickRay& ray, bool precisionPicking, 
+                const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard) {
+
+    qWarning() << "Entities.findRayIntersectionBlocking() is obsolete, use Entities.findRayIntersection() instead.";
+    const QVector<EntityItemID>& entitiesToInclude = qVectorEntityItemIDFromScriptValue(entityIdsToInclude);
+    const QVector<EntityItemID> entitiesToDiscard = qVectorEntityItemIDFromScriptValue(entityIdsToDiscard);
+    return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking, entitiesToInclude, entitiesToDiscard);
+}
+
+RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionWorker(const PickRay& ray,
+        Octree::lockType lockType, bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude,
+        const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
+
 
     RayToEntityIntersectionResult result;
     if (_entityTree) {
         OctreeElementPointer element;
-        result.entityID = _entityTree->evalRayIntersection(ray.origin, ray.direction,
-            entityIdsToInclude, entityIdsToDiscard, searchFilter,
+        result.entityID = _entityTree->findRayIntersection(ray.origin, ray.direction,
+            entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly, precisionPicking,
             element, result.distance, result.face, result.surfaceNormal,
             result.extraInfo, lockType, &result.accurate);
         result.intersects = !result.entityID.isNull();
@@ -1239,22 +1276,23 @@ RayToEntityIntersectionResult EntityScriptingInterface::evalRayIntersectionWorke
     return result;
 }
 
-ParabolaToEntityIntersectionResult EntityScriptingInterface::evalParabolaIntersectionVector(const PickParabola& parabola, PickFilter searchFilter,
-        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) {
+ParabolaToEntityIntersectionResult EntityScriptingInterface::findParabolaIntersectionVector(const PickParabola& parabola, bool precisionPicking,
+    const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
 
-    return evalParabolaIntersectionWorker(parabola, Octree::Lock, searchFilter, entityIdsToInclude, entityIdsToDiscard);
+    return findParabolaIntersectionWorker(parabola, Octree::Lock, precisionPicking, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly);
 }
 
-ParabolaToEntityIntersectionResult EntityScriptingInterface::evalParabolaIntersectionWorker(const PickParabola& parabola,
-    Octree::lockType lockType, PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude,
-    const QVector<EntityItemID>& entityIdsToDiscard) const {
+ParabolaToEntityIntersectionResult EntityScriptingInterface::findParabolaIntersectionWorker(const PickParabola& parabola,
+    Octree::lockType lockType, bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude,
+    const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
+
 
     ParabolaToEntityIntersectionResult result;
     if (_entityTree) {
         OctreeElementPointer element;
-        result.entityID = _entityTree->evalParabolaIntersection(parabola,
-            entityIdsToInclude, entityIdsToDiscard, searchFilter,
+        result.entityID = _entityTree->findParabolaIntersection(parabola,
+            entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly, precisionPicking,
             element, result.intersection, result.distance, result.parabolicDistance, result.face, result.surfaceNormal,
             result.extraInfo, lockType, &result.accurate);
         result.intersects = !result.entityID.isNull();
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index 0e96cb2d25..add7e26c6c 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -24,7 +24,6 @@
 #include <OctreeScriptingInterface.h>
 #include <RegisteredMetaTypes.h>
 #include <PointerEvent.h>
-#include <PickFilter.h>
 
 #include "PolyVoxEntityItem.h"
 #include "LineEntityItem.h"
@@ -57,7 +56,8 @@ private:
 };
 
 /**jsdoc
- * The result of a {@link PickRay} search using {@link Entities.findRayIntersection|findRayIntersection}.
+ * The result of a {@link PickRay} search using {@link Entities.findRayIntersection|findRayIntersection} or 
+ * {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}.
  * @typedef {object} Entities.RayToEntityIntersectionResult
  * @property {boolean} intersects - <code>true</code> if the {@link PickRay} intersected an entity, otherwise 
  *     <code>false</code>.
@@ -119,6 +119,7 @@ public:
 /// handles scripting of Entity commands from JS passed to assigned clients
 class EntityScriptingInterface : public OctreeScriptingInterface, public Dependency  {
     Q_OBJECT
+
     Q_PROPERTY(QUuid keyboardFocusEntity READ getKeyboardFocusEntity WRITE setKeyboardFocusEntity)
 
     friend EntityPropertyMetadataRequest;
@@ -143,10 +144,10 @@ public:
     void resetActivityTracking();
     ActivityTracking getActivityTracking() const { return _activityTracking; }
 
-    RayToEntityIntersectionResult evalRayIntersectionVector(const PickRay& ray, PickFilter searchFilter,
-        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard);
-    ParabolaToEntityIntersectionResult evalParabolaIntersectionVector(const PickParabola& parabola, PickFilter searchFilter,
-        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard);
+    // TODO: expose to script?
+    ParabolaToEntityIntersectionResult findParabolaIntersectionVector(const PickParabola& parabola, bool precisionPicking,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
+        bool visibleOnly, bool collidableOnly);
 
     /**jsdoc
     * Get the properties of multiple entities.
@@ -393,8 +394,9 @@ public slots:
     Q_INVOKABLE void callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, 
         const QStringList& params = QStringList());
 
+
     /**jsdoc
-     * Find the non-local entity with a position closest to a specified point and within a specified radius.
+     * Find the entity with a position closest to a specified point and within a specified radius.
      * @function Entities.findClosestEntity
      * @param {Vec3} center - The point about which to search.
      * @param {number} radius - The radius within which to search.
@@ -408,7 +410,7 @@ public slots:
     Q_INVOKABLE QUuid findClosestEntity(const glm::vec3& center, float radius) const;
 
     /**jsdoc
-     * Find all non-local entities that intersect a sphere defined by a center point and radius.
+     * Find all entities that intersect a sphere defined by a center point and radius.
      * @function Entities.findEntities
      * @param {Vec3} center - The point about which to search.
      * @param {number} radius - The radius within which to search.
@@ -422,23 +424,23 @@ public slots:
     Q_INVOKABLE QVector<QUuid> findEntities(const glm::vec3& center, float radius) const;
 
     /**jsdoc
-     * Find all non-local entities whose axis-aligned boxes intersect a search axis-aligned box defined by its minimum coordinates corner
+     * Find all entities whose axis-aligned boxes intersect a search axis-aligned box defined by its minimum coordinates corner
      * and dimensions.
      * @function Entities.findEntitiesInBox
      * @param {Vec3} corner - The corner of the search AA box with minimum co-ordinate values.
      * @param {Vec3} dimensions - The dimensions of the search AA box.
-     * @returns {Uuid[]} An array of entity IDs whose AA boxes intersect the search AA box. The array is empty if no entities
+     * @returns {Uuid[]} An array of entity IDs whose AA boxes intersect the search AA box. The array is empty if no entities 
      *     could be found.
      */
     /// this function will not find any models in script engine contexts which don't have access to models
     Q_INVOKABLE QVector<QUuid> findEntitiesInBox(const glm::vec3& corner, const glm::vec3& dimensions) const;
 
     /**jsdoc
-     * Find all non-local entities whose axis-aligned boxes intersect a search frustum.
+     * Find all entities whose axis-aligned boxes intersect a search frustum.
      * @function Entities.findEntitiesInFrustum
      * @param {ViewFrustum} frustum - The frustum to search in. The <code>position</code>, <code>orientation</code>, 
      *     <code>projection</code>, and <code>centerRadius</code> properties must be specified.
-     * @returns {Uuid[]} An array of entity IDs axis-aligned boxes intersect the frustum. The array is empty if no entities
+     * @returns {Uuid[]} An array of entity IDs axis-aligned boxes intersect the frustum. The array is empty if no entities 
      *     could be found.
      * @example <caption>Report the number of entities in view.</caption>
      * var entityIDs = Entities.findEntitiesInFrustum(Camera.frustum);
@@ -448,12 +450,12 @@ public slots:
     Q_INVOKABLE QVector<QUuid> findEntitiesInFrustum(QVariantMap frustum) const;
 
     /**jsdoc
-     * Find all non-local entities of a particular type that intersect a sphere defined by a center point and radius.
+     * Find all entities of a particular type that intersect a sphere defined by a center point and radius.
      * @function Entities.findEntitiesByType
      * @param {Entities.EntityType} entityType - The type of entity to search for.
      * @param {Vec3} center - The point about which to search.
      * @param {number} radius - The radius within which to search.
-     * @returns {Uuid[]} An array of entity IDs of the specified type that intersect the search sphere. The array is empty if
+     * @returns {Uuid[]} An array of entity IDs of the specified type that intersect the search sphere. The array is empty if 
      *     no entities could be found.
      * @example <caption>Report the number of Model entities within 10m of your avatar.</caption>
      * var entityIDs = Entities.findEntitiesByType("Model", MyAvatar.position, 10);
@@ -463,7 +465,7 @@ public slots:
     Q_INVOKABLE QVector<QUuid> findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const;
 
     /**jsdoc
-    * Find all non-local entities with a particular name that intersect a sphere defined by a center point and radius.
+    * Find all entities of a particular name that intersect a sphere defined by a center point and radius.
     * @function Entities.findEntitiesByName
     * @param {string} entityName - The name of the entity to search for.
     * @param {Vec3} center - The point about which to search.
@@ -473,13 +475,13 @@ public slots:
     *     if no entities could be found.
     * @example <caption>Report the number of entities with the name, "Light-Target".</caption>
     * var entityIDs = Entities.findEntitiesByName("Light-Target", MyAvatar.position, 10, false);
-    * print("Number of entities with the name Light-Target: " + entityIDs.length);
+    * print("Number of entities with the name "Light-Target": " + entityIDs.length);
     */
-    Q_INVOKABLE QVector<QUuid> findEntitiesByName(const QString entityName, const glm::vec3& center, float radius,
-        bool caseSensitiveSearch = false) const;
+    Q_INVOKABLE QVector<QUuid> findEntitiesByName(const QString entityName, const glm::vec3& center, float radius, 
+        bool caseSensitiveSearch = false ) const;
 
     /**jsdoc
-     * Find the first non-local entity intersected by a {@link PickRay}. <code>Light</code> and <code>Zone</code> entities are not
+     * Find the first entity intersected by a {@link PickRay}. <code>Light</code> and <code>Zone</code> entities are not 
      * intersected unless they've been configured as pickable using {@link Entities.setLightsArePickable|setLightsArePickable}
      * and {@link Entities.setZonesArePickable|setZonesArePickable}, respectively.<br />
      * @function Entities.findRayIntersection
@@ -510,8 +512,33 @@ public slots:
     /// may be inaccurate if the engine is unable to access the visible entities, in which case result.accurate
     /// will be false.
     Q_INVOKABLE RayToEntityIntersectionResult findRayIntersection(const PickRay& ray, bool precisionPicking = false,
-            const QScriptValue& entityIdsToInclude = QScriptValue(), const QScriptValue& entityIdsToDiscard = QScriptValue(),
-            bool visibleOnly = false, bool collidableOnly = false) const;
+        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);
+
+    /**jsdoc
+     * Find the first entity intersected by a {@link PickRay}. <code>Light</code> and <code>Zone</code> entities are not 
+     * intersected unless they've been configured as pickable using {@link Entities.setLightsArePickable|setLightsArePickable} 
+     * and {@link Entities.setZonesArePickable|setZonesArePickable}, respectively.<br />
+     * This is a synonym for {@link Entities.findRayIntersection|findRayIntersection}.
+     * @function Entities.findRayIntersectionBlocking
+     * @param {PickRay} pickRay - The PickRay to use for finding entities.
+     * @param {boolean} [precisionPicking=false] - If <code>true</code> and the intersected entity is a <code>Model</code>
+     *     entity, the result's <code>extraInfo</code> property includes more information than it otherwise would.
+     * @param {Uuid[]} [entitiesToInclude=[]] - If not empty then the search is restricted to these entities.
+     * @param {Uuid[]} [entitiesToDiscard=[]] - Entities to ignore during the search.
+     * @deprecated This function is deprecated and will soon be removed. Use 
+     *    {@link Entities.findRayIntersection|findRayIntersection} instead; it blocks and performs the same function.
+     */
+    /// 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());
+
 
     /**jsdoc
      * Reloads an entity's server entity script such that the latest version re-downloaded.
@@ -576,7 +603,9 @@ public slots:
     /**jsdoc
      * Set whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Light} entities. By default, Light 
      * entities are not intersected. The setting lasts for the Interface session. Ray picks are done using 
-     *     {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
+     *     {@link Entities.findRayIntersection|findRayIntersection} or 
+     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
+     *     APIs.
      * @function Entities.setLightsArePickable
      * @param {boolean} value - Set <code>true</code> to make ray picks intersect the bounding box of 
      *     {@link Entities.EntityType|Light} entities, otherwise <code>false</code>.
@@ -586,7 +615,9 @@ public slots:
 
     /**jsdoc
      * Get whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Light} entities. Ray picks are 
-     *     done using {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
+     *     done using {@link Entities.findRayIntersection|findRayIntersection} or 
+     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
+     *     APIs.
      * @function Entities.getLightsArePickable
      * @returns {boolean} <code>true</code> if ray picks intersect the bounding box of {@link Entities.EntityType|Light} 
      *     entities, otherwise <code>false</code>.
@@ -597,7 +628,9 @@ public slots:
     /**jsdoc
      * Set whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Zone} entities. By default, Light 
      * entities are not intersected. The setting lasts for the Interface session. Ray picks are done using 
-     *     {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
+     *     {@link Entities.findRayIntersection|findRayIntersection} or 
+     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
+     *     APIs.
      * @function Entities.setZonesArePickable
      * @param {boolean} value - Set <code>true</code> to make ray picks intersect the bounding box of 
      *     {@link Entities.EntityType|Zone} entities, otherwise <code>false</code>.
@@ -607,7 +640,9 @@ public slots:
 
     /**jsdoc
      * Get whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Zone} entities. Ray picks are 
-     *     done using {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
+     *     done using {@link Entities.findRayIntersection|findRayIntersection} or 
+     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
+     *     APIs.
      * @function Entities.getZonesArePickable
      * @returns {boolean} <code>true</code> if ray picks intersect the bounding box of {@link Entities.EntityType|Zone} 
      *      entities, otherwise <code>false</code>.
@@ -2065,12 +2100,14 @@ private:
 
 
     /// actually does the work of finding the ray intersection, can be called in locking mode or tryLock mode
-    RayToEntityIntersectionResult evalRayIntersectionWorker(const PickRay& ray, Octree::lockType lockType,
-        PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) const;
+    RayToEntityIntersectionResult findRayIntersectionWorker(const PickRay& ray, Octree::lockType lockType,
+        bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
+        bool visibleOnly = false, bool collidableOnly = false);
 
     /// actually does the work of finding the parabola intersection, can be called in locking mode or tryLock mode
-    ParabolaToEntityIntersectionResult evalParabolaIntersectionWorker(const PickParabola& parabola, Octree::lockType lockType,
-        PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) const;
+    ParabolaToEntityIntersectionResult findParabolaIntersectionWorker(const PickParabola& parabola, Octree::lockType lockType,
+        bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
+        bool visibleOnly = false, bool collidableOnly = false);
 
     EntityTreePointer _entityTree;
 
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 954462a9f2..98fcdc1db1 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -43,6 +43,50 @@
 static const quint64 DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER = USECS_PER_MSEC * 50;
 const float EntityTree::DEFAULT_MAX_TMP_ENTITY_LIFETIME = 60 * 60; // 1 hour
 
+// combines the ray cast arguments into a single object
+class RayArgs {
+public:
+    // Inputs
+    glm::vec3 origin;
+    glm::vec3 direction;
+    glm::vec3 invDirection;
+    const QVector<EntityItemID>& entityIdsToInclude;
+    const QVector<EntityItemID>& entityIdsToDiscard;
+    bool visibleOnly;
+    bool collidableOnly;
+    bool precisionPicking;
+
+    // Outputs
+    OctreeElementPointer& element;
+    float& distance;
+    BoxFace& face;
+    glm::vec3& surfaceNormal;
+    QVariantMap& extraInfo;
+    EntityItemID entityID;
+};
+
+class ParabolaArgs {
+public:
+    // Inputs
+    glm::vec3 origin;
+    glm::vec3 velocity;
+    glm::vec3 acceleration;
+    const QVector<EntityItemID>& entityIdsToInclude;
+    const QVector<EntityItemID>& entityIdsToDiscard;
+    bool visibleOnly;
+    bool collidableOnly;
+    bool precisionPicking;
+
+    // Outputs
+    OctreeElementPointer& element;
+    float& parabolicDistance;
+    BoxFace& face;
+    glm::vec3& surfaceNormal;
+    QVariantMap& extraInfo;
+    EntityItemID entityID;
+};
+
+
 EntityTree::EntityTree(bool shouldReaverage) :
     Octree(shouldReaverage)
 {
@@ -772,32 +816,59 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator)
     }
 }
 
-class RayArgs {
-public:
-    // Inputs
-    glm::vec3 origin;
-    glm::vec3 direction;
-    glm::vec3 invDirection;
-    const QVector<EntityItemID>& entityIdsToInclude;
-    const QVector<EntityItemID>& entityIdsToDiscard;
-    PickFilter searchFilter;
 
-    // Outputs
-    OctreeElementPointer& element;
-    float& distance;
-    BoxFace& face;
-    glm::vec3& surfaceNormal;
-    QVariantMap& extraInfo;
-    EntityItemID entityID;
+class FindNearPointArgs {
+public:
+    glm::vec3 position;
+    float targetRadius;
+    bool found;
+    EntityItemPointer closestEntity;
+    float closestEntityDistance;
 };
 
-bool evalRayIntersectionOp(const OctreeElementPointer& element, void* extraData) {
+
+bool EntityTree::findNearPointOperation(const OctreeElementPointer& element, void* extraData) {
+    FindNearPointArgs* args = static_cast<FindNearPointArgs*>(extraData);
+    EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+
+    glm::vec3 penetration;
+    bool sphereIntersection = entityTreeElement->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
+
+    // If this entityTreeElement contains the point, then search it...
+    if (sphereIntersection) {
+        EntityItemPointer thisClosestEntity = entityTreeElement->getClosestEntity(args->position);
+
+        // we may have gotten NULL back, meaning no entity was available
+        if (thisClosestEntity) {
+            glm::vec3 entityPosition = thisClosestEntity->getWorldPosition();
+            float distanceFromPointToEntity = glm::distance(entityPosition, args->position);
+
+            // If we're within our target radius
+            if (distanceFromPointToEntity <= args->targetRadius) {
+                // we are closer than anything else we've found
+                if (distanceFromPointToEntity < args->closestEntityDistance) {
+                    args->closestEntity = thisClosestEntity;
+                    args->closestEntityDistance = distanceFromPointToEntity;
+                    args->found = true;
+                }
+            }
+        }
+
+        // we should be able to optimize this...
+        return true; // keep searching in case children have closer entities
+    }
+
+    // if this element doesn't contain the point, then none of its children can contain the point, so stop searching
+    return false;
+}
+
+bool findRayIntersectionOp(const OctreeElementPointer& element, void* extraData) {
     RayArgs* args = static_cast<RayArgs*>(extraData);
     bool keepSearching = true;
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
-    EntityItemID entityID = entityTreeElementPointer->evalRayIntersection(args->origin, args->direction,
+    EntityItemID entityID = entityTreeElementPointer->findRayIntersection(args->origin, args->direction,
         args->element, args->distance, args->face, args->surfaceNormal, args->entityIdsToInclude,
-        args->entityIdsToDiscard, args->searchFilter, args->extraInfo);
+        args->entityIdsToDiscard, args->visibleOnly, args->collidableOnly, args->extraInfo, args->precisionPicking);
     if (!entityID.isNull()) {
         args->entityID = entityID;
         // We recurse OctreeElements in order, so if we hit something, we can stop immediately
@@ -806,7 +877,7 @@ bool evalRayIntersectionOp(const OctreeElementPointer& element, void* extraData)
     return keepSearching;
 }
 
-float evalRayIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
+float findRayIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
     RayArgs* args = static_cast<RayArgs*>(extraData);
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
     float distance = FLT_MAX;
@@ -827,18 +898,19 @@ float evalRayIntersectionSortingOp(const OctreeElementPointer& element, void* ex
     return distance;
 }
 
-EntityItemID EntityTree::evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+EntityItemID EntityTree::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                                     QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-                                    PickFilter searchFilter, OctreeElementPointer& element, float& distance,
+                                    bool visibleOnly, bool collidableOnly, bool precisionPicking, 
+                                    OctreeElementPointer& element, float& distance,
                                     BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
                                     Octree::lockType lockType, bool* accurateResult) {
     RayArgs args = { origin, direction, 1.0f / direction, entityIdsToInclude, entityIdsToDiscard,
-            searchFilter, element, distance, face, surfaceNormal, extraInfo, EntityItemID() };
+            visibleOnly, collidableOnly, precisionPicking, element, distance, face, surfaceNormal, extraInfo, EntityItemID() };
     distance = FLT_MAX;
 
     bool requireLock = lockType == Octree::Lock;
     bool lockResult = withReadLock([&]{
-        recurseTreeWithOperationSorted(evalRayIntersectionOp, evalRayIntersectionSortingOp, &args);
+        recurseTreeWithOperationSorted(findRayIntersectionOp, findRayIntersectionSortingOp, &args);
     }, requireLock);
 
     if (accurateResult) {
@@ -848,32 +920,13 @@ EntityItemID EntityTree::evalRayIntersection(const glm::vec3& origin, const glm:
     return args.entityID;
 }
 
-class ParabolaArgs {
-public:
-    // Inputs
-    glm::vec3 origin;
-    glm::vec3 velocity;
-    glm::vec3 acceleration;
-    const QVector<EntityItemID>& entityIdsToInclude;
-    const QVector<EntityItemID>& entityIdsToDiscard;
-    PickFilter searchFilter;
-
-    // Outputs
-    OctreeElementPointer& element;
-    float& parabolicDistance;
-    BoxFace& face;
-    glm::vec3& surfaceNormal;
-    QVariantMap& extraInfo;
-    EntityItemID entityID;
-};
-
-bool evalParabolaIntersectionOp(const OctreeElementPointer& element, void* extraData) {
+bool findParabolaIntersectionOp(const OctreeElementPointer& element, void* extraData) {
     ParabolaArgs* args = static_cast<ParabolaArgs*>(extraData);
     bool keepSearching = true;
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
-    EntityItemID entityID = entityTreeElementPointer->evalParabolaIntersection(args->origin, args->velocity, args->acceleration,
+    EntityItemID entityID = entityTreeElementPointer->findParabolaIntersection(args->origin, args->velocity, args->acceleration,
         args->element, args->parabolicDistance, args->face, args->surfaceNormal, args->entityIdsToInclude,
-        args->entityIdsToDiscard, args->searchFilter, args->extraInfo);
+        args->entityIdsToDiscard, args->visibleOnly, args->collidableOnly, args->extraInfo, args->precisionPicking);
     if (!entityID.isNull()) {
         args->entityID = entityID;
         // We recurse OctreeElements in order, so if we hit something, we can stop immediately
@@ -882,7 +935,7 @@ bool evalParabolaIntersectionOp(const OctreeElementPointer& element, void* extra
     return keepSearching;
 }
 
-float evalParabolaIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
+float findParabolaIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
     ParabolaArgs* args = static_cast<ParabolaArgs*>(extraData);
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
     float distance = FLT_MAX;
@@ -903,20 +956,20 @@ float evalParabolaIntersectionSortingOp(const OctreeElementPointer& element, voi
     return distance;
 }
 
-EntityItemID EntityTree::evalParabolaIntersection(const PickParabola& parabola,
+EntityItemID EntityTree::findParabolaIntersection(const PickParabola& parabola,
                                     QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-                                    PickFilter searchFilter,
+                                    bool visibleOnly, bool collidableOnly, bool precisionPicking,
                                     OctreeElementPointer& element, glm::vec3& intersection, float& distance, float& parabolicDistance,
                                     BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
                                     Octree::lockType lockType, bool* accurateResult) {
     ParabolaArgs args = { parabola.origin, parabola.velocity, parabola.acceleration, entityIdsToInclude, entityIdsToDiscard,
-        searchFilter, element, parabolicDistance, face, surfaceNormal, extraInfo, EntityItemID() };
+        visibleOnly, collidableOnly, precisionPicking, element, parabolicDistance, face, surfaceNormal, extraInfo, EntityItemID() };
     parabolicDistance = FLT_MAX;
     distance = FLT_MAX;
 
     bool requireLock = lockType == Octree::Lock;
     bool lockResult = withReadLock([&] {
-        recurseTreeWithOperationSorted(evalParabolaIntersectionOp, evalParabolaIntersectionSortingOp, &args);
+        recurseTreeWithOperationSorted(findParabolaIntersectionOp, findParabolaIntersectionSortingOp, &args);
     }, requireLock);
 
     if (accurateResult) {
@@ -931,80 +984,33 @@ EntityItemID EntityTree::evalParabolaIntersection(const PickParabola& parabola,
     return args.entityID;
 }
 
-class FindClosestEntityArgs {
-public:
-    // Inputs
-    glm::vec3 position;
-    float targetRadius;
-    PickFilter searchFilter;
 
-    // Outputs
-    QUuid closestEntity;
-    float closestEntityDistance;
-};
-
-
-bool evalClosestEntityOperation(const OctreeElementPointer& element, void* extraData) {
-    FindClosestEntityArgs* args = static_cast<FindClosestEntityArgs*>(extraData);
-    EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-
-    glm::vec3 penetration;
-    bool sphereIntersection = entityTreeElement->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
-
-    // If this entityTreeElement contains the point, then search it...
-    if (sphereIntersection) {
-        float closestDistanceSquared = FLT_MAX;
-        QUuid thisClosestEntity = entityTreeElement->evalClosetEntity(args->position, args->searchFilter, closestDistanceSquared);
-
-        // we may have gotten NULL back, meaning no entity was available
-        if (!thisClosestEntity.isNull()) {
-            float distanceFromPointToEntity = glm::sqrt(closestDistanceSquared);
-
-            // If we're within our target radius
-            if (distanceFromPointToEntity <= args->targetRadius) {
-                // we are closer than anything else we've found
-                if (distanceFromPointToEntity < args->closestEntityDistance) {
-                    args->closestEntity = thisClosestEntity;
-                    args->closestEntityDistance = distanceFromPointToEntity;
-                }
-            }
-        }
-
-        // we should be able to optimize this...
-        return true; // keep searching in case children have closer entities
-    }
-
-    // if this element doesn't contain the point, then none of its children can contain the point, so stop searching
-    return false;
-}
-
-// NOTE: assumes caller has handled locking
-QUuid EntityTree::evalClosestEntity(const glm::vec3& position, float targetRadius, PickFilter searchFilter) {
-    FindClosestEntityArgs args = { position, targetRadius, searchFilter, QUuid(), FLT_MAX };
-    recurseTreeWithOperation(evalClosestEntityOperation, &args);
+EntityItemPointer EntityTree::findClosestEntity(const glm::vec3& position, float targetRadius) {
+    FindNearPointArgs args = { position, targetRadius, false, NULL, FLT_MAX };
+    withReadLock([&] {
+        // NOTE: This should use recursion, since this is a spatial operation
+        recurseTreeWithOperation(findNearPointOperation, &args);
+    });
     return args.closestEntity;
 }
 
-class FindEntitiesInSphereArgs {
+class FindAllNearPointArgs {
 public:
-    // Inputs
     glm::vec3 position;
     float targetRadius;
-    PickFilter searchFilter;
-
-    // Outputs
-    QVector<QUuid> entities;
+    QVector<EntityItemPointer> entities;
 };
 
-bool evalInSphereOperation(const OctreeElementPointer& element, void* extraData) {
-    FindEntitiesInSphereArgs* args = static_cast<FindEntitiesInSphereArgs*>(extraData);
+
+bool EntityTree::findInSphereOperation(const OctreeElementPointer& element, void* extraData) {
+    FindAllNearPointArgs* args = static_cast<FindAllNearPointArgs*>(extraData);
     glm::vec3 penetration;
     bool sphereIntersection = element->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
 
     // If this element contains the point, then search it...
     if (sphereIntersection) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->evalEntitiesInSphere(args->position, args->targetRadius, args->searchFilter, args->entities);
+        entityTreeElement->getEntities(args->position, args->targetRadius, args->entities);
         return true; // keep searching in case children have closer entities
     }
 
@@ -1013,168 +1019,104 @@ bool evalInSphereOperation(const OctreeElementPointer& element, void* extraData)
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::evalEntitiesInSphere(const glm::vec3& center, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
-    FindEntitiesInSphereArgs args = { center, radius, searchFilter, QVector<QUuid>() };
-    recurseTreeWithOperation(evalInSphereOperation, &args);
-    foundEntities.swap(args.entities);
-}
+void EntityTree::findEntities(const glm::vec3& center, float radius, QVector<EntityItemPointer>& foundEntities) {
+    FindAllNearPointArgs args = { center, radius, QVector<EntityItemPointer>() };
+    // NOTE: This should use recursion, since this is a spatial operation
+    recurseTreeWithOperation(findInSphereOperation, &args);
 
-class FindEntitiesInSphereWithTypeArgs {
-public:
-    // Inputs
-    glm::vec3 position;
-    float targetRadius;
-    EntityTypes::EntityType type;
-    PickFilter searchFilter;
-
-    // Outputs
-    QVector<QUuid> entities;
-};
-
-bool evalInSphereWithTypeOperation(const OctreeElementPointer& element, void* extraData) {
-    FindEntitiesInSphereWithTypeArgs* args = static_cast<FindEntitiesInSphereWithTypeArgs*>(extraData);
-    glm::vec3 penetration;
-    bool sphereIntersection = element->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
-
-    // If this element contains the point, then search it...
-    if (sphereIntersection) {
-        EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->evalEntitiesInSphereWithType(args->position, args->targetRadius, args->type, args->searchFilter, args->entities);
-        return true; // keep searching in case children have closer entities
-    }
-
-    // if this element doesn't contain the point, then none of it's children can contain the point, so stop searching
-    return false;
-}
-
-// NOTE: assumes caller has handled locking
-void EntityTree::evalEntitiesInSphereWithType(const glm::vec3& center, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
-    FindEntitiesInSphereWithTypeArgs args = { center, radius, type, searchFilter, QVector<QUuid>() };
-    recurseTreeWithOperation(evalInSphereWithTypeOperation, &args);
-    foundEntities.swap(args.entities);
-}
-
-class FindEntitiesInSphereWithNameArgs {
-public:
-    // Inputs
-    glm::vec3 position;
-    float targetRadius;
-    QString name;
-    bool caseSensitive;
-    PickFilter searchFilter;
-
-    // Outputs
-    QVector<QUuid> entities;
-};
-
-bool evalInSphereWithNameOperation(const OctreeElementPointer& element, void* extraData) {
-    FindEntitiesInSphereWithNameArgs* args = static_cast<FindEntitiesInSphereWithNameArgs*>(extraData);
-    glm::vec3 penetration;
-    bool sphereIntersection = element->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
-
-    // If this element contains the point, then search it...
-    if (sphereIntersection) {
-        EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->evalEntitiesInSphereWithName(args->position, args->targetRadius, args->name, args->caseSensitive, args->searchFilter, args->entities);
-        return true; // keep searching in case children have closer entities
-    }
-
-    // if this element doesn't contain the point, then none of it's children can contain the point, so stop searching
-    return false;
-}
-
-// NOTE: assumes caller has handled locking
-void EntityTree::evalEntitiesInSphereWithName(const glm::vec3& center, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
-    FindEntitiesInSphereWithNameArgs args = { center, radius, name, caseSensitive, searchFilter, QVector<QUuid>() };
-    recurseTreeWithOperation(evalInSphereWithNameOperation, &args);
+    // swap the two lists of entity pointers instead of copy
     foundEntities.swap(args.entities);
 }
 
 class FindEntitiesInCubeArgs {
 public:
-    // Inputs
-    AACube cube;
-    PickFilter searchFilter;
+    FindEntitiesInCubeArgs(const AACube& cube)
+        : _cube(cube), _foundEntities() {
+    }
 
-    // Outputs
-    QVector<QUuid> entities;
+    AACube _cube;
+    QVector<EntityItemPointer> _foundEntities;
 };
 
-bool findInCubeOperation(const OctreeElementPointer& element, void* extraData) {
+bool EntityTree::findInCubeOperation(const OctreeElementPointer& element, void* extraData) {
     FindEntitiesInCubeArgs* args = static_cast<FindEntitiesInCubeArgs*>(extraData);
-    if (element->getAACube().touches(args->cube)) {
+    if (element->getAACube().touches(args->_cube)) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->evalEntitiesInCube(args->cube, args->searchFilter, args->entities);
+        entityTreeElement->getEntities(args->_cube, args->_foundEntities);
         return true;
     }
     return false;
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
-    FindEntitiesInCubeArgs args { cube, searchFilter, QVector<QUuid>() };
+void EntityTree::findEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities) {
+    FindEntitiesInCubeArgs args(cube);
+    // NOTE: This should use recursion, since this is a spatial operation
     recurseTreeWithOperation(findInCubeOperation, &args);
-    foundEntities.swap(args.entities);
+    // swap the two lists of entity pointers instead of copy
+    foundEntities.swap(args._foundEntities);
 }
 
 class FindEntitiesInBoxArgs {
 public:
-    // Inputs
-    AABox box;
-    PickFilter searchFilter;
+    FindEntitiesInBoxArgs(const AABox& box)
+    : _box(box), _foundEntities() {
+    }
 
-    // Outputs
-    QVector<QUuid> entities;
+    AABox _box;
+    QVector<EntityItemPointer> _foundEntities;
 };
 
-bool findInBoxOperation(const OctreeElementPointer& element, void* extraData) {
+bool EntityTree::findInBoxOperation(const OctreeElementPointer& element, void* extraData) {
     FindEntitiesInBoxArgs* args = static_cast<FindEntitiesInBoxArgs*>(extraData);
-    if (element->getAACube().touches(args->box)) {
+    if (element->getAACube().touches(args->_box)) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->evalEntitiesInBox(args->box, args->searchFilter, args->entities);
+        entityTreeElement->getEntities(args->_box, args->_foundEntities);
         return true;
     }
     return false;
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
-    FindEntitiesInBoxArgs args { box, searchFilter, QVector<QUuid>() };
+void EntityTree::findEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities) {
+    FindEntitiesInBoxArgs args(box);
     // NOTE: This should use recursion, since this is a spatial operation
     recurseTreeWithOperation(findInBoxOperation, &args);
     // swap the two lists of entity pointers instead of copy
-    foundEntities.swap(args.entities);
+    foundEntities.swap(args._foundEntities);
 }
 
-class FindEntitiesInFrustumArgs {
+class FindInFrustumArgs {
 public:
-    // Inputs
     ViewFrustum frustum;
-    PickFilter searchFilter;
-
-    // Outputs
-    QVector<QUuid> entities;
+    QVector<EntityItemPointer> entities;
 };
 
-bool findInFrustumOperation(const OctreeElementPointer& element, void* extraData) {
-    FindEntitiesInFrustumArgs* args = static_cast<FindEntitiesInFrustumArgs*>(extraData);
+bool EntityTree::findInFrustumOperation(const OctreeElementPointer& element, void* extraData) {
+    FindInFrustumArgs* args = static_cast<FindInFrustumArgs*>(extraData);
     if (element->isInView(args->frustum)) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->evalEntitiesInFrustum(args->frustum, args->searchFilter, args->entities);
+        entityTreeElement->getEntities(args->frustum, args->entities);
         return true;
     }
     return false;
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
-    FindEntitiesInFrustumArgs args = { frustum, searchFilter, QVector<QUuid>() };
+void EntityTree::findEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities) {
+    FindInFrustumArgs args = { frustum, QVector<EntityItemPointer>() };
     // NOTE: This should use recursion, since this is a spatial operation
     recurseTreeWithOperation(findInFrustumOperation, &args);
     // swap the two lists of entity pointers instead of copy
     foundEntities.swap(args.entities);
 }
 
+// NOTE: assumes caller has handled locking
+void EntityTree::findEntities(RecurseOctreeOperation& elementFilter,
+                              QVector<EntityItemPointer>& foundEntities) {
+    recurseTreeWithOperation(elementFilter, nullptr);
+}
+
 EntityItemPointer EntityTree::findEntityByID(const QUuid& id) const {
     EntityItemID entityID(id);
     return findEntityByEntityItemID(entityID);
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index f9b7b8d67f..46c45714aa 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -45,6 +45,7 @@ public:
     QHash<EntityItemID, EntityItemID>* map;
 };
 
+
 class EntityTree : public Octree, public SpatialParentTree {
     Q_OBJECT
 public:
@@ -93,16 +94,18 @@ public:
     virtual void processChallengeOwnershipReplyPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
     virtual void processChallengeOwnershipPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
 
-    virtual EntityItemID evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+    virtual EntityItemID findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
         QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-        PickFilter searchFilter, OctreeElementPointer& element, float& distance,
+        bool visibleOnly, bool collidableOnly, bool precisionPicking, 
+        OctreeElementPointer& element, float& distance,
         BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
         Octree::lockType lockType = Octree::TryLock, bool* accurateResult = NULL);
 
-    virtual EntityItemID evalParabolaIntersection(const PickParabola& parabola,
+    virtual EntityItemID findParabolaIntersection(const PickParabola& parabola,
         QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-        PickFilter searchFilter, OctreeElementPointer& element, glm::vec3& intersection,
-        float& distance, float& parabolicDistance, BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
+        bool visibleOnly, bool collidableOnly, bool precisionPicking,
+        OctreeElementPointer& element, glm::vec3& intersection, float& distance, float& parabolicDistance,
+        BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
         Octree::lockType lockType = Octree::TryLock, bool* accurateResult = NULL);
 
     virtual bool rootElementHasData() const override { return true; }
@@ -127,19 +130,44 @@ public:
     void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = true);
     void deleteEntities(QSet<EntityItemID> entityIDs, bool force = false, bool ignoreWarnings = true);
 
+    /// \param position point of query in world-frame (meters)
+    /// \param targetRadius radius of query (meters)
+    EntityItemPointer findClosestEntity(const glm::vec3& position, float targetRadius);
     EntityItemPointer findEntityByID(const QUuid& id) const;
     EntityItemPointer findEntityByEntityItemID(const EntityItemID& entityID) const;
     virtual SpatiallyNestablePointer findByID(const QUuid& id) const override { return findEntityByID(id); }
 
     EntityItemID assignEntityID(const EntityItemID& entityItemID); /// Assigns a known ID for a creator token ID
 
-    QUuid evalClosestEntity(const glm::vec3& position, float targetRadius, PickFilter searchFilter);
-    void evalEntitiesInSphere(const glm::vec3& center, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities);
-    void evalEntitiesInSphereWithType(const glm::vec3& center, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities);
-    void evalEntitiesInSphereWithName(const glm::vec3& center, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities);
-    void evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities);
-    void evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities);
-    void evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities);
+
+    /// finds all entities that touch a sphere
+    /// \param center the center of the sphere in world-frame (meters)
+    /// \param radius the radius of the sphere in world-frame (meters)
+    /// \param foundEntities[out] vector of EntityItemPointer
+    /// \remark Side effect: any initial contents in foundEntities will be lost
+    void findEntities(const glm::vec3& center, float radius, QVector<EntityItemPointer>& foundEntities);
+
+    /// finds all entities that touch a cube
+    /// \param cube the query cube in world-frame (meters)
+    /// \param foundEntities[out] vector of non-EntityItemPointer
+    /// \remark Side effect: any initial contents in entities will be lost
+    void findEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities);
+
+    /// finds all entities that touch a box
+    /// \param box the query box in world-frame (meters)
+    /// \param foundEntities[out] vector of non-EntityItemPointer
+    /// \remark Side effect: any initial contents in entities will be lost
+    void findEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities);
+
+    /// finds all entities within a frustum
+    /// \parameter frustum the query frustum
+    /// \param foundEntities[out] vector of EntityItemPointer
+    void findEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities);
+
+    /// finds all entities that match scanOperator
+    /// \parameter scanOperator function that scans entities that match criteria
+    /// \parameter foundEntities[out] vector of EntityItemPointer
+    void findEntities(RecurseOctreeOperation& scanOperator, QVector<EntityItemPointer>& foundEntities);
 
     void addNewlyCreatedHook(NewlyCreatedEntityHook* hook);
     void removeNewlyCreatedHook(NewlyCreatedEntityHook* hook);
@@ -299,6 +327,11 @@ protected:
     void processRemovedEntities(const DeleteEntityOperator& theOperator);
     bool updateEntity(EntityItemPointer entity, const EntityItemProperties& properties,
             const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
+    static bool findNearPointOperation(const OctreeElementPointer& element, void* extraData);
+    static bool findInSphereOperation(const OctreeElementPointer& element, void* extraData);
+    static bool findInCubeOperation(const OctreeElementPointer& element, void* extraData);
+    static bool findInBoxOperation(const OctreeElementPointer& element, void* extraData);
+    static bool findInFrustumOperation(const OctreeElementPointer& element, void* extraData);
     static bool sendEntitiesOperation(const OctreeElementPointer& element, void* extraData);
     static void bumpTimestamp(EntityItemProperties& properties);
 
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 3b085457d1..b6fdea4e0d 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -139,23 +139,10 @@ bool EntityTreeElement::bestFitBounds(const glm::vec3& minPoint, const glm::vec3
     return false;
 }
 
-bool checkFilterSettings(const EntityItemPointer& entity, PickFilter searchFilter) {
-    bool visible = entity->isVisible();
-    bool collidable = !entity->getCollisionless() && (entity->getShapeType() != SHAPE_TYPE_NONE);
-    if ((!searchFilter.doesPickVisible() && visible) || (!searchFilter.doesPickInvisible() && !visible) ||
-        (!searchFilter.doesPickCollidable() && collidable) || (!searchFilter.doesPickNonCollidable() && !collidable) ||
-        (!searchFilter.doesPickDomainEntities() && entity->isDomainEntity()) ||
-        (!searchFilter.doesPickAvatarEntities() && entity->isAvatarEntity()) ||
-        (!searchFilter.doesPickLocalEntities() && entity->isLocalEntity())) {
-        return false;
-    }
-    return true;
-}
-
-EntityItemID EntityTreeElement::evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
-        OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
-        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-        PickFilter searchFilter, QVariantMap& extraInfo) {
+EntityItemID EntityTreeElement::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+    OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
+    const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
+    bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking) {
 
     EntityItemID result;
     BoxFace localFace { UNKNOWN_FACE };
@@ -167,8 +154,9 @@ EntityItemID EntityTreeElement::evalRayIntersection(const glm::vec3& origin, con
 
     QVariantMap localExtraInfo;
     float distanceToElementDetails = distance;
-    EntityItemID entityID = evalDetailedRayIntersection(origin, direction, element, distanceToElementDetails,
-            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, searchFilter, localExtraInfo);
+    EntityItemID entityID = findDetailedRayIntersection(origin, direction, element, distanceToElementDetails,
+            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly,
+            localExtraInfo, precisionPicking);
     if (!entityID.isNull() && distanceToElementDetails < distance) {
         distance = distanceToElementDetails;
         face = localFace;
@@ -179,12 +167,13 @@ EntityItemID EntityTreeElement::evalRayIntersection(const glm::vec3& origin, con
     return result;
 }
 
-EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+EntityItemID EntityTreeElement::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                                     OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
                                     const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIDsToDiscard,
-                                    PickFilter searchFilter, QVariantMap& extraInfo) {
+                                    bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking) {
 
     // only called if we do intersect our bounding cube, but find if we actually intersect with entities...
+    int entityNumber = 0;
     EntityItemID entityID;
     forEachEntity([&](EntityItemPointer entity) {
         if (entity->getIgnorePickIntersection()) {
@@ -202,9 +191,11 @@ EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& ori
             return;
         }
 
-        if (!checkFilterSettings(entity, searchFilter) ||
-            (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID())) ||
-            (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID())) ) {
+        // check RayPick filter settings
+        if ((visibleOnly && !entity->isVisible())
+                || (collidableOnly && (entity->getCollisionless() || entity->getShapeType() == SHAPE_TYPE_NONE))
+                || (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID()))
+                || (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID())) ) {
             return;
         }
 
@@ -235,7 +226,7 @@ EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& ori
                 if (entity->supportsDetailedIntersection()) {
                     QVariantMap localExtraInfo;
                     if (entity->findDetailedRayIntersection(origin, direction, element, localDistance,
-                            localFace, localSurfaceNormal, localExtraInfo, searchFilter.isPrecise())) {
+                            localFace, localSurfaceNormal, localExtraInfo, precisionPicking)) {
                         if (localDistance < distance) {
                             distance = localDistance;
                             face = localFace;
@@ -257,6 +248,7 @@ EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& ori
                 }
             }
         }
+        entityNumber++;
     });
     return entityID;
 }
@@ -287,10 +279,11 @@ bool EntityTreeElement::findSpherePenetration(const glm::vec3& center, float rad
     return result;
 }
 
-EntityItemID EntityTreeElement::evalParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
+EntityItemID EntityTreeElement::findParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
     const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
     BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-    const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo) {
+    const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
+    QVariantMap& extraInfo, bool precisionPicking) {
 
     EntityItemID result;
     BoxFace localFace;
@@ -311,8 +304,9 @@ EntityItemID EntityTreeElement::evalParabolaIntersection(const glm::vec3& origin
     }
     // Get the normal of the plane, the cross product of two vectors on the plane
     glm::vec3 normal = glm::normalize(glm::cross(vectorOnPlane, acceleration));
-    EntityItemID entityID = evalDetailedParabolaIntersection(origin, velocity, acceleration, normal, element, distanceToElementDetails,
-            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, searchFilter, localExtraInfo);
+    EntityItemID entityID = findDetailedParabolaIntersection(origin, velocity, acceleration, normal, element, distanceToElementDetails,
+            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly,
+            localExtraInfo, precisionPicking);
     if (!entityID.isNull() && distanceToElementDetails < parabolicDistance) {
         parabolicDistance = distanceToElementDetails;
         face = localFace;
@@ -323,12 +317,13 @@ EntityItemID EntityTreeElement::evalParabolaIntersection(const glm::vec3& origin
     return result;
 }
 
-EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity, const glm::vec3& acceleration,
+EntityItemID EntityTreeElement::findDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity, const glm::vec3& acceleration,
                                     const glm::vec3& normal, OctreeElementPointer& element, float& parabolicDistance, BoxFace& face, glm::vec3& surfaceNormal,
                                     const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIDsToDiscard,
-                                    PickFilter searchFilter, QVariantMap& extraInfo) {
+                                    bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking) {
 
     // only called if we do intersect our bounding cube, but find if we actually intersect with entities...
+    int entityNumber = 0;
     EntityItemID entityID;
     forEachEntity([&](EntityItemPointer entity) {
         if (entity->getIgnorePickIntersection()) {
@@ -351,9 +346,11 @@ EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3
             return;
         }
 
-        if (!checkFilterSettings(entity, searchFilter) ||
-            (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID())) ||
-            (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID()))) {
+        // check RayPick filter settings
+        if ((visibleOnly && !entity->isVisible())
+                || (collidableOnly && (entity->getCollisionless() || entity->getShapeType() == SHAPE_TYPE_NONE))
+                || (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID()))
+                || (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID())) ) {
             return;
         }
 
@@ -385,7 +382,7 @@ EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3
                 if (entity->supportsDetailedIntersection()) {
                     QVariantMap localExtraInfo;
                     if (entity->findDetailedParabolaIntersection(origin, velocity, acceleration, element, localDistance,
-                            localFace, localSurfaceNormal, localExtraInfo, searchFilter.isPrecise())) {
+                            localFace, localSurfaceNormal, localExtraInfo, precisionPicking)) {
                         if (localDistance < parabolicDistance) {
                             parabolicDistance = localDistance;
                             face = localFace;
@@ -407,56 +404,55 @@ EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3
                 }
             }
         }
+        entityNumber++;
     });
     return entityID;
 }
 
-QUuid EntityTreeElement::evalClosetEntity(const glm::vec3& position, PickFilter searchFilter, float& closestDistanceSquared) const {
-    QUuid closestEntity;
-    forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter)) {
-            return;
-        }
-
-        float distanceToEntity = glm::distance2(position, entity->getWorldPosition());
-        if (distanceToEntity < closestDistanceSquared) {
-            closestEntity = entity->getID();
-            closestDistanceSquared = distanceToEntity;
+EntityItemPointer EntityTreeElement::getClosestEntity(glm::vec3 position) const {
+    EntityItemPointer closestEntity = NULL;
+    float closestEntityDistance = FLT_MAX;
+    withReadLock([&] {
+        foreach(EntityItemPointer entity, _entityItems) {
+            float distanceToEntity = glm::distance2(position, entity->getWorldPosition());
+            if (distanceToEntity < closestEntityDistance) {
+                closestEntity = entity;
+            }
         }
     });
     return closestEntity;
 }
 
-void EntityTreeElement::evalEntitiesInSphere(const glm::vec3& position, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
+// TODO: change this to use better bounding shape for entity than sphere
+void EntityTreeElement::getEntities(const glm::vec3& searchPosition, float searchRadius, QVector<EntityItemPointer>& foundEntities) const {
     forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter)) {
-            return;
-        }
 
         bool success;
         AABox entityBox = entity->getAABox(success);
 
         // if the sphere doesn't intersect with our world frame AABox, we don't need to consider the more complex case
         glm::vec3 penetration;
-        if (success && entityBox.findSpherePenetration(position, radius, penetration)) {
+        if (!success || entityBox.findSpherePenetration(searchPosition, searchRadius, penetration)) {
 
             glm::vec3 dimensions = entity->getRaycastDimensions();
 
             // FIXME - consider allowing the entity to determine penetration so that
-            //         entities could presumably do actual hull testing if they wanted to
+            //         entities could presumably dull actuall hull testing if they wanted to
             // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better in particular
             //         can we handle the ellipsoid case better? We only currently handle perfect spheres
             //         with centered registration points
-            if (entity->getShapeType() == SHAPE_TYPE_SPHERE && (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
+            if (entity->getShapeType() == SHAPE_TYPE_SPHERE &&
+                (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
 
                 // NOTE: entity->getRadius() doesn't return the true radius, it returns the radius of the
                 //       maximum bounding sphere, which is actually larger than our actual radius
                 float entityTrueRadius = dimensions.x / 2.0f;
 
                 bool success;
-                if (findSphereSpherePenetration(position, radius, entity->getCenterPosition(success), entityTrueRadius, penetration)) {
+                if (findSphereSpherePenetration(searchPosition, searchRadius,
+                        entity->getCenterPosition(success), entityTrueRadius, penetration)) {
                     if (success) {
-                        foundEntities.push_back(entity->getID());
+                        foundEntities.push_back(entity);
                     }
                 }
             } else {
@@ -472,134 +468,17 @@ void EntityTreeElement::evalEntitiesInSphere(const glm::vec3& position, float ra
 
                 AABox entityFrameBox(corner, dimensions);
 
-                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(position, 1.0f));
-                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, radius, penetration)) {
-                    foundEntities.push_back(entity->getID());
+                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(searchPosition, 1.0f));
+                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, searchRadius, penetration)) {
+                    foundEntities.push_back(entity);
                 }
             }
         }
     });
 }
 
-void EntityTreeElement::evalEntitiesInSphereWithType(const glm::vec3& position, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
+void EntityTreeElement::getEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities) {
     forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter) || type != entity->getType()) {
-            return;
-        }
-
-        bool success;
-        AABox entityBox = entity->getAABox(success);
-
-        // if the sphere doesn't intersect with our world frame AABox, we don't need to consider the more complex case
-        glm::vec3 penetration;
-        if (success && entityBox.findSpherePenetration(position, radius, penetration)) {
-
-            glm::vec3 dimensions = entity->getRaycastDimensions();
-
-            // FIXME - consider allowing the entity to determine penetration so that
-            //         entities could presumably do actual hull testing if they wanted to
-            // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better in particular
-            //         can we handle the ellipsoid case better? We only currently handle perfect spheres
-            //         with centered registration points
-            if (entity->getShapeType() == SHAPE_TYPE_SPHERE && (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
-
-                // NOTE: entity->getRadius() doesn't return the true radius, it returns the radius of the
-                //       maximum bounding sphere, which is actually larger than our actual radius
-                float entityTrueRadius = dimensions.x / 2.0f;
-
-                bool success;
-                if (findSphereSpherePenetration(position, radius, entity->getCenterPosition(success), entityTrueRadius, penetration)) {
-                    if (success) {
-                        foundEntities.push_back(entity->getID());
-                    }
-                }
-            } else {
-                // determine the worldToEntityMatrix that doesn't include scale because
-                // we're going to use the registration aware aa box in the entity frame
-                glm::mat4 rotation = glm::mat4_cast(entity->getWorldOrientation());
-                glm::mat4 translation = glm::translate(entity->getWorldPosition());
-                glm::mat4 entityToWorldMatrix = translation * rotation;
-                glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
-
-                glm::vec3 registrationPoint = entity->getRegistrationPoint();
-                glm::vec3 corner = -(dimensions * registrationPoint);
-
-                AABox entityFrameBox(corner, dimensions);
-
-                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(position, 1.0f));
-                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, radius, penetration)) {
-                    foundEntities.push_back(entity->getID());
-                }
-            }
-        }
-    });
-}
-
-void EntityTreeElement::evalEntitiesInSphereWithName(const glm::vec3& position, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
-    forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter)) {
-            return;
-        }
-
-        QString entityName = entity->getName();
-        if ((caseSensitive && name != entityName) || (!caseSensitive && name.toLower() != entityName.toLower())) {
-            return;
-        }
-
-        bool success;
-        AABox entityBox = entity->getAABox(success);
-
-        // if the sphere doesn't intersect with our world frame AABox, we don't need to consider the more complex case
-        glm::vec3 penetration;
-        if (success && entityBox.findSpherePenetration(position, radius, penetration)) {
-
-            glm::vec3 dimensions = entity->getRaycastDimensions();
-
-            // FIXME - consider allowing the entity to determine penetration so that
-            //         entities could presumably do actual hull testing if they wanted to
-            // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better in particular
-            //         can we handle the ellipsoid case better? We only currently handle perfect spheres
-            //         with centered registration points
-            if (entity->getShapeType() == SHAPE_TYPE_SPHERE && (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
-
-                // NOTE: entity->getRadius() doesn't return the true radius, it returns the radius of the
-                //       maximum bounding sphere, which is actually larger than our actual radius
-                float entityTrueRadius = dimensions.x / 2.0f;
-
-                bool success;
-                if (findSphereSpherePenetration(position, radius, entity->getCenterPosition(success), entityTrueRadius, penetration)) {
-                    if (success) {
-                        foundEntities.push_back(entity->getID());
-                    }
-                }
-            } else {
-                // determine the worldToEntityMatrix that doesn't include scale because
-                // we're going to use the registration aware aa box in the entity frame
-                glm::mat4 rotation = glm::mat4_cast(entity->getWorldOrientation());
-                glm::mat4 translation = glm::translate(entity->getWorldPosition());
-                glm::mat4 entityToWorldMatrix = translation * rotation;
-                glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
-
-                glm::vec3 registrationPoint = entity->getRegistrationPoint();
-                glm::vec3 corner = -(dimensions * registrationPoint);
-
-                AABox entityFrameBox(corner, dimensions);
-
-                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(position, 1.0f));
-                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, radius, penetration)) {
-                    foundEntities.push_back(entity->getID());
-                }
-            }
-        }
-    });
-}
-
-void EntityTreeElement::evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
-    forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter)) {
-            return;
-        }
-
         bool success;
         AABox entityBox = entity->getAABox(success);
         // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better
@@ -618,18 +497,14 @@ void EntityTreeElement::evalEntitiesInCube(const AACube& cube, PickFilter search
         //
 
         // If the entities AABox touches the search cube then consider it to be found
-        if (success && entityBox.touches(cube)) {
-            foundEntities.push_back(entity->getID());
+        if (!success || entityBox.touches(cube)) {
+            foundEntities.push_back(entity);
         }
     });
 }
 
-void EntityTreeElement::evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
+void EntityTreeElement::getEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities) {
     forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter)) {
-            return;
-        }
-
         bool success;
         AABox entityBox = entity->getAABox(success);
         // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better
@@ -648,24 +523,19 @@ void EntityTreeElement::evalEntitiesInBox(const AABox& box, PickFilter searchFil
         //
 
         // If the entities AABox touches the search cube then consider it to be found
-        if (success && entityBox.touches(box)) {
-            foundEntities.push_back(entity->getID());
+        if (!success || entityBox.touches(box)) {
+            foundEntities.push_back(entity);
         }
     });
 }
 
-void EntityTreeElement::evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
+void EntityTreeElement::getEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities) {
     forEachEntity([&](EntityItemPointer entity) {
-        if (!checkFilterSettings(entity, searchFilter)) {
-            return;
-        }
-
         bool success;
         AABox entityBox = entity->getAABox(success);
-
         // FIXME - See FIXMEs for similar methods above.
-        if (success && (frustum.boxIntersectsFrustum(entityBox) || frustum.boxIntersectsKeyhole(entityBox))) {
-            foundEntities.push_back(entity->getID());
+        if (!success || frustum.boxIntersectsFrustum(entityBox) || frustum.boxIntersectsKeyhole(entityBox)) {
+            foundEntities.push_back(entity);
         }
     });
 }
diff --git a/libraries/entities/src/EntityTreeElement.h b/libraries/entities/src/EntityTreeElement.h
index 3f1fda57bd..c65a4ebe05 100644
--- a/libraries/entities/src/EntityTreeElement.h
+++ b/libraries/entities/src/EntityTreeElement.h
@@ -19,8 +19,7 @@
 
 #include "EntityEditPacketSender.h"
 #include "EntityItem.h"
-
-#include <PickFilter.h>
+#include "EntityTree.h"
 
 class EntityTree;
 class EntityTreeElement;
@@ -78,6 +77,7 @@ public:
     EntityEditPacketSender* packetSender;
 };
 
+
 class EntityTreeElement : public OctreeElement, ReadWriteLockable {
     friend class EntityTree; // to allow createElement to new us...
 
@@ -135,25 +135,28 @@ public:
     virtual bool deleteApproved() const override { return !hasEntities(); }
 
     virtual bool canPickIntersect() const override { return hasEntities(); }
-    virtual EntityItemID evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+    virtual EntityItemID findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
         OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
         const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-        PickFilter searchFilter, QVariantMap& extraInfo);
-    virtual EntityItemID evalDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+        bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking = false);
+    virtual EntityItemID findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                          OctreeElementPointer& element, float& distance,
                          BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-                         const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo);
+                         const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
+                         QVariantMap& extraInfo, bool precisionPicking);
     virtual bool findSpherePenetration(const glm::vec3& center, float radius,
                         glm::vec3& penetration, void** penetratedObject) const override;
 
-    virtual EntityItemID evalParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
+    virtual EntityItemID findParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
         const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
         BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-        const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo);
-    virtual EntityItemID evalDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
+        const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
+        QVariantMap& extraInfo, bool precisionPicking = false);
+    virtual EntityItemID findDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
         const glm::vec3& normal, const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
         BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-        const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo);
+        const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
+        QVariantMap& extraInfo, bool precisionPicking);
 
     template <typename F>
     void forEachEntity(F f) const {
@@ -172,13 +175,28 @@ public:
 
     void addEntityItem(EntityItemPointer entity);
 
-    QUuid evalClosetEntity(const glm::vec3& position, PickFilter searchFilter, float& closestDistanceSquared) const;
-    void evalEntitiesInSphere(const glm::vec3& position, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
-    void evalEntitiesInSphereWithType(const glm::vec3& position, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
-    void evalEntitiesInSphereWithName(const glm::vec3& position, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
-    void evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
-    void evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
-    void evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
+    EntityItemPointer getClosestEntity(glm::vec3 position) const;
+
+    /// finds all entities that touch a sphere
+    /// \param position the center of the query sphere
+    /// \param radius the radius of the query sphere
+    /// \param entities[out] vector of const EntityItemPointer
+    void getEntities(const glm::vec3& position, float radius, QVector<EntityItemPointer>& foundEntities) const;
+
+    /// finds all entities that touch a box
+    /// \param box the query box
+    /// \param entities[out] vector of non-const EntityItemPointer
+    void getEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities);
+
+    /// finds all entities that touch a box
+    /// \param box the query box
+    /// \param entities[out] vector of non-const EntityItemPointer
+    void getEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities);
+
+    /// finds all entities that touch a frustum
+    /// \param frustum the query frustum
+    /// \param entities[out] vector of non-const EntityItemPointer
+    void getEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities);
 
     /// finds all entities that match filter
     /// \param filter function that adds matching entities to foundEntities
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index 925cf9b288..855452e8f0 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(TARGET_NAME gl)
-setup_hifi_library(Gui Widgets Qml Quick)
+setup_hifi_library(Gui Widgets)
 link_hifi_libraries(shared)
 target_opengl()
 
diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 7d27b42909..bd31e9463c 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -26,6 +26,9 @@
 #include "Config.h"
 #include "GLHelpers.h"
 #include "QOpenGLContextWrapper.h"
+#if defined(GL_CUSTOM_CONTEXT)
+#include <QtPlatformHeaders/QWGLNativeContext>
+#endif
 
 using namespace gl;
 
@@ -195,6 +198,21 @@ GLAPI PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
 
 Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
 
+#if defined(GL_CUSTOM_CONTEXT)
+bool Context::makeCurrent() {	
+    BOOL result = wglMakeCurrent(_hdc, _hglrc);	
+    assert(result);	
+    updateSwapchainMemoryCounter();	
+     return result;	
+}	
+ void Context::swapBuffers() {	
+    SwapBuffers(_hdc);	
+}	
+ void Context::doneCurrent() {	
+    wglMakeCurrent(0, 0);	
+}
+#endif
+
 void Context::create(QOpenGLContext* shareContext) {
     if (!shareContext) {
         shareContext = qt_gl_global_share_context();
@@ -297,7 +315,11 @@ void Context::create(QOpenGLContext* shareContext) {
                 contextAttribs.push_back(0);
             }
             contextAttribs.push_back(0);
-            HGLRC shareHglrc = (HGLRC)QOpenGLContextWrapper::nativeContext(shareContext);
+            HGLRC shareHglrc = nullptr;
+            if (shareContext) {
+                auto nativeContextPointer = QOpenGLContextWrapper(shareContext).getNativeContext();
+                shareHglrc = (HGLRC)nativeContextPointer->context();
+            }
             _hglrc = wglCreateContextAttribsARB(_hdc, shareHglrc, &contextAttribs[0]);
         }
 
diff --git a/libraries/gl/src/gl/ContextQt.cpp b/libraries/gl/src/gl/ContextQt.cpp
index 82724dfd62..2f1319e689 100644
--- a/libraries/gl/src/gl/ContextQt.cpp
+++ b/libraries/gl/src/gl/ContextQt.cpp
@@ -58,15 +58,20 @@ void Context::debugMessageHandler(const QOpenGLDebugMessage& debugMessage) {
     }
 
     auto severity = debugMessage.severity();
+    auto type = debugMessage.type();
+    if (type == QOpenGLDebugMessage::PerformanceType) {
+        return;
+    }
     switch (severity) {
         case QOpenGLDebugMessage::NotificationSeverity:
         case QOpenGLDebugMessage::LowSeverity:
+            qCDebug(glLogging) << debugMessage;
             return;
+
         default:
+            qCWarning(glLogging) << debugMessage;
             break;
     }
-    qWarning(glLogging) << debugMessage;
-    return;
 }
 
 void Context::setupDebugLogging(QOpenGLContext *context) {
@@ -82,6 +87,8 @@ void Context::setupDebugLogging(QOpenGLContext *context) {
     }
 }
 
+
+#if !defined(GL_CUSTOM_CONTEXT)
 bool Context::makeCurrent() {
     updateSwapchainMemoryCounter();
     bool result = _qglContext->makeCurrent(_window);
@@ -98,6 +105,7 @@ void Context::doneCurrent() {
         _qglContext->doneCurrent();
     }
 }
+#endif
 
 Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
 const QSurfaceFormat& getDefaultOpenGLSurfaceFormat();
diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
index f05acb50e9..533ed1a5f4 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -19,6 +19,7 @@
 #include <QtCore/QThread>
 #include <QtCore/QThreadStorage>
 #include <QtCore/QPointer>
+#include <QtCore/QCoreApplication>
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLDebugLogger>
@@ -59,27 +60,16 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
         sharedContext->doneCurrent();
         _context->setShareContext(sharedContext);
     }
+
     if (!_context->create()) {
         qFatal("Failed to create OffscreenGLCanvas context");
     }
 
     _offscreenSurface->setFormat(_context->format());
     _offscreenSurface->create();
-
-    // Due to a https://bugreports.qt.io/browse/QTBUG-65125 we can't rely on `isValid`
-    // to determine if the offscreen surface was successfully created, so we use
-    // makeCurrent as a proxy test.  Bug is fixed in Qt 5.9.4
-#if defined(Q_OS_ANDROID)
-    if (!_context->makeCurrent(_offscreenSurface)) {
-        qFatal("Unable to make offscreen surface current");
-    }
-    _context->doneCurrent();
-#else
     if (!_offscreenSurface->isValid()) {
         qFatal("Offscreen surface is invalid");
     }
-#endif
-    
     return true;
 }
 
diff --git a/libraries/gl/src/gl/QOpenGLContextWrapper.cpp b/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
index fbebb1128d..eecdb14c7a 100644
--- a/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
+++ b/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
@@ -12,11 +12,26 @@
 #include "QOpenGLContextWrapper.h"
 
 #include <QOpenGLContext>
-
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/QWGLNativeContext>
 #endif
 
+QOpenGLContextWrapper::Pointer QOpenGLContextWrapper::currentContextWrapper() {
+    return std::make_shared<QOpenGLContextWrapper>(QOpenGLContext::currentContext());
+}
+
+
+QOpenGLContextWrapper::NativeContextPointer QOpenGLContextWrapper::getNativeContext() const {
+    QOpenGLContextWrapper::NativeContextPointer result;
+    auto nativeHandle = _context->nativeHandle();
+    if (nativeHandle.canConvert<QGLNativeContext>()) {
+        result = std::make_shared<QGLNativeContext>();
+        *result = nativeHandle.value<QGLNativeContext>();
+    }
+    return result;
+}
+
+
 uint32_t QOpenGLContextWrapper::currentContextVersion() {
     QOpenGLContext* context = QOpenGLContext::currentContext();
     if (!context) {
@@ -49,19 +64,6 @@ void QOpenGLContextWrapper::setFormat(const QSurfaceFormat& format) {
     _context->setFormat(format);
 }
 
-#ifdef Q_OS_WIN
-void* QOpenGLContextWrapper::nativeContext(QOpenGLContext* context) {
-    HGLRC result = 0;
-    if (context != nullptr) {
-        auto nativeHandle = context->nativeHandle();
-        if (nativeHandle.canConvert<QWGLNativeContext>()) {
-            result = nativeHandle.value<QWGLNativeContext>().context();
-        }
-    }
-    return result;
-}
-#endif
-
 bool QOpenGLContextWrapper::create() {
     return _context->create();
 }
diff --git a/libraries/gl/src/gl/QOpenGLContextWrapper.h b/libraries/gl/src/gl/QOpenGLContextWrapper.h
index 32ba7f22e8..1fade3e7fa 100644
--- a/libraries/gl/src/gl/QOpenGLContextWrapper.h
+++ b/libraries/gl/src/gl/QOpenGLContextWrapper.h
@@ -12,19 +12,31 @@
 #ifndef hifi_QOpenGLContextWrapper_h
 #define hifi_QOpenGLContextWrapper_h
 
-#include <stdint.h>
 #include <QtGlobal>
+#include <memory>
 
 class QOpenGLContext;
 class QSurface;
 class QSurfaceFormat;
 class QThread;
 
+#if defined(Q_OS_ANDROID)
+#include <EGL/egl.h>
+#include <QtPlatformHeaders/QEGLNativeContext>
+using QGLNativeContext = QEGLNativeContext;
+#elif defined(Q_OS_WIN)
+class QWGLNativeContext;
+using QGLNativeContext = QWGLNativeContext;
+#else
+using QGLNativeContext = void*;
+#endif
+
 class QOpenGLContextWrapper {
 public:
-#ifdef Q_OS_WIN
-    static void* nativeContext(QOpenGLContext* context);
-#endif
+    using Pointer = std::shared_ptr<QOpenGLContextWrapper>;
+    using NativeContextPointer = std::shared_ptr<QGLNativeContext>;
+    static Pointer currentContextWrapper();
+
 
     QOpenGLContextWrapper();
     QOpenGLContextWrapper(QOpenGLContext* context);
@@ -37,6 +49,8 @@ public:
     void setShareContext(QOpenGLContext* otherContext);
     void moveToThread(QThread* thread);
 
+    NativeContextPointer getNativeContext() const;
+
     static QOpenGLContext* currentContext();
     static uint32_t currentContextVersion();
 
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
index 82f4f97e3b..138710ebe6 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
@@ -422,6 +422,10 @@ public:
     PROFILE_RANGE(category, name); \
     GlDuration glProfileRangeThis(name);
 
+#ifndef GL_CLIP_DISTANCE0
+#define  GL_CLIP_DISTANCE0 GL_CLIP_DISTANCE0_EXT
+#endif
+
 void GLBackend::render(const Batch& batch) {
     GL_PROFILE_RANGE(render_gpu_gl, batch.getName().c_str());
 
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
index b5a279a54c..18d5243fc3 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
@@ -32,7 +32,7 @@
 
 // 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
-#if defined(USE_GLES)
+#if defined(USE_GLES) && 0
 #define GPU_STEREO_TECHNIQUE_DOUBLED_SIMPLE
 #else
 //#define GPU_STEREO_TECHNIQUE_DOUBLED_SMARTER
@@ -95,7 +95,7 @@ public:
     // Shutdown rendering and persist any required resources
     void shutdown() override;
 
-    void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false);
+    void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false) override;
     void render(const Batch& batch) final override;
 
     // This call synchronize the Full Backend cache with the current GLState
diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
index e02f12819e..8f0d5f0632 100644
--- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
@@ -24,6 +24,10 @@
 #include <gpu/TextureTable.h>
 #include <gpu/gl/GLTexelFormat.h>
 
+static const QString FORCE_MOBILE_TEXTURES_STRING{ "HIFI_FORCE_MOBILE_TEXTURES" };
+static bool FORCE_MOBILE_TEXTURES = QProcessEnvironment::systemEnvironment().contains(FORCE_MOBILE_TEXTURES_STRING);
+
+
 using namespace gpu;
 using namespace gpu::gl;
 using namespace gpu::gl45;
@@ -32,6 +36,9 @@ using namespace gpu::gl45;
 #define ENABLE_SPARSE_TEXTURE 0
 
 bool GL45Backend::supportedTextureFormat(const gpu::Element& format) {
+    if (FORCE_MOBILE_TEXTURES) {
+    } else {
+    }
     switch (format.getSemantic()) {
         // ETC textures are actually required by the OpenGL spec as of 4.3, but aren't always supported by hardware
         // They'll be recompressed by OpenGL, which will be slow or have poor quality, so disable them for now
@@ -45,9 +52,10 @@ bool GL45Backend::supportedTextureFormat(const gpu::Element& format) {
         case gpu::Semantic::COMPRESSED_EAC_RED_SIGNED:
         case gpu::Semantic::COMPRESSED_EAC_XY:
         case gpu::Semantic::COMPRESSED_EAC_XY_SIGNED:
-            return false;
+            return FORCE_MOBILE_TEXTURES;
+
         default:
-            return true;
+            return FORCE_MOBILE_TEXTURES ? !format.isCompressed() : true;
     }
 }
 
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
index 9c3a83ce13..f7decd805c 100644
--- a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
@@ -15,7 +15,7 @@
 #include <gpu/gl/GLFramebuffer.h>
 #include <gpu/gl/GLTexture.h>
 
-namespace gpu { namespace gles { 
+namespace gpu { namespace gles {
 
 class GLESFramebuffer : public gl::GLFramebuffer {
     using Parent = gl::GLFramebuffer;
diff --git a/libraries/gpu/src/gpu/Context.h b/libraries/gpu/src/gpu/Context.h
index b080b0ceac..26a49da835 100644
--- a/libraries/gpu/src/gpu/Context.h
+++ b/libraries/gpu/src/gpu/Context.h
@@ -66,6 +66,7 @@ public:
     virtual void syncProgram(const gpu::ShaderPointer& program) = 0;
     virtual void recycle() const = 0;
     virtual void downloadFramebuffer(const FramebufferPointer& srcFramebuffer, const Vec4i& region, QImage& destImage) = 0;
+    virtual void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false) {}
 
     virtual bool supportedTextureFormat(const gpu::Element& format) = 0;
 
diff --git a/libraries/gpu/src/gpu/FrameReader.cpp b/libraries/gpu/src/gpu/FrameReader.cpp
index c63eaf51c3..00591ce78b 100644
--- a/libraries/gpu/src/gpu/FrameReader.cpp
+++ b/libraries/gpu/src/gpu/FrameReader.cpp
@@ -35,7 +35,12 @@ public:
     }
 
     Deserializer(const std::string& filename, uint32_t externalTexture, const TextureLoader& loader) :
-        basename(getBaseName(filename)), externalTexture(externalTexture), textureLoader(loader) {}
+        basename(getBaseName(filename)), externalTexture(externalTexture), textureLoader(loader) {
+        basedir = QFileInfo(filename.c_str()).absoluteDir().canonicalPath().toStdString();
+        if (*basedir.rbegin() != '/') {
+            basedir += '/';
+        }
+    }
 
     const std::string basename;
     std::string basedir;
@@ -302,6 +307,21 @@ TexturePointer Deserializer::readTexture(const json& node, uint32_t external) {
         return nullptr;
     }
 
+    std::string source;
+    readOptional(source, node, keys::source);
+
+    std::string ktxFile;
+    readOptional(ktxFile, node, keys::ktxFile);
+    Element ktxTexelFormat, ktxMipFormat;
+    if (!ktxFile.empty()) {
+        if (QFileInfo(ktxFile.c_str()).isRelative()) {
+            ktxFile = basedir + ktxFile;
+        }
+        ktx::StoragePointer ktxStorage{ new storage::FileStorage(ktxFile.c_str()) };
+        auto ktxObject = ktx::KTX::create(ktxStorage);
+        Texture::evalTextureFormat(ktxObject->getHeader(), ktxTexelFormat, ktxMipFormat);
+    }
+
     TextureUsageType usageType = node[keys::usageType];
     Texture::Type type = node[keys::type];
     glm::u16vec4 dims;
@@ -312,6 +332,9 @@ TexturePointer Deserializer::readTexture(const json& node, uint32_t external) {
     uint16 mips = node[keys::mips];
     uint16 samples = node[keys::samples];
     Element texelFormat = readElement(node[keys::texelFormat]);
+    if (!ktxFile.empty() && (ktxMipFormat.isCompressed() != texelFormat.isCompressed())) {
+        texelFormat = ktxMipFormat;
+    }
     Sampler sampler;
     readOptionalTransformed<Sampler>(sampler, node, keys::sampler, [](const json& node) { return readSampler(node); });
     TexturePointer result;
@@ -325,8 +348,6 @@ TexturePointer Deserializer::readTexture(const json& node, uint32_t external) {
     auto& texture = *result;
     readOptional(texture._source, node, keys::source);
 
-    std::string ktxFile;
-    readOptional(ktxFile, node, keys::ktxFile);
     if (!ktxFile.empty()) {
         if (QFileInfo(ktxFile.c_str()).isRelative()) {
             ktxFile = basedir + "/" + ktxFile;
@@ -808,7 +829,7 @@ FramePointer Deserializer::deserializeFrame() {
     swapchains =
         readArray<SwapChainPointer>(frameNode, keys::swapchains, [this](const json& node) { return readSwapchain(node); });
 
-    queries = readArray<QueryPointer>(frameNode, keys::queries, [this](const json& node) { return readQuery(node); });
+    queries = readArray<QueryPointer>(frameNode, keys::queries, [](const json& node) { return readQuery(node); });
     frame.framebuffer = framebuffers[frameNode[keys::framebuffer].get<uint32_t>()];
     frame.view = readMat4(frameNode[keys::view]);
     frame.pose = readMat4(frameNode[keys::pose]);
diff --git a/libraries/gpu/src/gpu/Transform.slh b/libraries/gpu/src/gpu/Transform.slh
index 43205ba4c2..2d51698404 100644
--- a/libraries/gpu/src/gpu/Transform.slh
+++ b/libraries/gpu/src/gpu/Transform.slh
@@ -167,7 +167,7 @@ TransformObject getTransformObject() {
         vec4 eyeClipEdge[2]= vec4[2](vec4(-1,0,0,1), vec4(1,0,0,1));
         vec2 eyeOffsetScale = vec2(-0.5, +0.5);
         uint eyeIndex = uint(_stereoSide);
-#ifndef GPU_GLES
+#if !defined(GPU_GLES) || !defined(VULKAN)
         gl_ClipDistance[0] = dot(<$clipPos$>, eyeClipEdge[eyeIndex]);
 #endif
         float newClipPosX = <$clipPos$>.x * 0.5 + eyeOffsetScale[eyeIndex] * <$clipPos$>.w;
diff --git a/libraries/input-plugins/src/input-plugins/InputPlugin.cpp b/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
index 6f94e7592c..37b9adfe8b 100644
--- a/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
+++ b/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
@@ -16,6 +16,8 @@
 #include "TouchscreenDevice.h"
 #include "TouchscreenVirtualPadDevice.h"
 
+#if !defined(Q_OS_ANDROID)
+
 // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
 InputPluginList getInputPlugins() {
     InputPlugin* PLUGIN_POOL[] = {
@@ -37,6 +39,7 @@ InputPluginList getInputPlugins() {
     }
     return result;
 }
+#endif
 
 void saveInputPluginSettings(const InputPluginList& plugins) {
     foreach (auto inputPlugin, plugins) {
diff --git a/libraries/oculusMobile/CMakeLists.txt b/libraries/oculusMobile/CMakeLists.txt
new file mode 100644
index 0000000000..213721722c
--- /dev/null
+++ b/libraries/oculusMobile/CMakeLists.txt
@@ -0,0 +1,11 @@
+if (ANDROID)
+    set(TARGET_NAME oculusMobile)
+    # don't use the setup_hifi_library macro, we don't want ANY qt dependencies
+    file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp" "src/*.c" "src/*.qrc")
+    add_library(${TARGET_NAME} SHARED ${LIB_SRCS})
+    target_glm()
+    target_egl()
+    target_glad()
+    target_oculus_mobile()
+    target_link_libraries(${TARGET_NAME} android log)
+endif()
diff --git a/libraries/oculusMobile/src/ovr/Forward.h b/libraries/oculusMobile/src/ovr/Forward.h
new file mode 100644
index 0000000000..5881dde9a7
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Forward.h
@@ -0,0 +1,17 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/23
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+#include <mutex>
+#include <functional>
+
+namespace ovr {
+    using Mutex = std::mutex;
+    using Condition = std::condition_variable;
+    using Lock = std::unique_lock<Mutex>;
+    using Task = std::function<void()>;
+}
\ No newline at end of file
diff --git a/libraries/oculusMobile/src/ovr/Framebuffer.cpp b/libraries/oculusMobile/src/ovr/Framebuffer.cpp
new file mode 100644
index 0000000000..4c4fd2a983
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Framebuffer.cpp
@@ -0,0 +1,93 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "Framebuffer.h"
+
+#include <EGL/egl.h>
+#include <glad/glad.h>
+#include <android/log.h>
+
+#include <VrApi.h>
+#include <VrApi_Helpers.h>
+
+using namespace ovr;
+
+void Framebuffer::updateLayer(int eye, ovrLayerProjection2& layer, const ovrMatrix4f* projectionMatrix ) const {
+    auto& layerTexture = layer.Textures[eye];
+    layerTexture.ColorSwapChain = _swapChain;
+    layerTexture.SwapChainIndex = _index;
+    if (projectionMatrix) {
+        layerTexture.TexCoordsFromTanAngles = ovrMatrix4f_TanAngleMatrixFromProjection( projectionMatrix );
+    }
+    layerTexture.TextureRect = { 0, 0, 1, 1 };
+}
+
+void Framebuffer::create(const glm::uvec2& size) {
+    _size = size;
+    _index = 0;
+    _validTexture = false;
+
+    // Depth renderbuffer
+    glGenRenderbuffers(1, &_depth);
+    glBindRenderbuffer(GL_RENDERBUFFER, _depth);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, _size.x, _size.y);
+    glBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+    // Framebuffer
+    glGenFramebuffers(1, &_fbo);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
+    glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depth);
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+    _swapChain = vrapi_CreateTextureSwapChain3(VRAPI_TEXTURE_TYPE_2D, GL_RGBA8, _size.x, _size.y, 1, 3);
+    _length = vrapi_GetTextureSwapChainLength(_swapChain);
+    if (!_length) {
+        __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "Unable to count swap chain textures");
+        return;
+    }
+
+    for (int i = 0; i < _length; ++i) {
+        GLuint chainTexId = vrapi_GetTextureSwapChainHandle(_swapChain, i);
+        glBindTexture(GL_TEXTURE_2D, chainTexId);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    }
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void Framebuffer::destroy() {
+    if (0 != _fbo) {
+        glDeleteFramebuffers(1, &_fbo);
+        _fbo = 0;
+    }
+    if (0 != _depth) {
+        glDeleteRenderbuffers(1, &_depth);
+        _depth = 0;
+    }
+    if (_swapChain != nullptr) {
+        vrapi_DestroyTextureSwapChain(_swapChain);
+        _swapChain = nullptr;
+    }
+    _index = -1;
+    _length = -1;
+}
+
+void Framebuffer::advance() {
+    _index = (_index + 1) % _length;
+    _validTexture = false;
+}
+
+void Framebuffer::bind() {
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
+    if (!_validTexture) {
+        GLuint chainTexId = vrapi_GetTextureSwapChainHandle(_swapChain, _index);
+        glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, chainTexId, 0);
+        _validTexture = true;
+    }
+}
diff --git a/libraries/oculusMobile/src/ovr/Framebuffer.h b/libraries/oculusMobile/src/ovr/Framebuffer.h
new file mode 100644
index 0000000000..5127574462
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Framebuffer.h
@@ -0,0 +1,34 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <cstdint>
+#include <glm/glm.hpp>
+
+#include <VrApi_Types.h>
+
+namespace ovr {
+
+struct Framebuffer {
+public:
+    void updateLayer(int eye, ovrLayerProjection2& layer, const ovrMatrix4f* projectionMatrix = nullptr) const;
+    void create(const glm::uvec2& size);
+    void advance();
+    void destroy();
+    void bind();
+
+    uint32_t _depth { 0 };
+    uint32_t _fbo{ 0 };
+    int _length{ -1 };
+    int _index{ -1 };
+    bool _validTexture{ false };
+    glm::uvec2 _size;
+    ovrTextureSwapChain* _swapChain{ nullptr };
+};
+
+}  // namespace ovr
\ No newline at end of file
diff --git a/libraries/oculusMobile/src/ovr/GLContext.cpp b/libraries/oculusMobile/src/ovr/GLContext.cpp
new file mode 100644
index 0000000000..449ba67084
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/GLContext.cpp
@@ -0,0 +1,182 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "GLContext.h"
+
+#include <array>
+#include <vector>
+#include <mutex>
+
+#include <android/log.h>
+
+#if !defined(EGL_OPENGL_ES3_BIT_KHR)
+#define EGL_OPENGL_ES3_BIT_KHR 0x0040
+#endif
+
+using namespace ovr;
+
+static void* getGlProcessAddress(const char *namez) {
+    auto result = eglGetProcAddress(namez);
+    return (void*)result;
+}
+
+
+void GLContext::initModule() {
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        gladLoadGLES2Loader(getGlProcessAddress);
+    });
+}
+
+void APIENTRY debugMessageCallback(GLenum source,
+                                   GLenum type,
+                                   GLuint id,
+                                   GLenum severity,
+                                   GLsizei length,
+                                   const GLchar* message,
+                                   const void* userParam) {
+    if (type == GL_DEBUG_TYPE_PERFORMANCE_KHR) {
+        return;
+    }
+    switch (severity) {
+        case GL_DEBUG_SEVERITY_HIGH:
+        case GL_DEBUG_SEVERITY_MEDIUM:
+            break;
+        default:
+            return;
+    }
+
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_GL", message);
+}
+
+GLContext::~GLContext() {
+    destroy();
+}
+
+EGLConfig GLContext::findConfig(EGLDisplay display) {
+    // Do NOT use eglChooseConfig, because the Android EGL code pushes in multisample
+    // flags in eglChooseConfig if the user has selected the "force 4x MSAA" option in
+    // settings, and that is completely wasted for our warp target.
+    std::vector<EGLConfig> configs;
+    {
+        const int MAX_CONFIGS = 1024;
+        EGLConfig configsBuffer[MAX_CONFIGS];
+        EGLint numConfigs = 0;
+        if (eglGetConfigs(display, configsBuffer, MAX_CONFIGS, &numConfigs) == EGL_FALSE) {
+            __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed to fetch configs");
+            return 0;
+        }
+        configs.resize(numConfigs);
+        memcpy(configs.data(), configsBuffer, sizeof(EGLConfig) * numConfigs);
+    }
+
+    std::vector<std::pair<EGLint, EGLint>> configAttribs{
+        { EGL_RED_SIZE, 8 },   { EGL_GREEN_SIZE, 8 },   { EGL_BLUE_SIZE, 8 }, { EGL_ALPHA_SIZE, 8 },
+        { EGL_DEPTH_SIZE, 0 }, { EGL_STENCIL_SIZE, 0 }, { EGL_SAMPLES, 0 },
+    };
+
+    auto matchAttrib = [&](EGLConfig config, const std::pair<EGLint, EGLint>& attribAndValue) {
+        EGLint value = 0;
+        eglGetConfigAttrib(display, config, attribAndValue.first, &value);
+        return (attribAndValue.second == value);
+    };
+
+    auto matchAttribFlags = [&](EGLConfig config, const std::pair<EGLint, EGLint>& attribAndValue) {
+        EGLint value = 0;
+        eglGetConfigAttrib(display, config, attribAndValue.first, &value);
+        return (value & attribAndValue.second) == attribAndValue.second;
+    };
+
+    auto matchConfig = [&](EGLConfig config) {
+        if (!matchAttribFlags(config, { EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT_KHR})) {
+            return false;
+        }
+        // The pbuffer config also needs to be compatible with normal window rendering
+        // so it can share textures with the window context.
+        if (!matchAttribFlags(config, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT})) {
+            return false;
+        }
+
+        for (const auto& attrib : configAttribs) {
+            if (!matchAttrib(config, attrib)) {
+                return false;
+            }
+        }
+
+        return true;
+    };
+
+
+    for (const auto& config : configs) {
+        if (matchConfig(config)) {
+            return config;
+        }
+    }
+
+    return 0;
+}
+
+bool GLContext::makeCurrent() {
+    return eglMakeCurrent(display, surface, surface, context) != EGL_FALSE;
+}
+
+void GLContext::doneCurrent() {
+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+}
+
+bool GLContext::create(EGLDisplay display, EGLContext shareContext) {
+    this->display = display;
+
+    auto config = findConfig(display);
+
+    if (config == 0) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglChooseConfig");
+        return false;
+    }
+
+    EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE };
+
+    context = eglCreateContext(display, config, shareContext, contextAttribs);
+    if (context == EGL_NO_CONTEXT) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglCreateContext");
+        return false;
+    }
+
+    const EGLint surfaceAttribs[] = { EGL_WIDTH, 16, EGL_HEIGHT, 16, EGL_NONE };
+    surface = eglCreatePbufferSurface(display, config, surfaceAttribs);
+    if (surface == EGL_NO_SURFACE) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglCreatePbufferSurface");
+        return false;
+    }
+
+    if (!makeCurrent()) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglMakeCurrent");
+        return false;
+    }
+
+    ovr::GLContext::initModule();
+
+#ifndef NDEBUG
+    glDebugMessageCallback(debugMessageCallback, this);
+    glEnable(GL_DEBUG_OUTPUT);
+    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+#endif
+    return true;
+}
+
+void GLContext::destroy() {
+    if (context != EGL_NO_CONTEXT) {
+        eglDestroyContext(display, context);
+        context = EGL_NO_CONTEXT;
+    }
+
+    if (surface != EGL_NO_SURFACE) {
+        eglDestroySurface(display, surface);
+        surface = EGL_NO_SURFACE;
+    }
+}
diff --git a/libraries/oculusMobile/src/ovr/GLContext.h b/libraries/oculusMobile/src/ovr/GLContext.h
new file mode 100644
index 0000000000..04f96e8d47
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/GLContext.h
@@ -0,0 +1,37 @@
+//
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <memory>
+
+#include <EGL/egl.h>
+#include <glad/glad.h>
+
+namespace ovr {
+
+struct GLContext {
+    using Pointer = std::shared_ptr<GLContext>;
+    EGLSurface surface{ EGL_NO_SURFACE };
+    EGLContext context{ EGL_NO_CONTEXT };
+    EGLDisplay display{ EGL_NO_DISPLAY };
+
+    ~GLContext();
+    static EGLConfig findConfig(EGLDisplay display);
+    bool makeCurrent();
+    void doneCurrent();
+    bool create(EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY), EGLContext shareContext = EGL_NO_CONTEXT);
+    void destroy();
+    operator bool() const { return context != EGL_NO_CONTEXT; }
+    static void initModule();
+};
+
+}
+
+
+#define CHECK_GL_ERROR() if(false) {}
\ No newline at end of file
diff --git a/libraries/oculusMobile/src/ovr/Helpers.cpp b/libraries/oculusMobile/src/ovr/Helpers.cpp
new file mode 100644
index 0000000000..a48d37311e
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Helpers.cpp
@@ -0,0 +1,38 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "Helpers.h"
+
+#include <atomic>
+#include <algorithm>
+#include <android/log.h>
+#include <VrApi_Helpers.h>
+
+using namespace ovr;
+
+void Fov::extend(const Fov& other) {
+    for (size_t i = 0; i < 4; ++i) {
+        leftRightUpDown[i] = std::max(leftRightUpDown[i], other.leftRightUpDown[i]);
+    }
+}
+
+void Fov::extract(const ovrMatrix4f& mat) {
+    auto& fs = leftRightUpDown;
+    ovrMatrix4f_ExtractFov( &mat, fs, fs + 1, fs + 2, fs + 3);
+}
+
+glm::mat4 Fov::withZ(float nearZ, float farZ) const {
+    const auto& fs = leftRightUpDown;
+    return ovr::toGlm(ovrMatrix4f_CreateProjectionAsymmetricFov(fs[0], fs[1], fs[2], fs[3], nearZ, farZ));
+}
+
+glm::mat4 Fov::withZ(const glm::mat4& other) const {
+    // FIXME
+    return withZ(0.01f, 1000.0f);
+}
+
diff --git a/libraries/oculusMobile/src/ovr/Helpers.h b/libraries/oculusMobile/src/ovr/Helpers.h
new file mode 100644
index 0000000000..2bd0b7f603
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Helpers.h
@@ -0,0 +1,94 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <functional>
+#include <glm/glm.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <VrApi_Types.h>
+
+namespace ovr {
+
+struct Fov {
+    float leftRightUpDown[4];
+    Fov() {}
+    Fov(const ovrMatrix4f& mat) { extract(mat); }
+    void extract(const ovrMatrix4f& mat);
+    void extend(const Fov& other);
+    glm::mat4 withZ(const glm::mat4& other) const;
+    glm::mat4 withZ(float nearZ, float farZ) const;
+};
+
+// Convenience method for looping over each eye with a lambda
+static inline void for_each_eye(const std::function<void(ovrEye)>& f) {
+    f(VRAPI_EYE_LEFT);
+    f(VRAPI_EYE_RIGHT);
+}
+
+static inline void for_each_hand(const std::function<void(ovrHandedness)>& f) {
+    f(VRAPI_HAND_LEFT);
+    f(VRAPI_HAND_RIGHT);
+}
+
+static inline glm::mat4 toGlm(const ovrMatrix4f& om) {
+    return glm::transpose(glm::make_mat4(&om.M[0][0]));
+}
+
+static inline glm::vec3 toGlm(const ovrVector3f& ov) {
+    return glm::make_vec3(&ov.x);
+}
+
+static inline glm::vec2 toGlm(const ovrVector2f& ov) {
+    return glm::make_vec2(&ov.x);
+}
+
+static inline glm::quat toGlm(const ovrQuatf& oq) {
+    return glm::make_quat(&oq.x);
+}
+
+static inline glm::mat4 toGlm(const ovrPosef& op) {
+    glm::mat4 orientation = glm::mat4_cast(toGlm(op.Orientation));
+    glm::mat4 translation = glm::translate(glm::mat4(), toGlm(op.Position));
+    return translation * orientation;
+}
+
+static inline ovrMatrix4f fromGlm(const glm::mat4& m) {
+    ovrMatrix4f result;
+    glm::mat4 transposed(glm::transpose(m));
+    memcpy(result.M, &(transposed[0][0]), sizeof(float) * 16);
+    return result;
+}
+
+static inline ovrVector3f fromGlm(const glm::vec3& v) {
+    return { v.x, v.y, v.z };
+}
+
+static inline ovrVector2f fromGlm(const glm::vec2& v) {
+    return { v.x, v.y };
+}
+
+static inline ovrQuatf fromGlm(const glm::quat& q) {
+    return { q.x, q.y, q.z, q.w };
+}
+
+static inline ovrPosef poseFromGlm(const glm::mat4& m) {
+    glm::vec3 translation = glm::vec3(m[3]) / m[3].w;
+    glm::quat orientation = glm::quat_cast(m);
+    ovrPosef result;
+    result.Orientation = fromGlm(orientation);
+    result.Position = fromGlm(translation);
+    return result;
+}
+
+}
+
+
+
+
+
diff --git a/libraries/oculusMobile/src/ovr/TaskQueue.cpp b/libraries/oculusMobile/src/ovr/TaskQueue.cpp
new file mode 100644
index 0000000000..5506a35acd
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/TaskQueue.cpp
@@ -0,0 +1,40 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/23
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "TaskQueue.h"
+
+using namespace ovr;
+
+void TaskQueue::submitTaskBlocking(Lock& lock, const Task& newTask) {
+    _task = newTask;
+    _taskPending = true;
+    _taskCondition.wait(lock, [=]() -> bool { return !_taskPending; });
+}
+
+void TaskQueue::submitTaskBlocking(const Task& task) {
+    Lock lock(_mutex);
+    submitTaskBlocking(lock, task);
+}
+
+void TaskQueue::pollTask() {
+    Lock lock(_mutex);
+    if (_taskPending) {
+        _task();
+        _taskPending = false;
+        _taskCondition.notify_one();
+    }
+}
+
+void TaskQueue::withLock(const Task& task) {
+    Lock lock(_mutex);
+    task();
+}
+
+void TaskQueue::withLockConditional(const LockTask& task) {
+    Lock lock(_mutex);
+    task(lock);
+}
diff --git a/libraries/oculusMobile/src/ovr/TaskQueue.h b/libraries/oculusMobile/src/ovr/TaskQueue.h
new file mode 100644
index 0000000000..4ec055ece9
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/TaskQueue.h
@@ -0,0 +1,42 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <mutex>
+#include <functional>
+
+namespace ovr {
+
+using Mutex = std::mutex;
+using Condition = std::condition_variable;
+using Lock = std::unique_lock<Mutex>;
+using Task = std::function<void()>;
+using LockTask = std::function<void(Lock& lock)>;
+
+class TaskQueue {
+public:
+    // Execute a task on another thread
+    void submitTaskBlocking(const Task& task);
+    void submitTaskBlocking(Lock& lock, const Task& task);
+    void pollTask();
+
+    void withLock(const Task& task);
+    void withLockConditional(const LockTask& task);
+private:
+    Mutex _mutex;
+    Task _task;
+    bool _taskPending{ false };
+    Condition _taskCondition;
+};
+
+}
+
+
+
+
+
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp
new file mode 100644
index 0000000000..de2b4e1ff6
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp
@@ -0,0 +1,337 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "VrHandler.h"
+
+#include <android/native_window_jni.h>
+#include <android/log.h>
+
+#include <unistd.h>
+
+#include <VrApi.h>
+#include <VrApi_Helpers.h>
+#include <VrApi_Types.h>
+//#include <OVR_Platform.h>
+
+#include "GLContext.h"
+#include "Helpers.h"
+#include "Framebuffer.h"
+
+
+
+using namespace ovr;
+
+static thread_local bool isRenderThread { false };
+
+struct VrSurface : public TaskQueue {
+    using HandlerTask = VrHandler::HandlerTask;
+
+    JavaVM* vm{nullptr};
+    jobject oculusActivity{ nullptr };
+    ANativeWindow* nativeWindow{ nullptr };
+
+    VrHandler* handler{nullptr};
+    ovrMobile* session{nullptr};
+    bool resumed { false };
+    GLContext vrglContext;
+    Framebuffer eyeFbos[2];
+    uint32_t readFbo{0};
+    std::atomic<uint32_t> presentIndex{1};
+    double displayTime{0};
+
+    static constexpr float EYE_BUFFER_SCALE = 1.0f;
+
+    void onCreate(JNIEnv* env, jobject activity) {
+        env->GetJavaVM(&vm);
+        oculusActivity = env->NewGlobalRef(activity);
+    }
+
+    void setResumed(bool newResumed) {
+        this->resumed = newResumed;
+        submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
+    }
+
+    void setNativeWindow(ANativeWindow* newNativeWindow) {
+        auto oldNativeWindow = nativeWindow;
+        nativeWindow = newNativeWindow;
+        if (oldNativeWindow) {
+            ANativeWindow_release(oldNativeWindow);
+        }
+        submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
+    }
+
+    void init() {
+        if (!handler) {
+            return;
+        }
+
+        EGLContext currentContext = eglGetCurrentContext();
+        EGLDisplay currentDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+        vrglContext.create(currentDisplay, currentContext);
+        vrglContext.makeCurrent();
+
+        glm::uvec2 eyeTargetSize;
+        withEnv([&](JNIEnv* env){
+            ovrJava java{ vm, env, oculusActivity };
+            eyeTargetSize = glm::uvec2 {
+                vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH) * EYE_BUFFER_SCALE,
+                vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_HEIGHT) * EYE_BUFFER_SCALE,
+            };
+        });
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_OVR", "QQQ Eye Size %d, %d", eyeTargetSize.x, eyeTargetSize.y);
+        ovr::for_each_eye([&](ovrEye eye) {
+            eyeFbos[eye].create(eyeTargetSize);
+        });
+        glGenFramebuffers(1, &readFbo);
+        vrglContext.doneCurrent();
+    }
+
+    void shutdown() {
+    }
+
+    void setHandler(VrHandler *newHandler) {
+        withLock([&] {
+            isRenderThread = newHandler != nullptr;
+            if (handler != newHandler) {
+                shutdown();
+                handler = newHandler;
+                init();
+                if (handler) {
+                    updateVrMode();
+                }
+            }
+        });
+    }
+
+    void submitRenderThreadTask(const HandlerTask &task) {
+        withLockConditional([&](Lock &lock) {
+            if (handler != nullptr) {
+                submitTaskBlocking(lock, [&] {
+                    task(handler);
+                });
+            }
+        });
+    }
+
+    void withEnv(const std::function<void(JNIEnv*)>& f) {
+        JNIEnv* env = nullptr;
+        bool attached = false;
+        vm->GetEnv((void**)&env, JNI_VERSION_1_6);
+        if (!env) {
+            attached = true;
+            vm->AttachCurrentThread(&env, nullptr);
+        }
+        f(env);
+        if (attached) {
+            vm->DetachCurrentThread();
+        }
+    }
+
+    void updateVrMode() {
+        // For VR mode to be valid, the activity must be between an onResume and
+        // an onPause call and must additionally have a valid native window handle
+        bool vrReady = resumed && nullptr != nativeWindow;
+        // If we're IN VR mode, we'll have a non-null ovrMobile pointer in session
+        bool vrRunning = session != nullptr;
+        if (vrReady != vrRunning) {
+            if (vrRunning) {
+                __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "vrapi_LeaveVrMode");
+                vrapi_LeaveVrMode(session);
+                session = nullptr;
+                oculusActivity = nullptr;
+            } else {
+                __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "vrapi_EnterVrMode");
+                withEnv([&](JNIEnv* env){
+                    ovrJava java{ vm, env, oculusActivity };
+                    ovrModeParms modeParms = vrapi_DefaultModeParms(&java);
+                    modeParms.Flags |= VRAPI_MODE_FLAG_NATIVE_WINDOW;
+                    modeParms.Display = (unsigned long long) vrglContext.display;
+                    modeParms.ShareContext = (unsigned long long) vrglContext.context;
+                    modeParms.WindowSurface = (unsigned long long) nativeWindow;
+                    session = vrapi_EnterVrMode(&modeParms);
+                    ovrPosef trackingTransform = vrapi_GetTrackingTransform( session, VRAPI_TRACKING_TRANSFORM_SYSTEM_CENTER_EYE_LEVEL);
+                    vrapi_SetTrackingTransform( session, trackingTransform );
+                    vrapi_SetPerfThread(session, VRAPI_PERF_THREAD_TYPE_RENDERER, pthread_self());
+                    vrapi_SetClockLevels(session, 2, 4);
+                    vrapi_SetExtraLatencyMode(session, VRAPI_EXTRA_LATENCY_MODE_DYNAMIC);
+                    vrapi_SetDisplayRefreshRate(session, 72);
+                });
+            }
+        }
+    }
+
+    void presentFrame(uint32_t sourceTexture, const glm::uvec2 &sourceSize, const ovrTracking2& tracking) {
+        ovrLayerProjection2 layer = vrapi_DefaultLayerProjection2();
+        layer.HeadPose = tracking.HeadPose;
+        if (sourceTexture) {
+            glBindFramebuffer(GL_READ_FRAMEBUFFER, readFbo);
+            glFramebufferTexture(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, sourceTexture, 0);
+            GLenum framebufferStatus = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
+            if (GL_FRAMEBUFFER_COMPLETE != framebufferStatus) {
+                __android_log_print(ANDROID_LOG_WARN, "QQQ_OVR", "incomplete framebuffer");
+            }
+        }
+        GLenum invalidateAttachment = GL_COLOR_ATTACHMENT0;
+
+        ovr::for_each_eye([&](ovrEye eye) {
+            const auto &eyeTracking = tracking.Eye[eye];
+            auto &eyeFbo = eyeFbos[eye];
+            const auto &destSize = eyeFbo._size;
+            eyeFbo.bind();
+            glInvalidateFramebuffer(GL_DRAW_FRAMEBUFFER, 1, &invalidateAttachment);
+            if (sourceTexture) {
+                auto sourceWidth = sourceSize.x / 2;
+                auto sourceX = (eye == VRAPI_EYE_LEFT) ? 0 : sourceWidth;
+                glBlitFramebuffer(
+                    sourceX, 0, sourceX + sourceWidth, sourceSize.y,
+                    0, 0, destSize.x, destSize.y,
+                    GL_COLOR_BUFFER_BIT, GL_NEAREST);
+            }
+            eyeFbo.updateLayer(eye, layer, &eyeTracking.ProjectionMatrix);
+            eyeFbo.advance();
+        });
+        if (sourceTexture) {
+            glInvalidateFramebuffer(GL_READ_FRAMEBUFFER, 1, &invalidateAttachment);
+            glFramebufferTexture(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0);
+        }
+        glFlush();
+
+        ovrLayerHeader2 *layerHeader = &layer.Header;
+        ovrSubmitFrameDescription2 frameDesc = {};
+        frameDesc.SwapInterval = 2;
+        frameDesc.FrameIndex = presentIndex;
+        frameDesc.DisplayTime = displayTime;
+        frameDesc.LayerCount = 1;
+        frameDesc.Layers = &layerHeader;
+        vrapi_SubmitFrame2(session, &frameDesc);
+        ++presentIndex;
+    }
+
+    ovrTracking2 beginFrame() {
+        displayTime = vrapi_GetPredictedDisplayTime(session, presentIndex);
+        return vrapi_GetPredictedTracking2(session, displayTime);
+    }
+};
+
+static VrSurface SURFACE;
+
+bool VrHandler::vrActive() const {
+    return SURFACE.session != nullptr;
+}
+
+void VrHandler::setHandler(VrHandler* handler) {
+    SURFACE.setHandler(handler);
+}
+
+void VrHandler::pollTask() {
+    SURFACE.pollTask();
+}
+
+void VrHandler::makeCurrent() {
+    if (!SURFACE.vrglContext.makeCurrent()) {
+        __android_log_write(ANDROID_LOG_WARN, "QQQ", "Failed to make GL current");
+    }
+}
+
+void VrHandler::doneCurrent() {
+    SURFACE.vrglContext.doneCurrent();
+}
+
+uint32_t VrHandler::currentPresentIndex() const {
+    return SURFACE.presentIndex;
+}
+
+ovrTracking2 VrHandler::beginFrame() {
+    return SURFACE.beginFrame();
+}
+
+void VrHandler::presentFrame(uint32_t sourceTexture, const glm::uvec2 &sourceSize, const ovrTracking2& tracking) const {
+    SURFACE.presentFrame(sourceTexture, sourceSize, tracking);
+}
+
+bool VrHandler::withOvrJava(const OvrJavaTask& task) {
+    SURFACE.withEnv([&](JNIEnv* env){
+        ovrJava java{ SURFACE.vm, env, SURFACE.oculusActivity };
+        task(&java);
+    });
+    return true;
+}
+
+bool VrHandler::withOvrMobile(const OvrMobileTask &task) {
+    auto sessionTask = [&]()->bool{
+        if (!SURFACE.session) {
+            return false;
+        }
+        task(SURFACE.session);
+        return true;
+    };
+
+    if (isRenderThread) {
+        return sessionTask();
+    }
+
+    bool result = false;
+    SURFACE.withLock([&]{
+        result = sessionTask();
+    });
+    return result;
+}
+
+
+void VrHandler::initVr(const char* appId) {
+    withOvrJava([&](const ovrJava* java){
+        ovrInitParms initParms = vrapi_DefaultInitParms(java);
+        initParms.GraphicsAPI = VRAPI_GRAPHICS_API_OPENGL_ES_3;
+        if (vrapi_Initialize(&initParms) != VRAPI_INITIALIZE_SUCCESS) {
+            __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "Failed vrapi init");
+        }
+    });
+
+  //  if (appId) {
+  //      auto platformInitResult = ovr_PlatformInitializeAndroid(appId, activity.object(), env);
+  //      if (ovrPlatformInitialize_Success != platformInitResult) {
+  //          __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "Failed ovr platform init");
+  //      }
+  //  }
+}
+
+void VrHandler::shutdownVr() {
+    vrapi_Shutdown();
+}
+
+extern "C" {
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "oculusMobile::JNI_OnLoad");
+    return JNI_VERSION_1_6;
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.onCreate(env, obj);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnDestroy(JNIEnv*, jclass) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnResume(JNIEnv*, jclass) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.setResumed(true);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnPause(JNIEnv*, jclass) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.setResumed(false);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnSurfaceChanged(JNIEnv* env, jclass, jobject surface) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.setNativeWindow(surface ? ANativeWindow_fromSurface( env, surface ) : nullptr);
+}
+
+} // extern "C"
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.h b/libraries/oculusMobile/src/ovr/VrHandler.h
new file mode 100644
index 0000000000..3c36ee8626
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/VrHandler.h
@@ -0,0 +1,47 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <glm/glm.hpp>
+#include <jni.h>
+#include <VrApi_Types.h>
+
+#include "TaskQueue.h"
+
+typedef struct ovrMobile ovrMobile;
+namespace ovr {
+
+class VrHandler {
+public:
+    using HandlerTask = std::function<void(VrHandler*)>;
+    using OvrMobileTask = std::function<void(ovrMobile*)>;
+    using OvrJavaTask = std::function<void(const ovrJava*)>;
+    static void setHandler(VrHandler* handler);
+    static bool withOvrMobile(const OvrMobileTask& task);
+
+protected:
+    static void initVr(const char* appId = nullptr);
+    static void shutdownVr();
+    static bool withOvrJava(const OvrJavaTask& task);
+
+    uint32_t currentPresentIndex() const;
+    ovrTracking2 beginFrame();
+    void presentFrame(uint32_t textureId, const glm::uvec2& size, const ovrTracking2& tracking) const;
+
+    bool vrActive() const;
+    void pollTask();
+    void makeCurrent();
+    void doneCurrent();
+};
+
+}
+
+
+
+
+
diff --git a/libraries/oculusMobilePlugin/CMakeLists.txt b/libraries/oculusMobilePlugin/CMakeLists.txt
new file mode 100644
index 0000000000..b404c51f02
--- /dev/null
+++ b/libraries/oculusMobilePlugin/CMakeLists.txt
@@ -0,0 +1,29 @@
+#
+#  Created by Bradley Austin Davis on 2018/11/15
+#  Copyright 2013-2018 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
+#
+
+if (ANDROID)
+  set(TARGET_NAME oculusMobilePlugin)
+  setup_hifi_library(AndroidExtras Multimedia)
+
+  # if we were passed an Oculus App ID for entitlement checks, send that along
+  if (DEFINED ENV{OCULUS_APP_ID})
+    target_compile_definitions(${TARGET_NAME} -DOCULUS_APP_ID="$ENV{OCULUS_APP_ID}")
+  endif ()
+
+  link_hifi_libraries(
+    shared task gl shaders gpu controllers ui qml
+    plugins ui-plugins display-plugins input-plugins
+    audio-client networking render-utils
+    render graphics
+    oculusMobile 
+    ${PLATFORM_GL_BACKEND}
+  )
+  
+  include_hifi_library_headers(octree)
+  target_oculus_mobile()
+endif()
diff --git a/libraries/oculusMobilePlugin/src/Logging.cpp b/libraries/oculusMobilePlugin/src/Logging.cpp
new file mode 100644
index 0000000000..3d8628b0cb
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/Logging.cpp
@@ -0,0 +1,4 @@
+#include "Logging.h"
+
+Q_LOGGING_CATEGORY(displayplugins, "hifi.plugins.display")
+Q_LOGGING_CATEGORY(oculusLog, "hifi.plugins.display.oculus")
diff --git a/libraries/oculusMobilePlugin/src/Logging.h b/libraries/oculusMobilePlugin/src/Logging.h
new file mode 100644
index 0000000000..066712ef6a
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/Logging.h
@@ -0,0 +1,13 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <QtCore/QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(displayplugins)
+Q_DECLARE_LOGGING_CATEGORY(oculusLog)
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
new file mode 100644
index 0000000000..c44e4cc1f5
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
@@ -0,0 +1,694 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "OculusMobileControllerManager.h"
+
+#include <array>
+
+#include <ui-plugins/PluginContainer.h>
+#include <controllers/UserInputMapper.h>
+#include <controllers/StandardControls.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+
+#include <PerfStat.h>
+#include <PathUtils.h>
+#include <NumericalConstants.h>
+#include <StreamUtils.h>
+#include <VrApi.h>
+#include <VrApi_Input.h>
+#include <ovr/Helpers.h>
+
+#include "Logging.h"
+#include <ovr/VrHandler.h>
+
+const char* OculusMobileControllerManager::NAME = "Oculus";
+const quint64 LOST_TRACKING_DELAY = 3000000;
+
+namespace ovr {
+
+    controller::Pose toControllerPose(ovrHandedness hand, const ovrRigidBodyPosef& handPose) {
+        // When the sensor-to-world rotation is identity the coordinate axes look like this:
+        //
+        //                       user
+        //                      forward
+        //                        -z
+        //                         |
+        //                        y|      user
+        //      y                  o----x right
+        //       o-----x         user
+        //       |                up
+        //       |
+        //       z
+        //
+        //     Rift
+
+        // From ABOVE the hand canonical axes looks like this:
+        //
+        //      | | | |          y        | | | |
+        //      | | | |          |        | | | |
+        //      |     |          |        |     |
+        //      |left | /  x---- +      \ |right|
+        //      |     _/          z      \_     |
+        //       |   |                     |   |
+        //       |   |                     |   |
+        //
+
+        // So when the user is in Rift space facing the -zAxis with hands outstretched and palms down
+        // the rotation to align the Touch axes with those of the hands is:
+        //
+        //    touchToHand = halfTurnAboutY * quaterTurnAboutX
+
+        // Due to how the Touch controllers fit into the palm there is an offset that is different for each hand.
+        // You can think of this offset as the inverse of the measured rotation when the hands are posed, such that
+        // the combination (measurement * offset) is identity at this orientation.
+        //
+        //    Qoffset = glm::inverse(deltaRotation when hand is posed fingers forward, palm down)
+        //
+        // An approximate offset for the Touch can be obtained by inspection:
+        //
+        //    Qoffset = glm::inverse(glm::angleAxis(sign * PI/2.0f, zAxis) * glm::angleAxis(PI/4.0f, xAxis))
+        //
+        // So the full equation is:
+        //
+        //    Q = combinedMeasurement * touchToHand
+        //
+        //    Q = (deltaQ * QOffset) * (yFlip * quarterTurnAboutX)
+        //
+        //    Q = (deltaQ * inverse(deltaQForAlignedHand)) * (yFlip * quarterTurnAboutX)
+        static const glm::quat yFlip = glm::angleAxis(PI, Vectors::UNIT_Y);
+        static const glm::quat quarterX = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_X);
+        static const glm::quat touchToHand = yFlip * quarterX;
+
+        static const glm::quat leftQuarterZ = glm::angleAxis(-PI_OVER_TWO, Vectors::UNIT_Z);
+        static const glm::quat rightQuarterZ = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_Z);
+
+        static const glm::quat leftRotationOffset = glm::inverse(leftQuarterZ) * touchToHand;
+        static const glm::quat rightRotationOffset = glm::inverse(rightQuarterZ) * touchToHand;
+
+        static const float CONTROLLER_LENGTH_OFFSET = 0.0762f;  // three inches
+        static const glm::vec3 CONTROLLER_OFFSET =
+            glm::vec3(CONTROLLER_LENGTH_OFFSET / 2.0f, -CONTROLLER_LENGTH_OFFSET / 2.0f, CONTROLLER_LENGTH_OFFSET * 1.5f);
+        static const glm::vec3 leftTranslationOffset = glm::vec3(-1.0f, 1.0f, 1.0f) * CONTROLLER_OFFSET;
+        static const glm::vec3 rightTranslationOffset = CONTROLLER_OFFSET;
+
+        auto translationOffset = (hand == VRAPI_HAND_LEFT ? leftTranslationOffset : rightTranslationOffset);
+        auto rotationOffset = (hand == VRAPI_HAND_LEFT ? leftRotationOffset : rightRotationOffset);
+
+        glm::quat rotation = toGlm(handPose.Pose.Orientation);
+
+        controller::Pose pose;
+        pose.translation = toGlm(handPose.Pose.Position);
+        pose.translation += rotation * translationOffset;
+        pose.rotation = rotation * rotationOffset;
+        pose.angularVelocity = rotation * toGlm(handPose.AngularVelocity);
+        pose.velocity = toGlm(handPose.LinearVelocity);
+        pose.valid = true;
+        return pose;
+    }
+
+    controller::Pose toControllerPose(ovrHandedness hand,
+                                      const ovrRigidBodyPosef& handPose,
+                                      const ovrRigidBodyPosef& lastHandPose) {
+        static const glm::quat yFlip = glm::angleAxis(PI, Vectors::UNIT_Y);
+        static const glm::quat quarterX = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_X);
+        static const glm::quat touchToHand = yFlip * quarterX;
+
+        static const glm::quat leftQuarterZ = glm::angleAxis(-PI_OVER_TWO, Vectors::UNIT_Z);
+        static const glm::quat rightQuarterZ = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_Z);
+
+        static const glm::quat leftRotationOffset = glm::inverse(leftQuarterZ) * touchToHand;
+        static const glm::quat rightRotationOffset = glm::inverse(rightQuarterZ) * touchToHand;
+
+        static const float CONTROLLER_LENGTH_OFFSET = 0.0762f;  // three inches
+        static const glm::vec3 CONTROLLER_OFFSET =
+            glm::vec3(CONTROLLER_LENGTH_OFFSET / 2.0f, -CONTROLLER_LENGTH_OFFSET / 2.0f, CONTROLLER_LENGTH_OFFSET * 1.5f);
+        static const glm::vec3 leftTranslationOffset = glm::vec3(-1.0f, 1.0f, 1.0f) * CONTROLLER_OFFSET;
+        static const glm::vec3 rightTranslationOffset = CONTROLLER_OFFSET;
+
+        auto translationOffset = (hand == VRAPI_HAND_LEFT ? leftTranslationOffset : rightTranslationOffset);
+        auto rotationOffset = (hand == VRAPI_HAND_LEFT ? leftRotationOffset : rightRotationOffset);
+
+        glm::quat rotation = toGlm(handPose.Pose.Orientation);
+
+        controller::Pose pose;
+        pose.translation = toGlm(lastHandPose.Pose.Position);
+        pose.translation += rotation * translationOffset;
+        pose.rotation = rotation * rotationOffset;
+        pose.angularVelocity = toGlm(lastHandPose.AngularVelocity);
+        pose.velocity = toGlm(lastHandPose.LinearVelocity);
+        pose.valid = true;
+        return pose;
+    }
+
+}
+
+
+class OculusMobileInputDevice : public controller::InputDevice {
+    friend class OculusMobileControllerManager;
+public:
+    using Pointer = std::shared_ptr<OculusMobileInputDevice>;
+    static Pointer check(ovrMobile* session);
+
+    OculusMobileInputDevice(ovrMobile* session, const std::vector<ovrInputTrackedRemoteCapabilities>& devicesCaps);
+    void updateHands(ovrMobile* session);
+
+    controller::Input::NamedVector getAvailableInputs() const override;
+    QString getDefaultMappingConfig() const override;
+    void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
+    void focusOutEvent() override;
+    bool triggerHapticPulse(float strength, float duration, controller::Hand hand) override;
+
+private:
+    void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
+                    ovrHandedness hand, const ovrRigidBodyPosef& handPose);
+    void handleRotationForUntrackedHand(const controller::InputCalibrationData& inputCalibrationData,
+                                        ovrHandedness hand, const ovrRigidBodyPosef& handPose);
+    void handleHeadPose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
+                        const ovrRigidBodyPosef& headPose);
+
+    // perform an action when the TouchDevice mutex is acquired.
+    using Locker = std::unique_lock<std::recursive_mutex>;
+
+    template <typename F>
+    void withLock(F&& f) { Locker locker(_lock); f(); }
+
+    mutable std::recursive_mutex _lock;
+    ovrTracking2 _headTracking;
+    struct HandData {
+        HandData() {
+            state.Header.ControllerType =ovrControllerType_TrackedRemote;
+        }
+
+        float hapticDuration { 0.0f };
+        float hapticStrength { 0.0f };
+        bool valid{ false };
+        bool lostTracking{ false };
+        quint64 regainTrackingDeadline;
+        ovrRigidBodyPosef lastPose;
+        ovrInputTrackedRemoteCapabilities caps;
+        ovrInputStateTrackedRemote state;
+        ovrResult stateResult{ ovrError_NotInitialized };
+        ovrTracking tracking;
+        ovrResult trackingResult{ ovrError_NotInitialized };
+        bool setHapticFeedback(float strength, float duration) {
+#if 0
+            bool success = true;
+            bool sessionSuccess = ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+                if (strength == 0.0f) {
+                    hapticStrength = 0.0f;
+                    hapticDuration = 0.0f;
+                } else {
+                    hapticStrength = (duration > hapticDuration) ? strength : hapticStrength;
+                    if (vrapi_SetHapticVibrationSimple(session, caps.Header.DeviceID, hapticStrength) != ovrSuccess) {
+                        success = false;
+                    }
+                    hapticDuration = std::max(duration, hapticDuration);
+                }
+            });
+            return success && sessionSuccess;
+#else
+            return true;
+#endif
+        }
+
+        void stopHapticPulse() {
+            ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+                vrapi_SetHapticVibrationSimple(session, caps.Header.DeviceID, 0.0f);
+            });
+        }
+
+        bool isValid() const {
+            return (stateResult == ovrSuccess) && (trackingResult == ovrSuccess);
+        }
+
+        void update(ovrMobile* session, double time = 0.0) {
+            const auto& deviceId = caps.Header.DeviceID;
+            stateResult = vrapi_GetCurrentInputState(session, deviceId, &state.Header);
+            trackingResult = vrapi_GetInputTrackingState(session, deviceId, 0.0, &tracking);
+        }
+    };
+    std::array<HandData, 2> _hands;
+};
+
+OculusMobileInputDevice::Pointer OculusMobileInputDevice::check(ovrMobile *session) {
+    Pointer result;
+
+    std::vector<ovrInputTrackedRemoteCapabilities> devicesCaps;
+    {
+        uint32_t deviceIndex { 0 };
+        ovrInputCapabilityHeader capsHeader;
+        while (vrapi_EnumerateInputDevices(session, deviceIndex, &capsHeader) >= 0) {
+            if (capsHeader.Type == ovrControllerType_TrackedRemote) {
+                ovrInputTrackedRemoteCapabilities caps;
+                caps.Header = capsHeader;
+                vrapi_GetInputDeviceCapabilities(session, &caps.Header);
+                devicesCaps.push_back(caps);
+            }
+            ++deviceIndex;
+        }
+    }
+    if (!devicesCaps.empty()) {
+        result.reset(new OculusMobileInputDevice(session, devicesCaps));
+    }
+    return result;
+}
+
+static OculusMobileInputDevice::Pointer oculusMobileControllers;
+
+bool OculusMobileControllerManager::isHandController() const {
+    return oculusMobileControllers.operator bool();
+}
+
+bool OculusMobileControllerManager::isSupported() const {
+    return true;
+}
+
+bool OculusMobileControllerManager::activate() {
+    InputPlugin::activate();
+    checkForConnectedDevices();
+    return true;
+}
+
+void OculusMobileControllerManager::checkForConnectedDevices() {
+    if (oculusMobileControllers) {
+        return;
+    }
+
+    ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+        oculusMobileControllers = OculusMobileInputDevice::check(session);
+        if (oculusMobileControllers) {
+            auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+            userInputMapper->registerDevice(oculusMobileControllers);
+        }
+    });
+}
+
+void OculusMobileControllerManager::deactivate() {
+    InputPlugin::deactivate();
+
+    // unregister with UserInputMapper
+    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+    if (oculusMobileControllers) {
+        userInputMapper->removeDevice(oculusMobileControllers->getDeviceID());
+        oculusMobileControllers.reset();
+    }
+}
+
+void OculusMobileControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    PerformanceTimer perfTimer("OculusMobileInputDevice::update");
+
+    checkForConnectedDevices();
+
+    if (!oculusMobileControllers) {
+        return;
+    }
+
+    bool updated = ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+        oculusMobileControllers->updateHands(session);
+    });
+
+    if (updated) {
+        oculusMobileControllers->update(deltaTime, inputCalibrationData);
+    }
+}
+
+void OculusMobileControllerManager::pluginFocusOutEvent() {
+    if (oculusMobileControllers) {
+        oculusMobileControllers->focusOutEvent();
+    }
+}
+
+QStringList OculusMobileControllerManager::getSubdeviceNames() {
+    QStringList devices;
+    if (oculusMobileControllers) {
+        devices << oculusMobileControllers->getName();
+    }
+    return devices;
+}
+
+using namespace controller;
+
+static const std::vector<std::pair<ovrButton, StandardButtonChannel>> BUTTON_MAP { {
+    { ovrButton_Up, DU },
+    { ovrButton_Down, DD },
+    { ovrButton_Left, DL },
+    { ovrButton_Right, DR },
+    { ovrButton_Enter, START },
+    { ovrButton_Back, BACK },
+    { ovrButton_X, X },
+    { ovrButton_Y, Y },
+    { ovrButton_A, A },
+    { ovrButton_B, B },
+    { ovrButton_LThumb, LS },
+    { ovrButton_RThumb, RS },
+    //{ ovrButton_LShoulder, LB },
+    //{ ovrButton_RShoulder, RB },
+} };
+
+static const std::vector<std::pair<ovrTouch, StandardButtonChannel>> LEFT_TOUCH_MAP { {
+    { ovrTouch_X, LEFT_PRIMARY_THUMB_TOUCH },
+    { ovrTouch_Y, LEFT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_LThumb, LS_TOUCH },
+    { ovrTouch_ThumbUp, LEFT_THUMB_UP },
+    { ovrTouch_IndexTrigger, LEFT_PRIMARY_INDEX_TOUCH },
+    { ovrTouch_IndexPointing, LEFT_INDEX_POINT },
+} };
+
+
+static const std::vector<std::pair<ovrTouch, StandardButtonChannel>> RIGHT_TOUCH_MAP { {
+    { ovrTouch_A, RIGHT_PRIMARY_THUMB_TOUCH },
+    { ovrTouch_B, RIGHT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_RThumb, RS_TOUCH },
+    { ovrTouch_ThumbUp, RIGHT_THUMB_UP },
+    { ovrTouch_IndexTrigger, RIGHT_PRIMARY_INDEX_TOUCH },
+    { ovrTouch_IndexPointing, RIGHT_INDEX_POINT },
+} };
+
+void OculusMobileInputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    _buttonPressedMap.clear();
+
+    int numTrackedControllers = 0;
+    quint64 currentTime = usecTimestampNow();
+    handleHeadPose(deltaTime, inputCalibrationData, _headTracking.HeadPose);
+
+    static const auto REQUIRED_HAND_STATUS = VRAPI_TRACKING_STATUS_ORIENTATION_TRACKED | VRAPI_TRACKING_STATUS_POSITION_TRACKED;
+    ovr::for_each_hand([&](ovrHandedness hand) {
+        size_t handIndex = (hand == VRAPI_HAND_LEFT) ? 0 : 1;
+        int controller = (hand == VRAPI_HAND_LEFT) ? controller::LEFT_HAND : controller::RIGHT_HAND;
+        auto& handData = _hands[handIndex];
+        const auto& tracking = handData.tracking;
+        ++numTrackedControllers;
+
+        // Disable hand tracking while in Oculus Dash (Dash renders it's own hands)
+//        if (!hasInputFocus) {
+//            _poseStateMap.erase(controller);
+//            _poseStateMap[controller].valid = false;
+//            return;
+//        }
+
+        if (REQUIRED_HAND_STATUS == (tracking.Status & REQUIRED_HAND_STATUS)) {
+            _poseStateMap.erase(controller);
+            handlePose(deltaTime, inputCalibrationData, hand, tracking.HeadPose);
+            handData.lostTracking = false;
+            handData.lastPose = tracking.HeadPose;
+            return;
+        }
+
+        if (handData.lostTracking) {
+            if (currentTime > handData.regainTrackingDeadline) {
+                _poseStateMap.erase(controller);
+                _poseStateMap[controller].valid = false;
+                return;
+            }
+        } else {
+            quint64 deadlineToRegainTracking = currentTime + LOST_TRACKING_DELAY;
+            handData.regainTrackingDeadline = deadlineToRegainTracking;
+            handData.lostTracking = true;
+        }
+        handleRotationForUntrackedHand(inputCalibrationData, hand, tracking.HeadPose);
+    });
+
+
+    using namespace controller;
+    // Axes
+    {
+        const auto& inputState = _hands[0].state;
+        _axisStateMap[LX] = inputState.JoystickNoDeadZone.x;
+        _axisStateMap[LY] = inputState.JoystickNoDeadZone.y;
+        _axisStateMap[LT] = inputState.IndexTrigger;
+        _axisStateMap[LEFT_GRIP] = inputState.GripTrigger;
+        for (const auto& pair : BUTTON_MAP) {
+            if (inputState.Buttons & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+                qDebug()<<"AAAA:BUTTON PRESSED "<<pair.second;
+            }
+        }
+        for (const auto& pair : LEFT_TOUCH_MAP) {
+            if (inputState.Touches & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+            }
+        }
+    }
+
+    {
+        const auto& inputState = _hands[1].state;
+        _axisStateMap[RX] = inputState.JoystickNoDeadZone.x;
+        _axisStateMap[RY] = inputState.JoystickNoDeadZone.y;
+        _axisStateMap[RT] = inputState.IndexTrigger;
+        _axisStateMap[RIGHT_GRIP] = inputState.GripTrigger;
+
+        for (const auto& pair : BUTTON_MAP) {
+            if (inputState.Buttons & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+            }
+        }
+        for (const auto& pair : RIGHT_TOUCH_MAP) {
+            if (inputState.Touches & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+            }
+        }
+    }
+
+    // Haptics
+    {
+        Locker locker(_lock);
+        for (auto& hand : _hands) {
+            if (hand.hapticDuration) {
+                hand.hapticDuration -= deltaTime * 1000.0f; // milliseconds
+            } else {
+                hand.stopHapticPulse();
+            }
+        }
+    }
+}
+
+void OculusMobileInputDevice::focusOutEvent() {
+    _axisStateMap.clear();
+    _buttonPressedMap.clear();
+};
+
+void OculusMobileInputDevice::handlePose(float deltaTime,
+                                                      const controller::InputCalibrationData& inputCalibrationData,
+                                                      ovrHandedness hand, const ovrRigidBodyPosef& handPose) {
+    auto poseId = (hand == VRAPI_HAND_LEFT) ? controller::LEFT_HAND : controller::RIGHT_HAND;
+    auto& pose = _poseStateMap[poseId];
+    pose = ovr::toControllerPose(hand, handPose);
+    // transform into avatar frame
+    glm::mat4 controllerToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    pose = pose.transform(controllerToAvatar);
+}
+
+void OculusMobileInputDevice::handleHeadPose(float deltaTime,
+                                                          const controller::InputCalibrationData& inputCalibrationData,
+                                                          const ovrRigidBodyPosef& headPose) {
+    glm::mat4 mat = createMatFromQuatAndPos(ovr::toGlm(headPose.Pose.Orientation),
+                                            ovr::toGlm(headPose.Pose.Position));
+
+    //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),
+                          ovr::toGlm(headPose.LinearVelocity), // XXX * matYFlip ?
+                          ovr::toGlm(headPose.AngularVelocity));
+
+    glm::mat4 sensorToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    glm::mat4 defaultHeadOffset = glm::inverse(inputCalibrationData.defaultCenterEyeMat) *
+        inputCalibrationData.defaultHeadMat;
+
+    pose.valid = true;
+    _poseStateMap[controller::HEAD] = pose.postTransform(defaultHeadOffset).transform(sensorToAvatar);
+}
+
+void OculusMobileInputDevice::handleRotationForUntrackedHand(const controller::InputCalibrationData& inputCalibrationData,
+                                                                          ovrHandedness hand, const ovrRigidBodyPosef& handPose) {
+    auto poseId = (hand == VRAPI_HAND_LEFT ? controller::LEFT_HAND : controller::RIGHT_HAND);
+    auto& pose = _poseStateMap[poseId];
+    const auto& lastHandPose = (hand == VRAPI_HAND_LEFT) ? _hands[0].lastPose : _hands[1].lastPose;
+    pose = ovr::toControllerPose(hand, handPose, lastHandPose);
+    glm::mat4 controllerToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    pose = pose.transform(controllerToAvatar);
+}
+
+bool OculusMobileInputDevice::triggerHapticPulse(float strength, float duration, controller::Hand hand) {
+    Locker locker(_lock);
+    bool success = true;
+
+    qDebug()<<"AAAA: Haptic duration %f " << duration;
+
+    if (hand == controller::BOTH || hand == controller::LEFT) {
+        success &= _hands[0].setHapticFeedback(strength, duration);
+    }
+    if (hand == controller::BOTH || hand == controller::RIGHT) {
+        success &= _hands[0].setHapticFeedback(strength, duration);
+    }
+    return success;
+}
+
+/**jsdoc
+ * <p>The <code>Controller.Hardware.OculusTouch</code> object has properties representing Oculus Rift. The property values are 
+ * integer IDs, uniquely identifying each output. <em>Read-only.</em> These can be mapped to actions or functions or 
+ * <code>Controller.Standard</code> items in a {@link RouteObject} mapping.</p>
+ * <table>
+ *   <thead>
+ *     <tr><th>Property</th><th>Type</th><th>Data</th><th>Description</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td colspan="4"><strong>Buttons</strong></td></tr>
+ *     <tr><td><code>A</code></td><td>number</td><td>number</td><td>"A" button pressed.</td></tr>
+ *     <tr><td><code>B</code></td><td>number</td><td>number</td><td>"B" button pressed.</td></tr>
+ *     <tr><td><code>X</code></td><td>number</td><td>number</td><td>"X" button pressed.</td></tr>
+ *     <tr><td><code>Y</code></td><td>number</td><td>number</td><td>"Y" button pressed.</td></tr>
+ *     <tr><td><code>LeftApplicationMenu</code></td><td>number</td><td>number</td><td>Left application menu button pressed.
+ *       </td></tr>
+ *     <tr><td><code>RightApplicationMenu</code></td><td>number</td><td>number</td><td>Right application menu button pressed.
+ *       </td></tr>
+ *     <tr><td colspan="4"><strong>Sticks</strong></td></tr>
+ *     <tr><td><code>LX</code></td><td>number</td><td>number</td><td>Left stick x-axis scale.</td></tr>
+ *     <tr><td><code>LY</code></td><td>number</td><td>number</td><td>Left stick y-axis scale.</td></tr>
+ *     <tr><td><code>RX</code></td><td>number</td><td>number</td><td>Right stick x-axis scale.</td></tr>
+ *     <tr><td><code>RY</code></td><td>number</td><td>number</td><td>Right stick y-axis scale.</td></tr>
+ *     <tr><td><code>LS</code></td><td>number</td><td>number</td><td>Left stick button pressed.</td></tr>
+ *     <tr><td><code>RS</code></td><td>number</td><td>number</td><td>Right stick button pressed.</td></tr>
+ *     <tr><td><code>LSTouch</code></td><td>number</td><td>number</td><td>Left stick is touched.</td></tr>
+ *     <tr><td><code>RSTouch</code></td><td>number</td><td>number</td><td>Right stick is touched.</td></tr>
+ *     <tr><td colspan="4"><strong>Triggers</strong></td></tr>
+ *     <tr><td><code>LT</code></td><td>number</td><td>number</td><td>Left trigger scale.</td></tr>
+ *     <tr><td><code>RT</code></td><td>number</td><td>number</td><td>Right trigger scale.</td></tr>
+ *     <tr><td><code>LeftGrip</code></td><td>number</td><td>number</td><td>Left grip scale.</td></tr>
+ *     <tr><td><code>RightGrip</code></td><td>number</td><td>number</td><td>Right grip scale.</td></tr>
+ *     <tr><td colspan="4"><strong>Finger Abstractions</strong></td></tr>
+ *     <tr><td><code>LeftPrimaryThumbTouch</code></td><td>number</td><td>number</td><td>Left thumb touching primary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>LeftSecondaryThumbTouch</code></td><td>number</td><td>number</td><td>Left thumb touching secondary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>LeftThumbUp</code></td><td>number</td><td>number</td><td>Left thumb not touching primary or secondary 
+ *       thumb buttons.</td></tr>
+ *     <tr><td><code>RightPrimaryThumbTouch</code></td><td>number</td><td>number</td><td>Right thumb touching primary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>RightSecondaryThumbTouch</code></td><td>number</td><td>number</td><td>Right thumb touching secondary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>RightThumbUp</code></td><td>number</td><td>number</td><td>Right thumb not touching primary or secondary 
+ *       thumb buttons.</td></tr>
+ *     <tr><td><code>LeftPrimaryIndexTouch</code></td><td>number</td><td>number</td><td>Left index finger is touching primary 
+ *       index finger control.</td></tr>
+ *     <tr><td><code>LeftIndexPoint</code></td><td>number</td><td>number</td><td>Left index finger is pointing, not touching 
+ *       primary or secondary index finger controls.</td></tr>
+ *     <tr><td><code>RightPrimaryIndexTouch</code></td><td>number</td><td>number</td><td>Right index finger is touching primary 
+ *       index finger control.</td></tr>
+ *     <tr><td><code>RightIndexPoint</code></td><td>number</td><td>number</td><td>Right index finger is pointing, not touching 
+ *       primary or secondary index finger controls.</td></tr>
+ *     <tr><td colspan="4"><strong>Avatar Skeleton</strong></td></tr>
+ *     <tr><td><code>Head</code></td><td>number</td><td>{@link Pose}</td><td>Head pose.</td></tr>
+ *     <tr><td><code>LeftHand</code></td><td>number</td><td>{@link Pose}</td><td>Left hand pose.</td></tr>
+ *     <tr><td><code>RightHand</code></td><td>number</td><td>{@link Pose}</td><td>right hand pose.</td></tr>
+ *   </tbody>
+ * </table>
+ * @typedef {object} Controller.Hardware-OculusTouch
+ */
+controller::Input::NamedVector OculusMobileInputDevice::getAvailableInputs() const {
+    using namespace controller;
+    QVector<Input::NamedPair> availableInputs{
+        // buttons
+        makePair(A, "A"),
+        makePair(B, "B"),
+        makePair(X, "X"),
+        makePair(Y, "Y"),
+
+        // trackpad analogs
+        makePair(LX, "LX"),
+        makePair(LY, "LY"),
+        makePair(RX, "RX"),
+        makePair(RY, "RY"),
+
+        // triggers
+        makePair(LT, "LT"),
+        makePair(RT, "RT"),
+
+        // trigger buttons
+        //makePair(LB, "LB"),
+        //makePair(RB, "RB"),
+
+        // side grip triggers
+        makePair(LEFT_GRIP, "LeftGrip"),
+        makePair(RIGHT_GRIP, "RightGrip"),
+
+        // joystick buttons
+        makePair(LS, "LS"),
+        makePair(RS, "RS"),
+
+        makePair(LEFT_HAND, "LeftHand"),
+        makePair(RIGHT_HAND, "RightHand"),
+        makePair(HEAD, "Head"),
+
+        makePair(LEFT_PRIMARY_THUMB_TOUCH, "LeftPrimaryThumbTouch"),
+        makePair(LEFT_SECONDARY_THUMB_TOUCH, "LeftSecondaryThumbTouch"),
+        makePair(RIGHT_PRIMARY_THUMB_TOUCH, "RightPrimaryThumbTouch"),
+        makePair(RIGHT_SECONDARY_THUMB_TOUCH, "RightSecondaryThumbTouch"),
+        makePair(LEFT_PRIMARY_INDEX_TOUCH, "LeftPrimaryIndexTouch"),
+        makePair(RIGHT_PRIMARY_INDEX_TOUCH, "RightPrimaryIndexTouch"),
+        makePair(LS_TOUCH, "LSTouch"),
+        makePair(RS_TOUCH, "RSTouch"),
+        makePair(LEFT_THUMB_UP, "LeftThumbUp"),
+        makePair(RIGHT_THUMB_UP, "RightThumbUp"),
+        makePair(LEFT_INDEX_POINT, "LeftIndexPoint"),
+        makePair(RIGHT_INDEX_POINT, "RightIndexPoint"),
+
+        makePair(BACK, "LeftApplicationMenu"),
+        makePair(START, "RightApplicationMenu"),
+    };
+    return availableInputs;
+}
+
+OculusMobileInputDevice::OculusMobileInputDevice(ovrMobile* session, const std::vector<ovrInputTrackedRemoteCapabilities>& devicesCaps) : controller::InputDevice("OculusTouch") {
+    qWarning() << "QQQ" << __FUNCTION__ << "Found " << devicesCaps.size() << "devices";
+    for (const auto& deviceCaps : devicesCaps) {
+        size_t handIndex = -1;
+        if (deviceCaps.ControllerCapabilities & ovrControllerCaps_LeftHand) {
+            handIndex = 0;
+        } else if (deviceCaps.ControllerCapabilities & ovrControllerCaps_RightHand) {
+            handIndex = 1;
+        } else {
+            continue;
+        }
+        HandData& handData = _hands[handIndex];
+        handData.state.Header.ControllerType = ovrControllerType_TrackedRemote;
+        handData.valid = true;
+        handData.caps = deviceCaps;
+        handData.update(session);
+    }
+}
+
+void OculusMobileInputDevice::updateHands(ovrMobile* session) {
+    _headTracking = vrapi_GetPredictedTracking2(session, 0.0);
+    for (auto& hand : _hands) {
+        hand.update(session);
+    }
+}
+
+QString OculusMobileInputDevice::getDefaultMappingConfig() const {
+    static const QString MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/oculus_touch.json";
+    return MAPPING_JSON;
+}
+
+// TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
+InputPluginList getInputPlugins() {
+    InputPlugin* PLUGIN_POOL[] = {
+        new KeyboardMouseDevice(),
+        new OculusMobileControllerManager(),
+        nullptr
+    };
+
+    InputPluginList result;
+    for (int i = 0; PLUGIN_POOL[i]; ++i) {
+        InputPlugin* plugin = PLUGIN_POOL[i];
+        if (plugin->isSupported()) {
+            result.push_back(InputPluginPointer(plugin));
+        }
+    }
+    return result;
+}
\ No newline at end of file
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h
new file mode 100644
index 0000000000..43ead8d6a2
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h
@@ -0,0 +1,43 @@
+//
+//  Created by Bradley Austin Davis on 2016/03/04
+//  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__OculusMobileControllerManager
+#define hifi__OculusMobileControllerManager
+
+#include <QObject>
+#include <unordered_set>
+#include <map>
+
+#include <GLMHelpers.h>
+
+#include <controllers/InputDevice.h>
+#include <plugins/InputPlugin.h>
+
+class OculusMobileControllerManager : public InputPlugin {
+Q_OBJECT
+public:
+    // Plugin functions
+    bool isSupported() const override;
+    const QString getName() const override { return NAME; }
+    bool isHandController() const override;
+    bool isHeadController() const override { return true; }
+    QStringList getSubdeviceNames() override;
+
+    bool activate() override;
+    void deactivate() override;
+
+    void pluginFocusOutEvent() override;
+    void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
+
+private:
+    static const char* NAME;
+
+    void checkForConnectedDevices();
+};
+
+#endif // hifi__OculusMobileControllerManager
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
new file mode 100644
index 0000000000..34ba130c71
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
@@ -0,0 +1,269 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "OculusMobileDisplayPlugin.h"
+
+#include <QtAndroidExtras/QAndroidJniEnvironment>
+#include <glm/gtc/matrix_transform.hpp>
+#include <VrApi_Types.h>
+#include <VrApi_Helpers.h>
+
+#include <AbstractViewStateInterface.h>
+#include <gpu/Frame.h>
+#include <gpu/Context.h>
+#include <gpu/gl/GLBackend.h>
+#include <ViewFrustum.h>
+#include <plugins/PluginManager.h>
+#include <ui-plugins/PluginContainer.h>
+#include <controllers/Pose.h>
+#include <display-plugins/CompositorHelper.h>
+#include <gpu/Frame.h>
+#include <gl/Config.h>
+#include <gl/GLWidget.h>
+#include <gl/Context.h>
+#include <MainWindow.h>
+#include <AddressManager.h>
+
+#include <ovr/Helpers.h>
+#include <VrApi.h>
+
+using namespace ovr;
+
+const char* OculusMobileDisplayPlugin::NAME { "Oculus Rift" };
+//thread_local bool renderThread = false;
+#define OCULUS_APP_ID 2331695256865113
+
+OculusMobileDisplayPlugin::OculusMobileDisplayPlugin() {
+
+}
+
+OculusMobileDisplayPlugin::~OculusMobileDisplayPlugin() {
+}
+
+void OculusMobileDisplayPlugin::init() {
+    Parent::init();
+    initVr();
+
+    emit deviceConnected(getName());
+}
+
+void OculusMobileDisplayPlugin::deinit() {
+    shutdownVr();
+    Parent::deinit();
+}
+
+bool OculusMobileDisplayPlugin::internalActivate() {
+    _renderTargetSize = { 1024, 512 };
+    _cullingProjection = ovr::toGlm(ovrMatrix4f_CreateProjectionFov(90.0f, 90.0f, 0.0f, 0.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP));
+
+
+    withOvrJava([&](const ovrJava* java){
+        _renderTargetSize = glm::uvec2{
+            vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH),
+            vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_HEIGHT),
+        };
+    });
+
+    ovr::for_each_eye([&](ovrEye eye){
+        _eyeProjections[eye] = _cullingProjection;
+    });
+
+    // This must come after the initialization, so that the values calculated
+    // above are available during the customizeContext call (when not running
+    // in threaded present mode)
+    return Parent::internalActivate();
+}
+
+void OculusMobileDisplayPlugin::internalDeactivate() {
+    Parent::internalDeactivate();
+    // ovr::releaseRenderSession(_session);
+}
+
+void OculusMobileDisplayPlugin::customizeContext() {
+    qWarning() << "QQQ" << __FUNCTION__ << "done";
+    gl::initModuleGl();
+    _mainContext = _container->getPrimaryWidget()->context();
+    _mainContext->makeCurrent();
+    ovr::VrHandler::setHandler(this);
+    _mainContext->doneCurrent();
+    _mainContext->makeCurrent();
+    Parent::customizeContext();
+    qWarning() << "QQQ" << __FUNCTION__ << "done";
+}
+
+void OculusMobileDisplayPlugin::uncustomizeContext() {
+    ovr::VrHandler::setHandler(nullptr);
+    _mainContext->doneCurrent();
+    _mainContext->makeCurrent();
+    Parent::uncustomizeContext();
+}
+
+QRectF OculusMobileDisplayPlugin::getPlayAreaRect() {
+    QRectF result;
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        ovrPosef pose;
+        ovrVector3f scale;
+        if (ovrSuccess != vrapi_GetBoundaryOrientedBoundingBox(session, &pose, &scale)) {
+            return;
+        }
+        // FIXME extract the center from the pose
+        glm::vec2 center { 0 };
+        glm::vec2 dimensions = glm::vec2(scale.x, scale.z);
+        dimensions *= 2.0f;
+        result = QRectF(center.x, center.y, dimensions.x, dimensions.y);
+    });
+    return result;
+}
+
+glm::mat4 OculusMobileDisplayPlugin::getEyeProjection(Eye eye, const glm::mat4& baseProjection) const {
+    glm::mat4 result = baseProjection;
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        auto trackingState = vrapi_GetPredictedTracking2(session, 0.0);
+        result = ovr::Fov{ trackingState.Eye[eye].ProjectionMatrix }.withZ(baseProjection);
+    });
+    return result;
+}
+
+glm::mat4 OculusMobileDisplayPlugin::getCullingProjection(const glm::mat4& baseProjection) const {
+    glm::mat4 result = baseProjection;
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        auto trackingState = vrapi_GetPredictedTracking2(session, 0.0);
+        ovr::Fov fovs[2];
+        for (size_t i = 0; i < 2; ++i) {
+            fovs[i].extract(trackingState.Eye[i].ProjectionMatrix);
+        }
+        fovs[0].extend(fovs[1]);
+        return fovs[0].withZ(baseProjection);
+    });
+    return result;
+}
+
+void OculusMobileDisplayPlugin::resetSensors() {
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        vrapi_RecenterPose(session);
+    });
+    _currentRenderFrameInfo.renderPose = glm::mat4(); // identity
+}
+
+float OculusMobileDisplayPlugin::getTargetFrameRate() const {
+    float result = 0.0f;
+    VrHandler::withOvrJava([&](const ovrJava* java){
+        result = vrapi_GetSystemPropertyFloat(java, VRAPI_SYS_PROP_DISPLAY_REFRESH_RATE);
+    });
+    return result;
+}
+
+bool OculusMobileDisplayPlugin::isHmdMounted() const {
+    bool result = false;
+    VrHandler::withOvrJava([&](const ovrJava* java){
+        result = VRAPI_FALSE != vrapi_GetSystemStatusInt(java, VRAPI_SYS_STATUS_MOUNTED);
+    });
+    return result;
+}
+
+static void goToDevMobile() {
+    auto addressManager = DependencyManager::get<AddressManager>();
+    auto currentAddress = addressManager->currentAddress().toString().toStdString();
+    if (std::string::npos == currentAddress.find("dev-mobile")) {
+        addressManager->handleLookupString("hifi://dev-mobile/495.236,501.017,482.434/0,0.97452,0,-0.224301");
+        //addressManager->handleLookupString("hifi://dev-mobile/504,498,491/0,0,0,0");
+        //addressManager->handleLookupString("hifi://dev-mobile/0,-1,1");
+    }
+}
+
+// Called on the render thread, establishes the rough tracking for the upcoming
+bool OculusMobileDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
+    static QAndroidJniEnvironment* jniEnv = nullptr;
+    if (nullptr == jniEnv) {
+        jniEnv = new QAndroidJniEnvironment();
+    }
+    bool result = false;
+    _currentRenderFrameInfo = FrameInfo();
+    ovrTracking2 trackingState = {};
+    static bool resetTrackingTransform = true;
+    static glm::mat4 transformOffset;
+
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        if (resetTrackingTransform) {
+            auto pose = vrapi_GetTrackingTransform( session, VRAPI_TRACKING_TRANSFORM_SYSTEM_CENTER_FLOOR_LEVEL);
+            transformOffset = glm::inverse(ovr::toGlm(pose));
+            vrapi_SetTrackingTransform( session, pose);
+            resetTrackingTransform = false;
+        }
+        // Find a better way of
+        _currentRenderFrameInfo.predictedDisplayTime = vrapi_GetPredictedDisplayTime(session, currentPresentIndex() + 2);
+        trackingState = vrapi_GetPredictedTracking2(session, _currentRenderFrameInfo.predictedDisplayTime);
+        result = true;
+    });
+
+
+
+    if (result) {
+        _currentRenderFrameInfo.renderPose = transformOffset;
+        withNonPresentThreadLock([&] {
+            _currentRenderFrameInfo.sensorSampleTime = trackingState.HeadPose.TimeInSeconds;
+            _currentRenderFrameInfo.renderPose = transformOffset * ovr::toGlm(trackingState.HeadPose.Pose);
+            _currentRenderFrameInfo.presentPose = _currentRenderFrameInfo.renderPose;
+            _frameInfos[frameIndex] = _currentRenderFrameInfo;
+            _ipd = vrapi_GetInterpupillaryDistance(&trackingState);
+            ovr::for_each_eye([&](ovrEye eye){
+                _eyeProjections[eye] = ovr::toGlm(trackingState.Eye[eye].ProjectionMatrix);
+                _eyeOffsets[eye] = glm::translate(mat4(), vec3{ _ipd * (eye == VRAPI_EYE_LEFT ? -0.5f : 0.5f), 0.0f, 0.0f });
+            });
+       });
+    }
+
+    //  static uint32_t count = 0;
+    //  if ((++count % 1000) == 0) {
+    //      AbstractViewStateInterface::instance()->postLambdaEvent([] {
+    //          goToDevMobile();
+    //      });
+    //  }
+
+    return result && Parent::beginFrameRender(frameIndex);
+}
+
+ovrTracking2 presentTracking;
+
+void OculusMobileDisplayPlugin::updatePresentPose() {
+    static QAndroidJniEnvironment* jniEnv = nullptr;
+    if (nullptr == jniEnv) {
+        jniEnv = new QAndroidJniEnvironment();
+    }
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        presentTracking = beginFrame();
+        _currentPresentFrameInfo.sensorSampleTime = vrapi_GetTimeInSeconds();
+        _currentPresentFrameInfo.predictedDisplayTime = presentTracking.HeadPose.TimeInSeconds;
+        _currentPresentFrameInfo.presentPose = ovr::toGlm(presentTracking.HeadPose.Pose);
+    });
+}
+
+void OculusMobileDisplayPlugin::internalPresent() {
+    VrHandler::pollTask();
+
+    if (!vrActive()) {
+        QThread::msleep(1);
+        return;
+    }
+
+    auto sourceTexture = getGLBackend()->getTextureID(_compositeFramebuffer->getRenderBuffer(0));
+    glm::uvec2 sourceSize{ _compositeFramebuffer->getWidth(), _compositeFramebuffer->getHeight() };
+    VrHandler::presentFrame(sourceTexture, sourceSize, presentTracking);
+    _presentRate.increment();
+}
+
+DisplayPluginList getDisplayPlugins() {
+    static DisplayPluginList result;
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        auto plugin = std::make_shared<OculusMobileDisplayPlugin>();
+        plugin->isSupported();
+        result.push_back(plugin);
+    });
+    return result;
+}
+
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
new file mode 100644
index 0000000000..4a0a21e995
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
@@ -0,0 +1,65 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <display-plugins/hmd/HmdDisplayPlugin.h>
+
+#include <EGL/egl.h>
+
+#include <QTimer>
+#include <QtPlatformHeaders/QEGLNativeContext>
+#include <QtAndroidExtras/QAndroidJniObject>
+
+#include <gl/Context.h>
+#include <ovr/VrHandler.h>
+
+typedef struct ovrTextureSwapChain ovrTextureSwapChain;
+typedef struct ovrMobile ovrMobile;
+typedef struct ANativeWindow ANativeWindow;
+
+class OculusMobileDisplayPlugin : public HmdDisplayPlugin, public ovr::VrHandler {
+    using Parent = HmdDisplayPlugin;
+public:
+    OculusMobileDisplayPlugin();
+    virtual ~OculusMobileDisplayPlugin();
+    bool isSupported() const override { return true; };
+    bool hasAsyncReprojection() const override { return true; }
+    bool getSupportsAutoSwitch() override final { return false; }
+    QThread::Priority getPresentPriority() override { return QThread::TimeCriticalPriority; }
+
+    glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override;
+    glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override;
+
+    // Stereo specific methods
+    void resetSensors() override final;
+    bool beginFrameRender(uint32_t frameIndex) override;
+
+    QRectF getPlayAreaRect() override;
+    float getTargetFrameRate() const override;
+    void init() override;
+    void deinit() override;
+
+protected:
+    const QString getName() const override { return NAME; }
+
+    bool internalActivate() override;
+    void internalDeactivate() override;
+
+    void customizeContext() override;
+    void uncustomizeContext() override;
+
+    void updatePresentPose() override;
+    void internalPresent() override;
+    void hmdPresent() override { throw std::runtime_error("Unused"); }
+    bool isHmdMounted() const override;
+
+    static const char* NAME;
+    mutable gl::Context* _mainContext{ nullptr };
+    uint32_t _readFbo;
+};
+
diff --git a/libraries/pointers/src/Pick.cpp b/libraries/pointers/src/Pick.cpp
index e95721c04b..7ac53a2643 100644
--- a/libraries/pointers/src/Pick.cpp
+++ b/libraries/pointers/src/Pick.cpp
@@ -7,6 +7,8 @@
 //
 #include "Pick.h"
 
+const PickFilter PickFilter::NOTHING;
+
 int pickTypeMetaTypeId = qRegisterMetaType<PickQuery::PickType>("PickType");
 
 PickQuery::PickQuery(const PickFilter& filter, const float maxDistance, const bool enabled) :
@@ -39,8 +41,7 @@ bool PickQuery::isEnabled() const {
 
 void PickQuery::setPrecisionPicking(bool precisionPicking) {
     withWriteLock([&] {
-        _filter.setFlag(PickFilter::PRECISE, precisionPicking);
-        _filter.setFlag(PickFilter::COARSE, !precisionPicking);
+        _filter.setFlag(PickFilter::PICK_COARSE, !precisionPicking);
     });
 }
 
diff --git a/libraries/pointers/src/Pick.h b/libraries/pointers/src/Pick.h
index 857a72caa8..9ca0f14c5f 100644
--- a/libraries/pointers/src/Pick.h
+++ b/libraries/pointers/src/Pick.h
@@ -18,7 +18,6 @@
 
 #include <shared/ReadWriteLockable.h>
 #include <TransformNode.h>
-#include <PickFilter.h>
 
 enum IntersectionType {
     NONE = 0,
@@ -28,6 +27,84 @@ enum IntersectionType {
     HUD
 };
 
+class PickFilter {
+public:
+    enum FlagBit {
+        PICK_ENTITIES = 0,
+        PICK_OVERLAYS,
+        PICK_AVATARS,
+        PICK_HUD,
+
+        PICK_COARSE, // if not set, does precise intersection, otherwise, doesn't
+
+        PICK_INCLUDE_INVISIBLE, // if not set, will not intersect invisible elements, otherwise, intersects both visible and invisible elements
+        PICK_INCLUDE_NONCOLLIDABLE, // if not set, will not intersect noncollidable elements, otherwise, intersects both collidable and noncollidable elements
+
+        // NOT YET IMPLEMENTED
+        PICK_ALL_INTERSECTIONS, // if not set, returns closest intersection, otherwise, returns list of all intersections
+
+        NUM_FLAGS, // Not a valid flag
+    };
+    typedef std::bitset<NUM_FLAGS> Flags;
+
+    // The key is the Flags
+    Flags _flags;
+
+    PickFilter() {}
+    PickFilter(const Flags& flags) : _flags(flags) {}
+
+    bool operator== (const PickFilter& rhs) const { return _flags == rhs._flags; }
+    bool operator!= (const PickFilter& rhs) const { return _flags != rhs._flags; }
+
+    void setFlag(FlagBit flag, bool value) { _flags[flag] = value; }
+
+    bool doesPickNothing() const { return _flags == NOTHING._flags; }
+    bool doesPickEntities() const { return _flags[PICK_ENTITIES]; }
+    bool doesPickOverlays() const { return _flags[PICK_OVERLAYS]; }
+    bool doesPickAvatars() const { return _flags[PICK_AVATARS]; }
+    bool doesPickHUD() const { return _flags[PICK_HUD]; }
+
+    bool doesPickCoarse() const { return _flags[PICK_COARSE]; }
+    bool doesPickInvisible() const { return _flags[PICK_INCLUDE_INVISIBLE]; }
+    bool doesPickNonCollidable() const { return _flags[PICK_INCLUDE_NONCOLLIDABLE]; }
+
+    bool doesWantAllIntersections() const { return _flags[PICK_ALL_INTERSECTIONS]; }
+
+    // Helpers for RayPickManager
+    Flags getEntityFlags() const {
+        unsigned int toReturn = getBitMask(PICK_ENTITIES);
+        if (doesPickInvisible()) {
+            toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
+        }
+        if (doesPickNonCollidable()) {
+            toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
+        }
+        if (doesPickCoarse()) {
+            toReturn |= getBitMask(PICK_COARSE);
+        }
+        return Flags(toReturn);
+    }
+    Flags getOverlayFlags() const {
+        unsigned int toReturn = getBitMask(PICK_OVERLAYS);
+        if (doesPickInvisible()) {
+            toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
+        }
+        if (doesPickNonCollidable()) {
+            toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
+        }
+        if (doesPickCoarse()) {
+            toReturn |= getBitMask(PICK_COARSE);
+        }
+        return Flags(toReturn);
+    }
+    Flags getAvatarFlags() const { return Flags(getBitMask(PICK_AVATARS)); }
+    Flags getHUDFlags() const { return Flags(getBitMask(PICK_HUD)); }
+
+    static constexpr unsigned int getBitMask(FlagBit bit) { return 1 << bit; }
+
+    static const PickFilter NOTHING;
+};
+
 class PickResult {
 public:
     PickResult() {}
diff --git a/libraries/pointers/src/PickCacheOptimizer.h b/libraries/pointers/src/PickCacheOptimizer.h
index e91283f02c..c74e84937b 100644
--- a/libraries/pointers/src/PickCacheOptimizer.h
+++ b/libraries/pointers/src/PickCacheOptimizer.h
@@ -85,10 +85,10 @@ QVector4D PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared
         T mathematicalPick = pick->getMathematicalPick();
         PickResultPointer res = pick->getDefaultResult(mathematicalPick.toVariantMap());
 
-        if (!pick->isEnabled() || pick->getMaxDistance() < 0.0f || !mathematicalPick) {
+        if (!pick->isEnabled() || pick->getFilter().doesPickNothing() || pick->getMaxDistance() < 0.0f || !mathematicalPick) {
             pick->setPickResult(res);
         } else {
-            if (pick->getFilter().doesPickDomainEntities() || pick->getFilter().doesPickAvatarEntities()) {
+            if (pick->getFilter().doesPickEntities()) {
                 PickCacheKey entityKey = { pick->getFilter().getEntityFlags(), pick->getIncludeItems(), pick->getIgnoreItems() };
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, entityKey)) {
                     PickResultPointer entityRes = pick->getEntityIntersection(mathematicalPick);
@@ -99,7 +99,7 @@ QVector4D PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared
                 }
             }
 
-            if (pick->getFilter().doesPickLocalEntities()) {
+            if (pick->getFilter().doesPickOverlays()) {
                 PickCacheKey overlayKey = { pick->getFilter().getOverlayFlags(), pick->getIncludeItems(), pick->getIgnoreItems() };
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, overlayKey)) {
                     PickResultPointer overlayRes = pick->getOverlayIntersection(mathematicalPick);
diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp
index abab5391e2..69e6c833ee 100644
--- a/libraries/qml/src/qml/OffscreenSurface.cpp
+++ b/libraries/qml/src/qml/OffscreenSurface.cpp
@@ -14,6 +14,7 @@
 #include <QtQml/QtQml>
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlComponent>
+#include <QtQml/QQmlFileSelector>
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QQuickRenderControl>
@@ -43,7 +44,21 @@ static QSize clampSize(const QSize& qsize, uint32_t maxDimension) {
 const QmlContextObjectCallback OffscreenSurface::DEFAULT_CONTEXT_OBJECT_CALLBACK = [](QQmlContext*, QQuickItem*) {};
 const QmlContextCallback OffscreenSurface::DEFAULT_CONTEXT_CALLBACK = [](QQmlContext*) {};
 
+QQmlFileSelector* OffscreenSurface::getFileSelector() {
+    auto context = getSurfaceContext();
+    if (!context) {
+        return nullptr;
+    }
+    auto engine = context->engine();
+    if (!engine) {
+        return nullptr;
+    }
+
+    return QQmlFileSelector::get(engine);
+}
+
 void OffscreenSurface::initializeEngine(QQmlEngine* engine) {
+    new QQmlFileSelector(engine);
 }
 
 using namespace hifi::qml::impl;
diff --git a/libraries/qml/src/qml/OffscreenSurface.h b/libraries/qml/src/qml/OffscreenSurface.h
index b3539e7709..18d24c93f7 100644
--- a/libraries/qml/src/qml/OffscreenSurface.h
+++ b/libraries/qml/src/qml/OffscreenSurface.h
@@ -30,6 +30,7 @@ class QQmlComponent;
 class QQuickWindow;
 class QQuickItem;
 class OffscreenQmlSharedObject;
+class QQmlFileSelector;
 
 namespace hifi { namespace qml {
 
@@ -72,6 +73,7 @@ public:
     QQuickWindow* getWindow();
     QObject* getEventHandler();
     QQmlContext* getSurfaceContext();
+    QQmlFileSelector* getFileSelector();
 
     // Checks to see if a new texture is available.  If one is, the function returns true and
     // textureAndFence will be populated with the texture ID and a fence which will be signalled
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index da8dceb176..eb4ef5e028 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -135,6 +135,11 @@ void Model::setScale(const glm::vec3& scale) {
 const float SCALE_CHANGE_EPSILON = 0.0000001f;
 
 void Model::setScaleInternal(const glm::vec3& scale) {
+    if (scale == glm::vec3(0)) {
+        setScaleInternal(glm::vec3{1});
+        return;
+    }
+
     if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
         _scale = scale;
         assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f);
diff --git a/libraries/render-utils/src/parabola_forward.slv b/libraries/render-utils/src/parabola_forward.slv
new file mode 100644
index 0000000000..4eb1456666
--- /dev/null
+++ b/libraries/render-utils/src/parabola_forward.slv
@@ -0,0 +1,7 @@
+layout(location=0) in vec4 _color;
+
+layout(location=0) out vec4 _fragColor0;
+
+void main(void) {
+    _fragColor0 = _color;
+}
\ No newline at end of file
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 5e5c6b4c6e..1a130d18d8 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -75,6 +75,8 @@ void render::cullItems(const RenderContextPointer& renderContext, const CullFunc
     details._considered += (int)inItems.size();
 
     // Culling / LOD
+#if 0 
+    // Culling / LOD
     for (auto item : inItems) {
         if (item.bound.isNull()) {
             outItems.emplace_back(item); // One more Item to render
@@ -103,6 +105,12 @@ void render::cullItems(const RenderContextPointer& renderContext, const CullFunc
             details._outOfView++;
         }
     }
+#else
+    for (auto item : inItems) {
+        outItems.emplace_back(item);
+    }
+#endif
+
     details._rendered += (int)outItems.size();
 }
 
@@ -117,9 +125,9 @@ void FetchNonspatialItems::run(const RenderContextPointer& renderContext, const
     outItems.reserve(items.size());
     for (auto& id : items) {
         auto& item = scene->getItem(id);
-        if (filter.test(item.getKey())) {
+        //if (filter.test(item.getKey())) {
             outItems.emplace_back(ItemBound(id, item.getBound()));
-        }
+        //}
     }
 }
 
@@ -435,9 +443,9 @@ void ApplyCullFunctorOnItemBounds::run(const RenderContextPointer& renderContext
     outItems.reserve(inItems.size());
 
     for (auto& item : inItems) {
-        if (_cullFunctor(args, item.bound)) {
+        //if (_cullFunctor(args, item.bound)) {
             outItems.emplace_back(item);
-        }
+        //}
     }
 
     if (inputFrustum != nullptr) {
diff --git a/libraries/script-engine/src/ConsoleScriptingInterface.cpp b/libraries/script-engine/src/ConsoleScriptingInterface.cpp
index 60de04aa9e..e95053b964 100644
--- a/libraries/script-engine/src/ConsoleScriptingInterface.cpp
+++ b/libraries/script-engine/src/ConsoleScriptingInterface.cpp
@@ -30,6 +30,7 @@ QList<QString> ConsoleScriptingInterface::_groupDetails = QList<QString>();
 QScriptValue ConsoleScriptingInterface::info(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptInfoMessage(appendArguments(context));
+        qDebug()<<"SCRIPTING INFO: %s"<<appendArguments(context);
     }
     return QScriptValue::NullValue;
 }
@@ -39,6 +40,7 @@ QScriptValue ConsoleScriptingInterface::log(QScriptContext* context, QScriptEngi
     if (_groupDetails.count() == 0) {
         if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
             scriptEngine->scriptPrintedMessage(message);
+            qDebug()<<"SCRIPTING LOG: %s"<<message;
         }
     } else {
         logGroupMessage(message, engine);
@@ -49,6 +51,8 @@ QScriptValue ConsoleScriptingInterface::log(QScriptContext* context, QScriptEngi
 QScriptValue ConsoleScriptingInterface::debug(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptPrintedMessage(appendArguments(context));
+        qDebug()<<"SCRIPTING DEBUG: %s"<<appendArguments(context);
+
     }
     return QScriptValue::NullValue;
 }
@@ -56,6 +60,8 @@ QScriptValue ConsoleScriptingInterface::debug(QScriptContext* context, QScriptEn
 QScriptValue ConsoleScriptingInterface::warn(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptWarningMessage(appendArguments(context));
+        qDebug()<<"SCRIPTING WARN: %s"<<appendArguments(context);
+
     }
     return QScriptValue::NullValue;
 }
@@ -63,6 +69,8 @@ QScriptValue ConsoleScriptingInterface::warn(QScriptContext* context, QScriptEng
 QScriptValue ConsoleScriptingInterface::error(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptErrorMessage(appendArguments(context));
+        qDebug()<<"SCRIPTING ERROR: %s"<<appendArguments(context);
+
     }
     return QScriptValue::NullValue;
 }
@@ -70,6 +78,8 @@ QScriptValue ConsoleScriptingInterface::error(QScriptContext* context, QScriptEn
 QScriptValue ConsoleScriptingInterface::exception(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptErrorMessage(appendArguments(context));
+        qDebug()<<"SCRIPTING EXCEPTION: %s"<<appendArguments(context);
+
     }
     return QScriptValue::NullValue;
 }
@@ -125,6 +135,8 @@ QScriptValue ConsoleScriptingInterface::assertion(QScriptContext* context, QScri
         }
         if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
             scriptEngine->scriptErrorMessage(assertionResult);
+            qDebug()<<"SCRIPTING ASSERT: %s"<<assertionResult;
+
         }
     }
     return QScriptValue::NullValue;
diff --git a/libraries/shaders/headers/310es/header.glsl b/libraries/shaders/headers/310es/header.glsl
index 9a0af85281..f98aed7659 100644
--- a/libraries/shaders/headers/310es/header.glsl
+++ b/libraries/shaders/headers/310es/header.glsl
@@ -9,6 +9,9 @@
     #define gl_VertexID  gl_VertexIndex
 #endif
 #extension GL_EXT_texture_buffer : enable
+#ifndef VULKAN
+#extension GL_EXT_clip_cull_distance : enable
+#endif
 precision highp float;
 precision highp samplerBuffer;
 precision highp sampler2DShadow;
diff --git a/libraries/shaders/src/shaders/Shaders.cpp b/libraries/shaders/src/shaders/Shaders.cpp
index c7e39b2940..dc1ac46d7d 100644
--- a/libraries/shaders/src/shaders/Shaders.cpp
+++ b/libraries/shaders/src/shaders/Shaders.cpp
@@ -35,7 +35,7 @@ namespace shader {
 static const Dialect DEFAULT_DIALECT = Dialect::glsl310es;
 
 const std::vector<Dialect>& allDialects() {
-    static const std::vector<Dialect> ALL_DIALECTS{ { Dialect::glsl310es } };
+    static const std::vector<Dialect> ALL_DIALECTS{ Dialect::glsl310es };
     return ALL_DIALECTS;
 }
     
@@ -224,7 +224,7 @@ String Source::getSource(Dialect dialect, Variant variant) const {
         }
     }
 
-#ifdef Q_OS_ANDROID
+#if defined(Q_OS_ANDROID) || defined(USE_GLES)
     // SPIRV cross injects "#extension GL_OES_texture_buffer : require" into the GLSL shaders,
     // which breaks android rendering
     return variantSource.scribe;
diff --git a/libraries/shared/src/shared/FileUtils.cpp b/libraries/shared/src/shared/FileUtils.cpp
index 0709a53602..8adeea0d9c 100644
--- a/libraries/shared/src/shared/FileUtils.cpp
+++ b/libraries/shared/src/shared/FileUtils.cpp
@@ -32,6 +32,9 @@ const QStringList& FileUtils::getFileSelectors() {
     std::call_once(once, [] {
 #if defined(USE_GLES)
         extraSelectors << "gles";
+#endif
+#if defined(Q_OS_ANDROID)
+        extraSelectors << HIFI_ANDROID_APP;
 #endif
     });
     return extraSelectors;
diff --git a/libraries/ui/src/QmlFragmentClass.cpp b/libraries/ui/src/QmlFragmentClass.cpp
index 13e3527ded..af386bfdd5 100644
--- a/libraries/ui/src/QmlFragmentClass.cpp
+++ b/libraries/ui/src/QmlFragmentClass.cpp
@@ -24,7 +24,7 @@ QmlFragmentClass::QmlFragmentClass(bool restricted, QString id) : QmlWindowClass
 
 // Method called by Qt scripts to create a new bottom menu bar in Android
 QScriptValue QmlFragmentClass::internal_constructor(QScriptContext* context, QScriptEngine* engine, bool restricted) {
-
+#ifndef DISABLE_QML
     std::lock_guard<std::mutex> guard(_mutex);
     auto qml = context->argument(0).toVariant().toMap().value("qml");
     if (qml.isValid()) {
@@ -53,6 +53,8 @@ QScriptValue QmlFragmentClass::internal_constructor(QScriptContext* context, QSc
     QScriptValue scriptObject = engine->newQObject(retVal);
     _fragments[qml.toString()] = scriptObject;
     return scriptObject;
+#endif
+    return QScriptValue();
 }
 
 void QmlFragmentClass::close() {
@@ -61,6 +63,7 @@ void QmlFragmentClass::close() {
 }
 
 QObject* QmlFragmentClass::addButton(const QVariant& properties) {
+#ifndef DISABLE_QML
     QVariant resultVar;
     Qt::ConnectionType connectionType = Qt::AutoConnection;
     
@@ -79,8 +82,10 @@ QObject* QmlFragmentClass::addButton(const QVariant& properties) {
         qWarning() << "QmlFragmentClass addButton result not a QObject";
         return NULL;
     }
-    
     return qmlButton;
+#else
+    return nullptr;
+#endif
 }
 
 void QmlFragmentClass::removeButton(QObject* button) {
diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp
index 0182e3adc3..1140dbb079 100644
--- a/libraries/ui/src/QmlWindowClass.cpp
+++ b/libraries/ui/src/QmlWindowClass.cpp
@@ -98,6 +98,7 @@ QmlWindowClass::QmlWindowClass(bool restricted) : _restricted(restricted) {
  * @property {boolean} visible
  */
 void QmlWindowClass::initQml(QVariantMap properties) {
+#ifndef DISABLE_QML
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     _source = properties[SOURCE_PROPERTY].toString();
 
@@ -150,6 +151,7 @@ void QmlWindowClass::initQml(QVariantMap properties) {
 
     Q_ASSERT(_qmlWindow);
     Q_ASSERT(dynamic_cast<const QQuickItem*>(_qmlWindow.data()));
+#endif
 }
 
 void QmlWindowClass::qmlToScript(const QVariant& message) {
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index f67a356078..dbafee8487 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -237,7 +237,6 @@ void OffscreenQmlSurface::clearFocusItem() {
 
 void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
     Parent::initializeEngine(engine);
-    new QQmlFileSelector(engine);
     static std::once_flag once;
     std::call_once(once, [] { 
         qRegisterMetaType<TabletProxy*>();
@@ -245,6 +244,16 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
         qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
     });
 
+#ifdef Q_OS_ANDROID
+    auto fileSelector = QQmlFileSelector::get(engine);
+    if (fileSelector) {
+        auto selectors = fileSelector->selector()->extraSelectors();
+        if (!selectors.contains(HIFI_ANDROID_APP)) {
+            fileSelector->setExtraSelectors(QStringList() << HIFI_ANDROID_APP);
+        }
+    }
+#endif
+
     // Register the pixmap Security Image Provider
     engine->addImageProvider(SecurityImageProvider::PROVIDER_NAME, new SecurityImageProvider());
 
diff --git a/plugins/oculus/src/OculusDisplayPlugin.cpp b/plugins/oculus/src/OculusDisplayPlugin.cpp
index a34e647a5e..df01591639 100644
--- a/plugins/oculus/src/OculusDisplayPlugin.cpp
+++ b/plugins/oculus/src/OculusDisplayPlugin.cpp
@@ -138,6 +138,10 @@ void OculusDisplayPlugin::hmdPresent() {
         return;
     }
 
+    if (!_currentFrame) {
+        return;
+    }
+
     PROFILE_RANGE_EX(render, __FUNCTION__, 0xff00ff00, (uint64_t)_currentFrame->frameIndex)
 
     {
diff --git a/scripts/+android/defaultScripts.js b/scripts/+android/defaultScripts.js
deleted file mode 100644
index 8950af808d..0000000000
--- a/scripts/+android/defaultScripts.js
+++ /dev/null
@@ -1,128 +0,0 @@
-"use strict";
-/* jslint vars: true, plusplus: true */
-
-//
-//  defaultScripts.js
-//  examples
-//
-//  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
-//
-
-var DEFAULT_SCRIPTS_COMBINED = [
-    "system/progress.js",
-    "system/+android/touchscreenvirtualpad.js",
-    "system/+android/actionbar.js",
-    "system/+android/audio.js" ,
-    "system/+android/modes.js"/*,
-    "system/away.js",
-    "system/controllers/controllerDisplayManager.js",
-    "system/controllers/handControllerGrabAndroid.js",
-    "system/controllers/handControllerPointerAndroid.js",
-    "system/controllers/squeezeHands.js",
-    "system/controllers/grab.js",
-    "system/controllers/teleport.js",
-    "system/controllers/toggleAdvancedMovementForHandControllers.js",
-    "system/dialTone.js",
-    "system/firstPersonHMD.js",
-    "system/bubble.js",
-    "system/android.js",
-    "developer/debugging/debugAndroidMouse.js"*/
-];
-
-var DEBUG_SCRIPTS = [
-    "system/+android/stats.js"
-];
-
-var DEFAULT_SCRIPTS_SEPARATE = [ ];
-
-// add a menu item for debugging
-var MENU_CATEGORY = "Developer";
-var MENU_ITEM = "Debug defaultScripts.js";
-
-var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
-var previousSetting = Settings.getValue(SETTINGS_KEY);
-
-if (previousSetting === '' || previousSetting === false || previousSetting === 'false') {
-    previousSetting = false;
-}
-
-if (previousSetting === true || previousSetting === 'true') {
-    previousSetting = true;
-}
-
-if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_ITEM)) {
-    Menu.addMenuItem({
-        menuName: MENU_CATEGORY,
-        menuItemName: MENU_ITEM,
-        isCheckable: true,
-        isChecked: previousSetting,
-        grouping: "Advanced"
-    });
-}
-
-function loadSeparateDefaults() {
-    for (var i in DEFAULT_SCRIPTS_SEPARATE) {
-        Script.load(DEFAULT_SCRIPTS_SEPARATE[i]);
-    }
-}
-
-function runDefaultsTogether() {
-    for (var i in DEFAULT_SCRIPTS_COMBINED) {
-        Script.include(DEFAULT_SCRIPTS_COMBINED[i]);
-    }
-    if (Script.isDebugMode()) {
-        for (var i in DEBUG_SCRIPTS) {
-            Script.include(DEBUG_SCRIPTS[i]);
-        }
-    }
-    loadSeparateDefaults();
-}
-
-function runDefaultsSeparately() {
-    for (var i in DEFAULT_SCRIPTS_COMBINED) {
-        Script.load(DEFAULT_SCRIPTS_COMBINED[i]);
-    }
-    if (Script.isDebugMode()) {
-        for (var i in DEBUG_SCRIPTS) {
-            Script.load(DEBUG_SCRIPTS[i]);
-        }
-    }
-    loadSeparateDefaults();
-}
-
-// start all scripts
-if (Menu.isOptionChecked(MENU_ITEM)) {
-    // we're debugging individual default scripts
-    // so we load each into its own ScriptEngine instance
-    runDefaultsSeparately();
-} else {
-    // include all default scripts into this ScriptEngine
-    runDefaultsTogether();
-}
-
-function menuItemEvent(menuItem) {
-    if (menuItem === MENU_ITEM) {
-        var isChecked = Menu.isOptionChecked(MENU_ITEM);
-        if (isChecked === true) {
-            Settings.setValue(SETTINGS_KEY, true);
-        } else if (isChecked === false) {
-            Settings.setValue(SETTINGS_KEY, false);
-        }
-        Menu.triggerOption("Reload All Scripts");
-    }
-}
-
-function removeMenuItem() {
-    if (!Menu.isOptionChecked(MENU_ITEM)) {
-        Menu.removeMenuItem(MENU_CATEGORY, MENU_ITEM);
-    }
-}
-
-Script.scriptEnding.connect(function() {
-    removeMenuItem();
-});
-
-Menu.menuItemEvent.connect(menuItemEvent);
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index bd7e79dffc..75c266e6c9 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -14,20 +14,21 @@
 var DEFAULT_SCRIPTS_COMBINED = [
     "system/request-service.js",
     "system/progress.js",
-    "system/away.js",
-    "system/audio.js",
+    // "system/away.js",
+    // "system/audio.js",
     "system/hmd.js",
     "system/menu.js",
     "system/bubble.js",
-    "system/snapshot.js",
-    "system/pal.js", // "system/mod.js", // older UX, if you prefer
+    // "system/snapshot.js",
+    //"system/pal.js", // "system/mod.js", // older UX, if you prefer
     "system/avatarapp.js",
     "system/makeUserConnection.js",
-    "system/tablet-goto.js",
-    "system/marketplaces/marketplaces.js",
+    "system/goto.js",
+    // "system/tablet-goto.js",
+    // "system/marketplaces/marketplaces.js",
     "system/notifications.js",
-    "system/commerce/wallet.js",
-    "system/edit.js",
+    // "system/commerce/wallet.js",
+    // "system/edit.js",
     "system/dialTone.js",
     "system/firstPersonHMD.js",
     "system/tablet-ui/tabletUI.js",
@@ -40,12 +41,12 @@ var DEFAULT_SCRIPTS_SEPARATE = [
 ];
 
 if (Window.interstitialModeEnabled) {
-    // Insert interstitial scripts at front so that they're started first.
+    //  Insert interstitial scripts at front so that they're started first.
     DEFAULT_SCRIPTS_COMBINED.splice(0, 0, "system/interstitialPage.js", "system/redirectOverlays.js");
 }
 
 // add a menu item for debugging
-var MENU_CATEGORY = "Developer > Scripting";
+var MENU_CATEGORY = "Developer";
 var MENU_ITEM = "Debug defaultScripts.js";
 
 var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
@@ -116,7 +117,7 @@ function removeMenuItem() {
     }
 }
 
-Script.scriptEnding.connect(function() {
+Script.scriptEnding.connect(function () {
     removeMenuItem();
 });
 
diff --git a/scripts/developer/utilities/tests/entityPerfTest.js b/scripts/developer/utilities/tests/entityPerfTest.js
index d3846baba9..181afcf360 100644
--- a/scripts/developer/utilities/tests/entityPerfTest.js
+++ b/scripts/developer/utilities/tests/entityPerfTest.js
@@ -87,6 +87,14 @@ function makeEntity () {
         .withRay(function(){
             Entities.findRayIntersection(this.ray, false);
         });
+    entityTests.addTestCase('findRayIntersectionBlocking, precisionPicking=true')
+        .withRay(function(){
+            Entities.findRayIntersectionBlocking(this.ray, true);
+        })
+    entityTests.addTestCase('findRayIntersectionBlocking, precisionPicking=false')
+        .withRay(function(){
+            Entities.findRayIntersectionBlocking(this.ray, false);
+        })
     entityTests.addTestCase('no-op')
         .run(function(){});
 
diff --git a/scripts/system/+android/actionbar.js b/scripts/system/+android/actionbar.js
deleted file mode 100644
index e7e2459e69..0000000000
--- a/scripts/system/+android/actionbar.js
+++ /dev/null
@@ -1,59 +0,0 @@
-"use strict";
-//
-//  backbutton.js
-//  scripts/system/+android
-//
-//  Created by Gabriel Calero & Cristian Duarte on Apr 06, 2018
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-(function() { // BEGIN LOCAL_SCOPE
-
-var actionbar;
-var backButton;
-
-var logEnabled = true;
-
-function printd(str) {
-    if (logEnabled)
-        print("[actionbar.js] " + str);
-}
-
-function init() {
-    actionbar = new QmlFragment({
-        qml: "hifi/ActionBar.qml"
-    });
-    backButton = actionbar.addButton({
-        icon: "icons/+android/backward.svg",
-        activeIcon: "icons/+android/backward.svg",
-        text: "",
-        bgOpacity: 0.0,
-        hoverBgOpacity: 0.0,
-        activeBgOpacity: 0.0
-    });
-    
-    backButton.entered.connect(onBackPressed);
-    backButton.clicked.connect(onBackClicked);
-}
-
-function onBackPressed() {
-   Controller.triggerHapticPulseOnDevice(Controller.findDevice("TouchscreenVirtualPad"), 0.1, 40.0, 0);
-}
-
-function onBackClicked() {
-   Window.openAndroidActivity("Home", false);
-}
-
-
-Script.scriptEnding.connect(function() {
-    if(backButton) {
-        backButton.entered.disconnect(onBackPressed);
-        backButton.clicked.disconnect(onBackClicked);
-    }
-});
-
-init();
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/+android/audio.js b/scripts/system/+android/audio.js
deleted file mode 100644
index 34dd52604a..0000000000
--- a/scripts/system/+android/audio.js
+++ /dev/null
@@ -1,71 +0,0 @@
-"use strict";
-//
-//  audio.js
-//  scripts/system/
-//
-//  Created by Gabriel Calero & Cristian Duarte on Jan 16, 2018
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function() { // BEGIN LOCAL_SCOPE
-
-var audiobar;
-var audioButton;
-
-var logEnabled = false;
-
-function printd(str) {
-    if (logEnabled)
-        print("[audio.js] " + str);
-}
-
-function init() {
-    audiobar = new QmlFragment({
-        qml: "hifi/AudioBar.qml"
-    });
-
-    audioButton = audiobar.addButton({
-        icon: "icons/mic-unmute-a.svg",
-        activeIcon: "icons/mic-mute-a.svg",
-        text: "",
-        bgOpacity: 0.0,
-        hoverBgOpacity: 0.0,
-        activeHoverBgOpacity: 0.0,
-        activeBgOpacity: 0.0
-    });
-
-    onMuteToggled();
-
-    audioButton.clicked.connect(onMuteClicked);
-    audioButton.entered.connect(onMutePressed);
-    Audio.mutedChanged.connect(onMuteToggled);
-}
-
-function onMuteClicked() {
-    Audio.muted = !Audio.muted;
-}
-
-function onMutePressed() {
-    Controller.triggerHapticPulseOnDevice(Controller.findDevice("TouchscreenVirtualPad"), 0.1, 40.0, 0);
-}
-
-function onMuteToggled() {
-    printd("On Mute Toggled");
-    audioButton.isActive = Audio.muted; // Menu.isOptionChecked("Mute Microphone")
-    printd("Audio button is active: " + audioButton.isActive);
-}
-
-Script.scriptEnding.connect(function () {
-    if(audioButton) {
-        audioButton.clicked.disconnect(onMuteClicked);
-        audioButton.entered.disconnect(onMutePressed);
-        Audio.mutedChanged.connect(onMuteToggled);
-    }
-});
-
-init();
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/+android/clickWeb.js b/scripts/system/+android/clickWeb.js
deleted file mode 100644
index 229b2b8b82..0000000000
--- a/scripts/system/+android/clickWeb.js
+++ /dev/null
@@ -1,108 +0,0 @@
-"use strict";
-//
-//  clickWeb.js
-//  scripts/system/+android
-//
-//  Created by Gabriel Calero & Cristian Duarte on Jun 22, 2018
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function() { // BEGIN LOCAL_SCOPE
-
-var logEnabled = false;
-var touchOverlayID;
-var touchEntityID;
-
-function printd(str) {
-    if (logEnabled)
-        print("[clickWeb.js] " + str);
-}
-
-function intersectsWebOverlay(intersection) {
-    return intersection && intersection.intersects && intersection.overlayID && 
-            Overlays.getOverlayType(intersection.overlayID) == "web3d";
-}
-
-function intersectsWebEntity(intersection) {
-    if (intersection && intersection.intersects && intersection.entityID) {
-        var properties = Entities.getEntityProperties(intersection.entityID, ["type", "sourceUrl"]);
-        return properties.type && properties.type == "Web" && properties.sourceUrl;
-    }
-    return false;
-}
-
-function findRayIntersection(pickRay) {
-    // Check 3D overlays and entities. Argument is an object with origin and direction.
-    var overlayRayIntersection = Overlays.findRayIntersection(pickRay);
-    var entityRayIntersection = Entities.findRayIntersection(pickRay, true);
-    var isOverlayInters = intersectsWebOverlay(overlayRayIntersection);
-    var isEntityInters = intersectsWebEntity(entityRayIntersection);
-    if (isOverlayInters && 
-        (!isEntityInters || 
-          overlayRayIntersection.distance < entityRayIntersection.distance)) {
-        return { type: 'overlay', obj: overlayRayIntersection };
-    } else if (isEntityInters &&
-        (!isOverlayInters ||
-          entityRayIntersection.distance < overlayRayIntersection.distance)) {
-        return { type: 'entity', obj: entityRayIntersection };
-    }
-    return false;
-}
-
-function touchBegin(event) {
-    var intersection = findRayIntersection(Camera.computePickRay(event.x, event.y));
-    if (intersection && intersection.type == 'overlay') {
-        touchOverlayID = intersection.obj.overlayID;
-        touchEntityID = null;
-    } else if (intersection && intersection.type == 'entity') {
-        touchEntityID = intersection.obj.entityID;
-        touchOverlayID = null;
-    }
-}
-
-function touchEnd(event) {
-    var intersection = findRayIntersection(Camera.computePickRay(event.x, event.y));
-    if (intersection && intersection.type == 'overlay' && touchOverlayID == intersection.obj.overlayID) {
-        var propertiesToGet = {};
-        propertiesToGet[overlayID] = ['url'];
-        var properties = Overlays.getOverlaysProperties(propertiesToGet);
-        if (properties[overlayID].url) {
-            Window.openUrl(properties[overlayID].url);
-        }
-    } else if (intersection && intersection.type == 'entity' && touchEntityID == intersection.obj.entityID) {
-        var properties = Entities.getEntityProperties(touchEntityID, ["sourceUrl"]);
-        if (properties.sourceUrl) {
-            Window.openUrl(properties.sourceUrl);
-        }
-    }
-
-    touchOverlayID = null;
-    touchEntityID = null;
-}
-
-function ending() {
-    Controller.touchBeginEvent.disconnect(touchBegin);
-    Controller.touchEndEvent.disconnect(touchEnd);
-}
-
-function init() {
-    Controller.touchBeginEvent.connect(touchBegin);
-    Controller.touchEndEvent.connect(touchEnd);
-
-    Script.scriptEnding.connect(function () {
-        ending();
-    });
-
-}
-
-module.exports = {
-    init: init,
-    ending: ending
-}
-
-init();
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/+android/displayNames.js b/scripts/system/+android/displayNames.js
deleted file mode 100644
index 509d85cd2b..0000000000
--- a/scripts/system/+android/displayNames.js
+++ /dev/null
@@ -1,167 +0,0 @@
-"use strict";
-//
-//  displayNames.js
-//  scripts/system/
-//
-//  Created by Cristian Duarte & Gabriel Calero on May 3, 2018
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-(function() { // BEGIN LOCAL_SCOPE
-
-var MAX_DISTANCE_PX = 20; // Should we use dp instead?
-var UNKNOWN_NAME = "Unknown";
-var METERS_ABOVE_HEAD = 0.4;
-
-var TEXT_LINE_HEIGHT = .1;
-var TEXT_MARGIN = 0.025;
-
-var HIDE_MS = 10000;
-
-var currentTouchToAnalyze = null;
-
-var currentlyShownAvatar = {
-    avatarID: null,
-    avatar: null,
-    overlay: null
-};
-
-var logEnabled = false;
-
-var hideTimer = null;
-
-function printd(str) {
-    if (logEnabled) {       
-        print("[displayNames.js] " + str);
-    }
-}
-
-function clearOverlay() {
-    currentlyShownAvatar.avatar = null;
-    if (currentlyShownAvatar.overlay) {
-        Overlays.editOverlay(currentlyShownAvatar.overlay, {visible: false});
-    }
-}
-
-function touchedAvatar(avatarID, avatarData) {
-    printd("[AVATARNAME] touchEnd FOUND " + JSON.stringify(avatarData));
-
-    if (hideTimer) {
-        Script.clearTimeout(hideTimer);
-    }
-
-    // Case: touching an already selected avatar
-    if (currentlyShownAvatar.avatar && currentlyShownAvatar.avatarID == avatarID) {
-        clearOverlay();
-        return;
-    }
-
-    // Save currently selected avatar
-    currentlyShownAvatar.avatarID = avatarID;
-    currentlyShownAvatar.avatar = avatarData;
-
-    if (currentlyShownAvatar.overlay == null) {
-        var over = Overlays.addOverlay("text3d", {
-            lineHeight: TEXT_LINE_HEIGHT,
-            color: { red: 255, green: 255, blue: 255},
-            backgroundColor: {red: 0, green: 0, blue: 0},
-            leftMargin: TEXT_MARGIN,
-            topMargin: TEXT_MARGIN,
-            rightMargin: TEXT_MARGIN,
-            bottomMargin: TEXT_MARGIN,
-            alpha: 0.6,
-            solid: true,
-            isFacingAvatar: true,
-            visible: false
-        });
-        currentlyShownAvatar.overlay = over;
-    }
-
-    var nameToShow = avatarData.displayName ? avatarData.displayName : 
-        (avatarData.sessionDisplayName ? avatarData.sessionDisplayName : UNKNOWN_NAME);
-    var textSize = Overlays.textSize(currentlyShownAvatar.overlay, nameToShow);
-
-    Overlays.editOverlay(currentlyShownAvatar.overlay, {
-        dimensions: {
-            x: textSize.width + 2 * TEXT_MARGIN,
-            y: TEXT_LINE_HEIGHT + 2 * TEXT_MARGIN
-        },
-        localPosition: { x: 0, y: METERS_ABOVE_HEAD, z: 0 },
-        text: nameToShow,
-        parentID: avatarData.sessionUUID,
-        parentJointIndex: avatarData.getJointIndex("Head"),
-        visible: true
-    });
-
-    hideTimer = Script.setTimeout(function() {
-        clearOverlay();
-    }, HIDE_MS);
-}
-
-function touchBegin(event) {
-    currentTouchToAnalyze = event;
-}
-
-function touchEnd(event) {
-    if (Vec3.distance({x: event.x, y: event.y }, {x: currentTouchToAnalyze.x, y: currentTouchToAnalyze.y}) > MAX_DISTANCE_PX) {
-        printd("[AVATARNAME] touchEnd moved too much");
-        currentTouchToAnalyze = null;
-        return;
-    }
-
-    var pickRay = Camera.computePickRay(event.x, event.y);
-    var avatarRay = AvatarManager.findRayIntersection(pickRay, [], [MyAvatar.sessionUUID])
-
-    if (avatarRay.intersects) {
-        touchedAvatar(avatarRay.avatarID, AvatarManager.getAvatar(avatarRay.avatarID));
-    } else {
-        printd("[AVATARNAME] touchEnd released outside the avatar");
-    }
-
-    currentTouchToAnalyze = null;
-}
-
-var runAtLeastOnce = false;
-
-function ending() {
-    if (!runAtLeastOnce) {
-        return;
-    }
-
-    Controller.touchBeginEvent.disconnect(touchBegin);
-    Controller.touchEndEvent.disconnect(touchEnd);
-    Controller.mousePressEvent.disconnect(touchBegin);
-    Controller.mouseReleaseEvent.disconnect(touchEnd);
-
-    if (currentlyShownAvatar.overlay) {
-        Overlays.deleteOverlay(currentlyShownAvatar.overlay);
-        currentlyShownAvatar.overlay = null;
-    }
-    if (currentlyShownAvatar.avatar) {
-        currentlyShownAvatar.avatar = null;
-    }
-}
-
-function init() {
-    Controller.touchBeginEvent.connect(touchBegin);
-    Controller.touchEndEvent.connect(touchEnd);
-    Controller.mousePressEvent.connect(touchBegin);
-    Controller.mouseReleaseEvent.connect(touchEnd);
-
-    Script.scriptEnding.connect(function () {
-        ending();
-    });
-
-    runAtLeastOnce = true;
-}
-
-module.exports = {
-    init: init,
-    ending: ending
-}
-
-//init(); // Enable to use in desktop as a standalone
-
-}()); // END LOCAL_SCOPE
\ No newline at end of file
diff --git a/scripts/system/+android/modes.js b/scripts/system/+android/modes.js
deleted file mode 100644
index f495af3bba..0000000000
--- a/scripts/system/+android/modes.js
+++ /dev/null
@@ -1,124 +0,0 @@
-"use strict";
-//
-//  modes.js
-//  scripts/system/
-//
-//  Created by Gabriel Calero & Cristian Duarte on Jan 23, 2018
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-(function() { // BEGIN LOCAL_SCOPE
-
-var modeButton;
-var currentMode;
-var barQml;
-
-var SETTING_CURRENT_MODE_KEY = 'Android/Mode';
-var MODE_VR = "VR", MODE_RADAR = "RADAR", MODE_MY_VIEW = "MY VIEW";
-var DEFAULT_MODE = MODE_MY_VIEW;
-var nextMode = {};
-nextMode[MODE_RADAR]=MODE_MY_VIEW;
-nextMode[MODE_MY_VIEW]=MODE_RADAR;
-var modeLabel = {};
-modeLabel[MODE_RADAR]="TOP VIEW";
-modeLabel[MODE_MY_VIEW]="MY VIEW";
-
-var logEnabled = false;
-var radar = Script.require('./radar.js');
-var uniqueColor = Script.require('./uniqueColor.js');
-var displayNames = Script.require('./displayNames.js');
-var clickWeb = Script.require('./clickWeb.js');
-
-function printd(str) {
-    if (logEnabled) {       
-        print("[modes.js] " + str);
-    }
-}
-
-function init() {
-    radar.setUniqueColor(uniqueColor);
-    radar.init();
-    
-    barQml = new QmlFragment({
-        qml: "hifi/modesbar.qml"
-    });
-    modeButton = barQml.addButton({
-        icon: "icons/myview-a.svg",
-        activeBgOpacity: 0.0,
-        hoverBgOpacity: 0.0,
-        activeHoverBgOpacity: 0.0,
-        text: "MODE",
-        height:240,
-        bottomMargin: 16,
-        textSize: 38,
-        fontFamily: "Raleway",
-        fontBold: true
-
-    });
-    
-    switchToMode(getCurrentModeSetting());
-    
-    modeButton.entered.connect(modeButtonPressed);
-    modeButton.clicked.connect(modeButtonClicked);
-}
-
-function shutdown() {
-    modeButton.entered.disconnect(modeButtonPressed);
-    modeButton.clicked.disconnect(modeButtonClicked);
-}
-
-function modeButtonPressed() {
-   Controller.triggerHapticPulseOnDevice(Controller.findDevice("TouchscreenVirtualPad"), 0.1, 40.0, 0);
-}
-
-function modeButtonClicked() {
-    switchToMode(nextMode[currentMode]);
-}
-
-function saveCurrentModeSetting(mode) {
-    Settings.setValue(SETTING_CURRENT_MODE_KEY, mode);
-}
-
-function getCurrentModeSetting(mode) {
-    return Settings.getValue(SETTING_CURRENT_MODE_KEY, DEFAULT_MODE);
-}
-
-function switchToMode(newMode) {
-    // before leaving radar mode
-    if (currentMode == MODE_RADAR) {
-        radar.endRadarMode();
-    }
-    currentMode = newMode;
-    modeButton.text = modeLabel[currentMode];
-
-    saveCurrentModeSetting(currentMode);
-
-    if (currentMode == MODE_RADAR) {
-        radar.startRadarMode();
-        displayNames.ending();
-        clickWeb.ending();
-    } else  if (currentMode == MODE_MY_VIEW) {
-        // nothing to do yet
-        displayNames.init();
-        clickWeb.init();
-    } else {
-        printd("Unknown view mode " + currentMode);
-    }
-    
-}
-
-function sendToQml(o) {
-    if(barQml) {
-      barQml.sendToQml(o);  
-    }
-}
-
-Script.scriptEnding.connect(function () {
-    shutdown();
-});
-
-init();
-
-}()); // END LOCAL_SCOPE
\ No newline at end of file
diff --git a/scripts/system/+android/radar.js b/scripts/system/+android/radar.js
deleted file mode 100644
index 1cbe721ad0..0000000000
--- a/scripts/system/+android/radar.js
+++ /dev/null
@@ -1,1217 +0,0 @@
-"use strict";
-//
-// radar.js
-// scripts/system/+android/
-//
-// Created by Cristian Duarte & Gabriel Calero on 31 Jan 2018
-// Copyright 2018 High Fidelity, Inc.
-//
-// Distributed under the Apache License, Version 2.0.
-// See the accompanying file LICENSE or
-// http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-var radarModeInterface = {};
-
-var logEnabled = false;
-function printd(str) {
-    if (logEnabled) {
-        print("[radar.js] " + str);
-    }
-}
-
-var radar = false;
-var RADAR_HEIGHT_INIT_DELTA = 10;
-var radarHeight = MyAvatar.position.y + RADAR_HEIGHT_INIT_DELTA; // camera position (absolute y)
-var tablet;
-
-var RADAR_CAMERA_OFFSET = -1; // 1 meter below the avatar
-var ABOVE_GROUND_DROP = 2;
-var MOVE_BY = 1;
-
-// Swipe/Drag vars
-var PINCH_INCREMENT_FIRST = 0.4; // 0.1 meters zoom in - out
-var PINCH_INCREMENT = 0.4; // 0.1 meters zoom in - out
-var RADAR_HEIGHT_MAX_PLUS_AVATAR = 80;
-var RADAR_HEIGHT_MIN_PLUS_AVATAR = 2;
-var RADAR_CAMERA_DISTANCE_TO_ICONS = 1.5; // Icons are near the camera to prevent the LOD manager dismissing them
-var RADAR_ICONS_APPARENT_DISTANCE_TO_AVATAR_BASE = 1; // How much above the avatar base should the icon appear
-var AVATAR_DISPLAY_NAME_HEIGHT = 106;
-var AVATAR_DISPLAY_NAME_CHAR_WIDTH = 48;
-var AVATAR_DISPLAY_NAME_FONT_SIZE = 50;
-var lastDragAt;
-var lastDeltaDrag;
-
-var uniqueColor;
-
-function moveTo(position) {
-    if (radar) {
-        MyAvatar.goToLocation(position, false);
-        Camera.position = {
-            x : position.x,
-            y : radarHeight,
-            z : position.z
-        };
-    }
-}
-
-function keyPressEvent(event) {
-    if (radar) {
-        switch (event.text) {
-        case "UP":
-            moveTo(Vec3.sum(MyAvatar.position, {
-                x : 0.0,
-                y : 0,
-                z : -1 * MOVE_BY
-            }));
-            break;
-        case "DOWN":
-            moveTo(Vec3.sum(MyAvatar.position, {
-                x : 0,
-                y : 0,
-                z : MOVE_BY
-            }));
-            break;
-        case "LEFT":
-            moveTo(Vec3.sum(MyAvatar.position, {
-                x : -1 * MOVE_BY,
-                y : 0,
-                z : 0
-            }));
-            break;
-        case "RIGHT":
-            moveTo(Vec3.sum(MyAvatar.position, {
-                x : MOVE_BY,
-                y : 0,
-                z : 0
-            }));
-            break;
-        }
-    }
-}
-
-function toggleRadarMode() {
-    if (radar) {
-        endRadar();
-    } else {
-        startRadar();
-    }
-}
-
-function fakeDoubleTap(event) {
-    // CLD - temporarily disable toggling mode through double tap
-    // * As we have a new UI for toggling between modes, it may be discarded
-    // completely in the future.
-    // toggleRadarMode();
-    teleporter.dragTeleportUpdate(event);
-    teleporter.dragTeleportRelease(event);
-}
-
-var DOUBLE_TAP_TIME = 300;
-var fakeDoubleTapStart = Date.now();
-var touchEndCount = 0;
-
-/*
- * Counts touchEnds and if there were 2 in the DOUBLE_TAP_TIME lapse, it
- * triggers a fakeDoubleTap and returns true. Otherwise, returns false (no
- * double tap yet)
- */
-function analyzeDoubleTap(event) {
-    var fakeDoubleTapEnd = Date.now();
-    var elapsed = fakeDoubleTapEnd - fakeDoubleTapStart;
-    if (elapsed > DOUBLE_TAP_TIME) {
-        touchEndCount = 0;
-    }
-
-    // if this is our first "up" then record time so we can
-    // later determine if second "up" is a double tap
-    if (touchEndCount == 0) {
-        fakeDoubleTapStart = Date.now();
-    }
-    touchEndCount++;
-
-    if (touchEndCount >= 2) {
-        var fakeDoubleTapEnd = Date.now();
-        var elapsed = fakeDoubleTapEnd - fakeDoubleTapStart;
-        printd("-- fakeDoubleTapEnd:" + fakeDoubleTapEnd + "-- elapsed:"
-                + elapsed)
-        if (elapsed <= DOUBLE_TAP_TIME) {
-            touchEndCount = 0;
-            fakeDoubleTap(event);
-            return true; // don't do the normal touch end processing
-        }
-
-        touchEndCount = 0;
-    }
-    return false;
-}
-
-function touchEnd(event) {
-    printd("touchEnd received " + JSON.stringify(event));
-    // Clean up touch variables
-    lastDragAt = null;
-    lastDeltaDrag = null;
-    touchStartingCoordinates = null; // maybe in special cases it should be
-                                        // setup later?
-    startedDraggingCamera = false;
-    prevTouchPinchRadius = null;
-    draggingCamera = false;
-
-    if (movingCamera) {
-        // if camera was indeed moving, we should not further process, it was
-        // just dragging
-        movingCamera = false;
-        dragModeFunc = null;
-        return;
-    }
-
-    // teleport release analysis
-    if (teleporter && teleporter.dragTeleportUpdate == dragModeFunc) {
-        teleporter.dragTeleportRelease(event);
-        dragModeFunc = null;
-        return;
-    }
-    dragModeFunc = null;
-
-    // if pinching or moving is still detected, cancel
-    if (event.isPinching) {
-        printd("touchEnd fail because isPinching");
-        return;
-    }
-    if (event.isPinchOpening) {
-        printd("touchEnd fail because isPinchingOpening");
-        return;
-    }
-    if (event.isMoved) {
-        printd("touchEnd fail because isMoved");
-        return;
-    }
-
-    if (analyzeDoubleTap(event))
-        return; // double tap detected, finish
-
-}
-
-/**
- * Polyfill for sign(x)
- */
-if (!Math.sign) {
-    Math.sign = function(x) {
-        // If x is NaN, the result is NaN.
-        // If x is -0, the result is -0.
-        // If x is +0, the result is +0.
-        // If x is negative and not -0, the result is -1.
-        // If x is positive and not +0, the result is +1.
-        x = +x; // convert to a number
-        if (x === 0 || isNaN(x)) {
-            return Number(x);
-        }
-        return x > 0 ? 1 : -1;
-    };
-}
-
-/*******************************************************************************
- * Line and Plane intersection methods
- ******************************************************************************/
-
-/**
- * findLinePlaneIntersection Given points p {x: y: z:} and q that define a line,
- * and the plane of formula ax+by+cz+d = 0, returns the intersection point or
- * null if none.
- */
-function findLinePlaneIntersection(p, q, a, b, c, d) {
-    return findLinePlaneIntersectionCoords(p.x, p.y, p.z, q.x, q.y, q.z, a, b,
-            c, d);
-}
-
-/**
- * findLineToHeightIntersection Given points p {x: y: z:} and q that define a
- * line, and a planeY value that defines a plane paralel to 'the floor' xz
- * plane, returns the intersection to that plane or null if none.
- */
-function findLineToHeightIntersection(p, q, planeY) {
-    return findLinePlaneIntersection(p, q, 0, 1, 0, -planeY);
-}
-
-/**
- * findLinePlaneIntersectionCoords (to avoid requiring unnecessary
- * instantiation) Given points p with px py pz and q that define a line, and the
- * plane of formula ax+by+cz+d = 0, returns the intersection point or null if
- * none.
- */
-function findLinePlaneIntersectionCoords(px, py, pz, qx, qy, qz, a, b, c, d) {
-    var tDenom = a * (qx - px) + b * (qy - py) + c * (qz - pz);
-    if (tDenom == 0)
-        return null;
-
-    var t = -(a * px + b * py + c * pz + d) / tDenom;
-
-    return {
-        x : (px + t * (qx - px)),
-        y : (py + t * (qy - py)),
-        z : (pz + t * (qz - pz))
-    };
-}
-
-/**
- * findLineToHeightIntersection Given points p with px py pz and q that define a
- * line, and a planeY value that defines a plane paralel to 'the floor' xz
- * plane, returns the intersection to that plane or null if none.
- */
-function findLineToHeightIntersectionCoords(px, py, pz, qx, qy, qz, planeY) {
-    return findLinePlaneIntersectionCoords(px, py, pz, qx, qy, qz, 0, 1, 0,
-            -planeY);
-}
-
-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;
-}
-
-/**
- * Given a 2d point (x,y) this function returns the intersection (x, y, z) of
- * the computedPickRay for that point with the plane y = py
- */
-function computePointAtPlaneY(x, y, py) {
-    var ray = Camera.computePickRay(x, y);
-    var p1 = ray.origin;
-    var p2 = Vec3.sum(p1, Vec3.multiply(ray.direction, 1));
-    return findLineToHeightIntersectionCoords(p1.x, p1.y, p1.z, p2.x, p2.y,
-            p2.z, py);
-}
-
-/*******************************************************************************
- * 
- ******************************************************************************/
-
-var touchStartingCoordinates = null;
-
-var KEEP_PRESSED_FOR_TELEPORT_MODE_TIME = 750;
-var touchBeginTime;
-
-function touchBegin(event) {
-    var coords = {
-        x : event.x,
-        y : event.y
-    };
-    touchStartingCoordinates = coords;
-    touchBeginTime = Date.now();
-}
-
-var startedDraggingCamera = false; // first time
-var draggingCamera = false; // is trying
-var movingCamera = false; // definitive
-
-var MIN_DRAG_DISTANCE_TO_CONSIDER = 100; // distance by axis, not real
-                                            // distance
-
-var prevTouchPinchRadius = null;
-
-function pinchUpdate(event) {
-    if (!event.isMoved)
-        return;
-    if (event.radius <= 0)
-        return;
-
-    // pinch management
-    var avatarY = MyAvatar.position.y;
-    var pinchIncrement;
-    if (!!prevTouchPinchRadius) {
-        // no prev value
-        pinchIncrement = PINCH_INCREMENT
-                * Math.abs(event.radius - prevTouchPinchRadius) * 0.1;
-    } else {
-        pinchIncrement = PINCH_INCREMENT_FIRST;
-    }
-
-    if (event.isPinching) {
-        if (radarHeight + pinchIncrement > RADAR_HEIGHT_MAX_PLUS_AVATAR
-                + avatarY) {
-            radarHeight = RADAR_HEIGHT_MAX_PLUS_AVATAR + avatarY;
-        } else {
-            radarHeight += pinchIncrement;
-        }
-    } else if (event.isPinchOpening) {
-        if (radarHeight - pinchIncrement < RADAR_HEIGHT_MIN_PLUS_AVATAR
-                + avatarY) {
-            radarHeight = RADAR_HEIGHT_MIN_PLUS_AVATAR + avatarY;
-        } else {
-            radarHeight -= pinchIncrement;
-        }
-    }
-
-    Camera.position = { 
-        x : Camera.position.x, 
-        y : radarHeight, 
-        z : Camera.position.z 
-    };
-
-    if (!draggingCamera) {
-        startedDraggingCamera = true;
-        draggingCamera = true;
-    }
-
-    prevTouchPinchRadius = event.radius;
-}
-
-function isInsideSquare(coords0, coords1, halfside) {
-    return coords0 != undefined && coords1 != undefined &&
-            Math.abs(coords0.x - coords1.x) <= halfside
-            && Math.abs(coords0.y - coords1.y) <= halfside;
-}
-
-function dragScrollUpdate(event) {
-    if (!event.isMoved)
-        return;
-
-    // drag management
-    var pickRay = Camera.computePickRay(event.x, event.y);
-    var dragAt = Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction,
-            radarHeight - MyAvatar.position.y));
-
-    if (lastDragAt === undefined || lastDragAt === null) {
-        lastDragAt = dragAt;
-        return;
-    }
-
-    var deltaDrag = {
-        x : (lastDragAt.x - dragAt.x),
-        y : 0,
-        z : (lastDragAt.z - dragAt.z)
-    };
-
-    lastDragAt = dragAt;
-    if (lastDeltaDrag === undefined || lastDeltaDrag === null) {
-        lastDeltaDrag = deltaDrag;
-        return;
-    }
-
-    if (!draggingCamera) {
-        startedDraggingCamera = true;
-        draggingCamera = true;
-    } else {
-        if (!movingCamera) {
-            if (!isInsideSquare(touchStartingCoordinates, event,
-                    MIN_DRAG_DISTANCE_TO_CONSIDER)) {
-                movingCamera = true;
-            }
-        }
-
-        if (movingCamera) {
-            if (Math.sign(deltaDrag.x) == Math.sign(lastDeltaDrag.x)
-                    && Math.sign(deltaDrag.z) == Math.sign(lastDeltaDrag.z)) {
-                // Process movement if direction of the movement is the same
-                // than the previous frame
-                // process delta
-                var moveCameraTo = Vec3.sum(Camera.position, deltaDrag);
-                // move camera
-                Camera.position = moveCameraTo;
-            } else {
-                // Do not move camera if it's changing direction in this case,
-                // wait until the next direction confirmation..
-            }
-            lastDeltaDrag = deltaDrag; // save last
-        }
-    }
-}
-
-/*******************************************************************************
- * Teleport feature
- ******************************************************************************/
-
-function Teleporter() {
-
-    var SURFACE_DETECTION_FOR_TELEPORT = true; // true if uses teleport.js
-                                                // similar logic to detect
-                                                // surfaces. false if uses plain
-                                                // teleport to avatar same
-                                                // height.
-
-    var TELEPORT_TARGET_MODEL_URL = Script
-            .resolvePath("../assets/models/teleport-destination.fbx");
-    var TELEPORT_TOO_CLOSE_MODEL_URL = Script
-            .resolvePath("../assets/models/teleport-cancel.fbx");
-
-    var TELEPORT_MODEL_DEFAULT_DIMENSIONS = {
-        x : 0.10,
-        y : 0.00001,
-        z : 0.10
-    };
-
-    var teleportOverlay = Overlays.addOverlay("model", {
-        url : TELEPORT_TARGET_MODEL_URL,
-        dimensions : TELEPORT_MODEL_DEFAULT_DIMENSIONS,
-        orientation : Quat.fromPitchYawRollDegrees(0, 180, 0),
-        visible : false
-    });
-
-    var teleportCancelOverlay = Overlays.addOverlay("model", {
-        url : TELEPORT_TOO_CLOSE_MODEL_URL,
-        dimensions : TELEPORT_MODEL_DEFAULT_DIMENSIONS,
-        orientation : Quat.fromPitchYawRollDegrees(0, 180, 0),
-        visible : false
-    });
-
-    var TELEPORT_COLOR = {
-        red : 0,
-        green : 255,
-        blue : 255
-    };
-    var TELEPORT_CANCEL_COLOR = {
-        red : 255,
-        green : 255,
-        blue : 0
-    };
-
-    var teleportLine = Overlays.addOverlay("line3d", {
-        start : {
-            x : 0,
-            y : 0,
-            z : 0
-        },
-        end : {
-            x : 0,
-            y : 0,
-            z : 0
-        },
-        color : TELEPORT_COLOR,
-        alpha : 1,
-        lineWidth : 2,
-        dashed : false,
-        visible : false
-    });
-
-    // code from teleport.js
-    var TELEPORT_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
-    }
-
-    var TELEPORT_CANCEL_RANGE = 1;
-    var teleportTargetType = TELEPORT_TARGET.NONE;
-
-    function parseJSON(json) {
-        try {
-            return JSON.parse(json);
-        } catch (e) {
-            return undefined;
-        }
-    }
-
-    /*
-     * Enhanced with intersection with terrain instead of using current avatar y
-     * position if SURFACE_DETECTION_FOR_TELEPORT is true
-     */
-    function computeDestination(touchEventPos, avatarPosition, cameraPosition,
-            radarH) {
-        if (SURFACE_DETECTION_FOR_TELEPORT) {
-            var pickRay = Camera.computePickRay(touchEventPos.x,
-                    touchEventPos.y);
-            printd("newTeleportDetect - pickRay " + JSON.stringify(pickRay));
-            var destination = Entities.findRayIntersection(pickRay, true, [],
-                    [], false, true);
-            printd("newTeleportDetect - destination "
-                    + JSON.stringify(destination));
-            return destination;
-        } else {
-            var pickRay = Camera.computePickRay(touchEventPos.x,
-                    touchEventPos.y);
-            var pointingAt = Vec3.sum(pickRay.origin, Vec3.multiply(
-                    pickRay.direction, radarH));
-            var destination = {
-                x : pointingAt.x,
-                y : avatarPosition.y,
-                z : pointingAt.z
-            };
-            return destination;
-        }
-    }
-
-    function renderTeleportOverlays(destination) {
-        var overlayPosition = findLineToHeightIntersection(destination,
-                Camera.position, Camera.position.y
-                        - RADAR_CAMERA_DISTANCE_TO_ICONS);
-        printd("[newTeleport] TELEPORT ! render overlay at "
-                + JSON.stringify(overlayPosition));
-
-        // CLD note Oct 11, 2017
-        // Version of teleport.js 3c109f294f88ba7573bd1221f907f2605893c509
-        // doesn't allow invisible surfaces, let's allow it for now
-        if (teleportTargetType == TELEPORT_TARGET.SURFACE
-                || teleportTargetType == TELEPORT_TARGET.INVISIBLE) {
-            Overlays.editOverlay(teleportOverlay, {
-                visible : true,
-                position : overlayPosition
-            });
-            Overlays.editOverlay(teleportCancelOverlay, {
-                visible : false
-            });
-            Overlays.editOverlay(teleportLine, {
-                start : MyAvatar.position,
-                end : destination,
-                color : TELEPORT_COLOR,
-                visible : true
-            });
-        } else if (teleportTargetType == TELEPORT_TARGET.INVALID) {
-            Overlays.editOverlay(teleportOverlay, {
-                visible : false
-            });
-            Overlays.editOverlay(teleportCancelOverlay, {
-                visible : true,
-                position : overlayPosition
-            });
-            Overlays.editOverlay(teleportLine, {
-                start : MyAvatar.position,
-                end : destination,
-                color : TELEPORT_CANCEL_COLOR,
-                visible : true
-            });
-        } else { // TELEPORT_TARGET:NONE?
-            Overlays.editOverlay(teleportOverlay, {
-                visible : false
-            });
-            Overlays.editOverlay(teleportCancelOverlay, {
-                visible : false
-            });
-            Overlays.editOverlay(teleportLine, {
-                visible : false
-            });
-        }
-    }
-
-    var BORDER_DISTANCE_PX = 100;
-    var border_top = 0;
-    var border_left = 0;
-    var border_right = Window.innerWidth;
-    var border_bottom = Window.innerHeight;
-
-    function moveOnBorders(event) {
-        var xDelta = 0;
-        var zDelta = 0;
-
-        if (event.y <= border_top + BORDER_DISTANCE_PX) {
-            zDelta = -0.1;
-        } else if (event.y >= border_bottom - BORDER_DISTANCE_PX) {
-            zDelta = 0.1;
-        }
-        if (event.x <= border_left + BORDER_DISTANCE_PX) {
-            xDelta = -0.1;
-        } else if (event.x >= border_right - BORDER_DISTANCE_PX) {
-            xDelta = 0.1;
-        }
-        if (xDelta == 0 && zDelta == 0) {
-            draggingCamera = false;
-            return;
-        }
-
-
-        Camera.position = Vec3.sum(Camera.position, {
-            x : xDelta,
-            y : 0,
-            z : zDelta
-        });
-        draggingCamera = true;
-    }
-
-    // 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.
-    const MAX_ANGLE_FROM_UP_TO_TELEPORT = 70;
-    function getTeleportTargetType(intersection) {
-        if (SURFACE_DETECTION_FOR_TELEPORT) {
-            if (!intersection.intersects) {
-                return TELEPORT_TARGET.NONE;
-            }
-            var props = Entities.getEntityProperties(intersection.entityID, [
-                    'userData', 'visible' ]);
-            var data = parseJSON(props.userData);
-            if (data !== undefined && data.seat !== undefined) {
-                return TELEPORT_TARGET.SEAT;
-            }
-
-            if (!props.visible) {
-                return TELEPORT_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 TELEPORT_TARGET.INVALID;
-            } else {
-                return TELEPORT_TARGET.SURFACE;
-            }
-        } else {
-            var destination = intersection;
-            if (Vec3.distance(MyAvatar.position, destination) <= TELEPORT_CANCEL_RANGE) {
-                return TELEPORT_TARGET.INVALID;
-            } else {
-                return TELEPORT_TARGET.SURFACE;
-            }
-        }
-    }
-    ;
-
-    function moveToFromEvent(event) {
-        var destination = computeDestination(event, MyAvatar.position,
-                Camera.position, radarHeight);
-        moveTo(SURFACE_DETECTION_FOR_TELEPORT ? Vec3.sum(
-                destination.intersection, {
-                    y : 1
-                }) : destination);
-        return true;
-    }
-
-    return {
-        dragTeleportBegin : function(event) {
-            printd("[newTeleport] TELEPORT began");
-            var overlayDimensions = teleportIconModelDimensions(MyAvatar.position.y);
-            // var destination = computeDestination(event, MyAvatar.position,
-            // Camera.position, radarHeight);
-            // Dimension teleport and cancel overlays (not show them yet)
-            Overlays.editOverlay(teleportOverlay, {
-                dimensions : overlayDimensions
-            });
-            Overlays.editOverlay(teleportCancelOverlay, {
-                dimensions : overlayDimensions
-            });
-            // Position line
-            Overlays.editOverlay(teleportLine, {
-                visible : true,
-                start : 0,
-                end : 0
-            });
-        },
-
-        dragTeleportUpdate : function(event) {
-            // if in border, move camera
-            moveOnBorders(event);
-
-            var destination = computeDestination(event, MyAvatar.position,
-                    Camera.position, radarHeight);
-
-            teleportTargetType = getTeleportTargetType(destination);
-            renderTeleportOverlays(SURFACE_DETECTION_FOR_TELEPORT ? destination.intersection
-                    : destination);
-        },
-
-        dragTeleportRelease : function(event) {
-            printd("[newTeleport] TELEPORT released at "
-                    + JSON.stringify(event));
-            // CLD note Oct 11, 2017
-            // Version of teleport.js 3c109f294f88ba7573bd1221f907f2605893c509
-            // doesn't allow invisible surfaces, let's allow it for now
-            if (teleportTargetType == TELEPORT_TARGET.SURFACE
-                    || teleportTargetType == TELEPORT_TARGET.INVISIBLE) {
-                moveToFromEvent(event);
-            }
-            teleportTargetType = TELEPORT_TARGET.NONE;
-
-            Overlays.editOverlay(teleportOverlay, {
-                visible : false
-            });
-            Overlays.editOverlay(teleportLine, {
-                visible : false
-            });
-            Overlays.editOverlay(teleportCancelOverlay, {
-                visible : false
-            });
-        }
-    };
-
-}
-
-var teleporter = Teleporter();
-
-/*******************************************************************************
- * 
- ******************************************************************************/
-
-var dragModeFunc = null; // by default is nothing
-
-function oneFingerTouchUpdate(event) {
-    if (dragModeFunc) {
-        dragModeFunc(event);
-    } else {
-        if (!isInsideSquare(touchStartingCoordinates, event,
-                MIN_DRAG_DISTANCE_TO_CONSIDER)) {
-            dragModeFunc = dragScrollUpdate;
-            dragModeFunc(event);
-        } else {
-            var now = Date.now(); // check time
-            if (now - touchBeginTime >= KEEP_PRESSED_FOR_TELEPORT_MODE_TIME) {
-                teleporter.dragTeleportBegin(event);
-                dragModeFunc = teleporter.dragTeleportUpdate;
-                dragModeFunc(event);
-            } else {
-                // not defined yet, let's wait for time or movement to happen
-            }
-        }
-    }
-}
-
-function touchUpdate(event) {
-    if (event.isPinching || event.isPinchOpening) {
-        pinchUpdate(event);
-    } else {
-        oneFingerTouchUpdate(event);
-    }
-}
-
-/*******************************************************************************
- * Avatar cache structure for showing avatars markers
- ******************************************************************************/
-
-// by QUuid
-var avatarsData = {};
-var avatarsIcons = []; // a parallel list of icons (overlays) to easily run
-                        // through
-var avatarsNames = []; // a parallel list of names (overlays) to easily run
-                        // through
-
-function getAvatarIconForUser(uid) {
-    var color = uniqueColor.getColor(uid);
-    if (color.charAt(0) == '#') {
-        color = color.substring(1, color.length);
-    }
-    // FIXME: this is a temporary solution until we can use circle3d with
-    // lineWidth
-    return Script.resolvePath("assets/images/circle-" + color + ".svg");
-}
-
-var avatarIconDimensionsVal = {
-    x : 0,
-    y : 0,
-    z : 0.00001
-};
-function avatarIconPlaneDimensions() {
-    // given the current height, give a size
-    var xy = -0.003531 * (radarHeight - MyAvatar.position.y) + 0.1;
-    avatarIconDimensionsVal.x = Math.abs(xy);
-    avatarIconDimensionsVal.y = Math.abs(xy);
-    // reuse object
-    return avatarIconDimensionsVal;
-}
-
-function currentOverlayIconForAvatar(QUuid) {
-    if (avatarsData[QUuid] != undefined) {
-        return avatarsData[QUuid].icon;
-    } else {
-        return null;
-    }
-}
-
-function currentOverlayNameForAvatar(QUuid) {
-    if (avatarsData[QUuid] != undefined) {
-        return avatarsData[QUuid].name;
-    } else {
-        return null;
-    }
-}
-
-function saveAvatarData(QUuid) {
-    if (QUuid == null)
-        return;
-    var avat = AvatarList.getAvatar(QUuid);
-    printd("avatar added save avatar " + QUuid);
-
-    if (!avat)
-        return;
-
-    if (avatarsData[QUuid] != undefined) {
-        avatarsData[QUuid].position = avat.position;
-    } else {
-        var avatarIcon = Overlays.addOverlay("circle3d", {
-            color: uniqueColor.convertHexToRGB(uniqueColor.getColor(QUuid)),
-            dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
-            rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
-            innerRadius: 1.8,
-            outerRadius: 2,
-            isSolid: true,
-            visible: false
-        });
-
-        var needRefresh = !avat || !avat.displayName;
-        var displayName = avat && avat.displayName ? avat.displayName
-                : "Unknown";
-        var textWidth = displayName.length * AVATAR_DISPLAY_NAME_CHAR_WIDTH;
-        var avatarName = Overlays.addOverlay("text", {
-            width: textWidth,
-            height: AVATAR_DISPLAY_NAME_HEIGHT,
-            color: { red: 255, green: 255, blue: 255},
-            backgroundAlpha: 0.0,
-            textRaiseColor: { red: 0, green: 0, blue: 0},
-            font: {size: AVATAR_DISPLAY_NAME_FONT_SIZE, bold: true},
-            visible: false,
-            text: displayName,
-            textAlignCenter: true
-        });
-        avatarsIcons.push(avatarIcon);
-        avatarsNames.push(avatarName);
-        avatarsData[QUuid] = {
-            position : avat.position,
-            icon : avatarIcon,
-            name : avatarName,
-            textWidth : textWidth,
-            needRefresh : needRefresh
-        };
-    }
-}
-
-function removeAvatarData(QUuid) {
-    if (QUuid == null)
-        return;
-
-    var itsOverlay = currentOverlayIconForAvatar(QUuid);
-    if (itsOverlay != null) {
-        Overlays.deleteOverlay(itsOverlay);
-    }
-    var itsNameOverlay = currentOverlayNameForAvatar(QUuid);
-    if (itsNameOverlay != null) {
-        Overlays.deleteOverlay(itsNameOverlay);
-    }
-
-    var idx = avatarsIcons.indexOf(itsOverlay);
-    avatarsIcons.splice(idx, 1);
-    idx = avatarsNames.indexOf(itsNameOverlay);
-    avatarsNames.splice(idx, 1);
-
-    delete avatarsData[QUuid];
-}
-
-function saveAllOthersAvatarsData() {
-    var avatarIds = AvatarList.getAvatarIdentifiers();
-    var len = avatarIds.length;
-    for (var i = 0; i < len; i++) {
-        if (avatarIds[i]) {
-            saveAvatarData(avatarIds[i]);
-        }
-    }
-}
-
-function avatarAdded(QUuid) {
-    printd("avatar added " + QUuid);// + " at " +
-                                    // JSON.stringify(AvatarList.getAvatar(QUuid).position));
-    saveAvatarData(QUuid);
-}
-
-function avatarRemoved(QUuid) {
-    printd("avatar removed " + QUuid);
-    removeAvatarData(QUuid);
-}
-
-/*******************************************************************************
- * Avatar Icon/Markers rendering
- ******************************************************************************/
-var myAvatarIcon;
-var myAvatarName;
-function distanceForCameraHeight(h) {
-    if (h < 30) return 1;
-    if (h < 40) return 2;
-    if (h < 50) return 2.5;
-    return 5;
-}
-function renderMyAvatarIcon() {
-    var commonY = Camera.position.y - distanceForCameraHeight(Camera.position.y);
-    var iconPos = findLineToHeightIntersectionCoords(   MyAvatar.position.x,
-                                                        MyAvatar.position.y + RADAR_ICONS_APPARENT_DISTANCE_TO_AVATAR_BASE,
-                                                        MyAvatar.position.z,
-                                                        Camera.position.x, Camera.position.y, Camera.position.z,
-                                                        commonY);
-    if (!iconPos) { printd("avatarmy icon pos null"); return;}
-    var iconDimensions = avatarIconPlaneDimensions();
-
-    var avatarPos = MyAvatar.position;
-    var cameraPos = Camera.position;
-    var borderPoints = [
-            computePointAtPlaneY(0, 0, commonY),
-            computePointAtPlaneY(Window.innerWidth, Window.innerHeight, commonY) ];
-
-    var p1 = findLineToHeightIntersectionCoords(avatarPos.x, avatarPos.y,
-            avatarPos.z, cameraPos.x, cameraPos.y, cameraPos.z, commonY);
-    var x = (p1.x - borderPoints[0].x) * (Window.innerWidth)
-            / (borderPoints[1].x - borderPoints[0].x);
-    var y = (p1.z - borderPoints[0].z) * (Window.innerHeight)
-            / (borderPoints[1].z - borderPoints[0].z);
-
-    if (!myAvatarIcon && MyAvatar.SELF_ID) {
-       myAvatarIcon =  Overlays.addOverlay("circle3d", {
-            color: uniqueColor.convertHexToRGB(uniqueColor.getColor(MyAvatar.SELF_ID)),
-            dimensions: ICON_ENTITY_DEFAULT_DIMENSIONS,
-            rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
-            innerRadius: 1.8,
-            outerRadius: 2,
-            isSolid: true,
-            visible: false
-        });
-    }
-
-    if (!myAvatarName) {
-        myAvatarName = Overlays.addOverlay("text", {
-                        width: 100,
-                        height: AVATAR_DISPLAY_NAME_HEIGHT,
-                        textAlignCenter: true,
-                        color: { red: 255, green: 255, blue: 255},
-                        backgroundAlpha: 0.0,
-                        font: {size: AVATAR_DISPLAY_NAME_FONT_SIZE, bold: true},
-                        textRaiseColor: { red: 0, green: 0, blue: 0},
-                        visible: false,
-                        text: "Me"
-                       });
-    }
-
-    if (myAvatarIcon) {
-        Overlays.editOverlay(myAvatarIcon, {
-            visible : true,
-            dimensions : iconDimensions,
-            position : iconPos
-        });
-
-    }
-    var textSize = (14 + (iconDimensions.y - 0.03) * 15 / 0.06);
-
-    Overlays.editOverlay(myAvatarName, {
-        visible : true,
-        x : x - 18 + (iconDimensions.y - 0.03) * 2 / 0.06,
-        y : y + iconDimensions.y * 550,
-        font : {
-            size : textSize,
-            bold : true
-        },
-    });
-
-}
-
-function hideAllAvatarIcons() {
-    var len = avatarsIcons.length;
-    for (var i = 0; i < len; i++) {
-        Overlays.editOverlay(avatarsIcons[i], {
-            visible : false
-        });
-    }
-    len = avatarsNames.length;
-    for (var j = 0; j < len; j++) {
-        Overlays.editOverlay(avatarsNames[j], {
-            visible : false
-        });
-    }
-    if (myAvatarIcon) {
-        Overlays.editOverlay(myAvatarIcon, {
-            visible : false
-        });
-    }
-    Overlays.editOverlay(myAvatarName, {
-        visible : false
-    })
-}
-
-function renderAllOthersAvatarIcons() {
-    var avatarPos;
-    var iconDimensions = avatarIconPlaneDimensions();
-    var commonY = Camera.position.y - distanceForCameraHeight(Camera.position.y);
-    var borderPoints = [
-            computePointAtPlaneY(0, 0, commonY),
-            computePointAtPlaneY(Window.innerWidth, Window.innerHeight, commonY) ];
-
-    for ( var QUuid in avatarsData) {
-        if (avatarsData.hasOwnProperty(QUuid)) {
-            if (AvatarList.getAvatar(QUuid) != null) {
-                avatarPos = AvatarList.getAvatar(QUuid).position;
-
-                var cameraPos = Camera.position;
-                var p1 = findLineToHeightIntersectionCoords(avatarPos.x, avatarPos.y, avatarPos.z, 
-                                                    cameraPos.x, cameraPos.y, cameraPos.z,
-                                                    commonY);
-
-                var x = (p1.x - borderPoints[0].x) * (Window.innerWidth) / (borderPoints[1].x - borderPoints[0].x);
-                var y = (p1.z - borderPoints[0].z) * (Window.innerHeight) / (borderPoints[1].z - borderPoints[0].z);
-
-                if (avatarsData[QUuid].icon != undefined) {
-                    var iconPos = findLineToHeightIntersectionCoords(   avatarPos.x, avatarPos.y + RADAR_ICONS_APPARENT_DISTANCE_TO_AVATAR_BASE, avatarPos.z,
-                                                                        Camera.position.x, Camera.position.y, Camera.position.z,
-                                                                        commonY);
-                    if (!iconPos) { print ("avatar icon pos bad for " + QUuid); continue; }
-                    if (avatarsData[QUuid].needRefresh) {
-                        var avat = AvatarList.getAvatar(QUuid);
-                        if (avat && avat.displayName) {
-                            Overlays.editOverlay(avatarsData[QUuid].name, {
-                                width : avat.displayName.length
-                                        * AVATAR_DISPLAY_NAME_CHAR_WIDTH,
-                                text : avat.displayName,
-                                textAlignCenter : true
-                            });
-                            avatarsData[QUuid].needRefresh = false;
-                        }
-                    }
-                    var textSize = (14 + (iconDimensions.y - 0.03) * 15 / 0.06);
-                    Overlays.editOverlay(avatarsData[QUuid].icon, {
-                        visible : true,
-                        dimensions : iconDimensions,
-                        position : iconPos
-                    });
-                    Overlays.editOverlay(avatarsData[QUuid].name, {
-                        visible : true,
-                        x : x - avatarsData[QUuid].textWidth * 0.5,
-                        y : y + iconDimensions.y * 550,
-                        font : {
-                            size : textSize,
-                            bold : true
-                        }
-                    });
-                }
-            }
-        }
-    }
-}
-
-var ICON_ENTITY_DEFAULT_DIMENSIONS = {
-    x : 0.10,
-    y : 0.00001,
-    z : 0.10
-};
-
-
-function teleportIconModelDimensions(y) {
-    var teleportModelDimensions = ICON_ENTITY_DEFAULT_DIMENSIONS;
-    var xz = -0.002831 * (radarHeight - y) + 0.1;
-    teleportModelDimensions.x = xz;
-    teleportModelDimensions.z = xz;
-    // reuse object
-    return teleportModelDimensions;
-}
-
-/*******************************************************************************
- * 
- ******************************************************************************/
-
-function startRadar() {
-    printd("avatar added my avatar is  " + MyAvatar.sessionUUID);
-    saveAllOthersAvatarsData();
-    Camera.mode = "independent";
-
-    initCameraOverMyAvatar();
-
-    Camera.orientation = Quat.fromPitchYawRollDegrees(-90, 0, 0);
-    radar = true;
-
-    Controller.setVPadEnabled(false); // this was done before in CompositeExtra in the DisplayPlugin (Checking for camera not independent, not radar mode)
-
-    connectRadarModeEvents();
-}
-
-function endRadar() {
-    printd("-- endRadar");
-    Camera.mode = "third person";
-    radar = false;
-
-    Controller.setVPadEnabled(true);
-
-    disconnectRadarModeEvents();
-    hideAllAvatarIcons();
-}
-
-function onRadarModeClicked() {
-    startRadar();
-}
-
-function onMyViewModeClicked() {
-    endRadar();
-}
-
-radarModeInterface.startRadarMode = function() {
-    startRadar();
-};
-
-radarModeInterface.endRadarMode = function() {
-    endRadar();
-};
-
-radarModeInterface.init = function() {
-    init();
-}
-
-radarModeInterface.setUniqueColor = function(c) {
-    uniqueColor = c;
-};
-
-module.exports = radarModeInterface;
-
-function updateRadar() {
-    // Update avatar icons
-    if (startedDraggingCamera) {
-        hideAllAvatarIcons();
-        startedDraggingCamera = false;
-    } else if (!draggingCamera) {
-        renderMyAvatarIcon();
-        renderAllOthersAvatarIcons();
-    }
-}
-
-function valueIfDefined(value) {
-    return value !== undefined ? value : "";
-}
-
-function connectRadarModeEvents() {
-    Script.update.connect(updateRadar); // 60Hz loop
-    Controller.keyPressEvent.connect(keyPressEvent);
-    Controller.touchUpdateEvent.connect(touchUpdate);
-    Window.domainChanged.connect(domainChanged);
-    MyAvatar.positionGoneTo.connect(positionGoneTo);
-}
-
-function initCameraOverMyAvatar() {
-   radarHeight = MyAvatar.position.y + RADAR_HEIGHT_INIT_DELTA;
-   Camera.position = {
-        x : MyAvatar.position.x,
-        y : radarHeight,
-        z : MyAvatar.position.z
-    };
-}
-
-function domainChanged() {
-    initCameraOverMyAvatar();
-}
-
-function positionGoneTo() {
-    Camera.position = {
-            x : MyAvatar.position.x,
-            y : radarHeight,
-            z : MyAvatar.position.z
-        };
-}
-
-function disconnectRadarModeEvents() {
-    Script.update.disconnect(updateRadar);
-    Controller.keyPressEvent.disconnect(keyPressEvent);
-    Controller.touchUpdateEvent.disconnect(touchUpdate);
-    MyAvatar.positionGoneTo.disconnect(positionGoneTo);
-    Window.domainChanged.disconnect(domainChanged);
-}
-
-function init() {
-    tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-
-    Controller.touchBeginEvent.connect(touchBegin);
-    Controller.touchEndEvent.connect(touchEnd);
-
-    AvatarList.avatarAddedEvent.connect(avatarAdded);
-    AvatarList.avatarRemovedEvent.connect(avatarRemoved);
-}
diff --git a/scripts/system/+android/stats.js b/scripts/system/+android/stats.js
deleted file mode 100644
index 0731684291..0000000000
--- a/scripts/system/+android/stats.js
+++ /dev/null
@@ -1,39 +0,0 @@
-"use strict";
-//
-//  stats.js
-//  scripts/system/
-//
-//  Created by Sam Gondelman on 3/14/18
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function() { // BEGIN LOCAL_SCOPE
-
-var statsbar;
-var statsButton;
-
-function init() {
-    statsbar = new QmlFragment({
-        qml: "hifi/StatsBar.qml"
-    });
-
-    statsButton = statsbar.addButton({
-        icon: "icons/stats.svg",
-        activeIcon: "icons/stats.svg",
-        textSize: 45,
-        bgOpacity: 0.0,
-        activeBgOpacity: 0.0,
-        bgColor: "#FFFFFF",
-        text: "STATS"
-    });
-    statsButton.clicked.connect(function() {
-        Menu.triggerOption("Show Statistics");
-    });
-}
-
-init();
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/+android/touchscreenvirtualpad.js b/scripts/system/+android/touchscreenvirtualpad.js
deleted file mode 100644
index d48b623e03..0000000000
--- a/scripts/system/+android/touchscreenvirtualpad.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict";
-//
-//  touchscreenvirtualpad.js
-//  scripts/system/
-//
-//  Created by Gabriel Calero & Cristian Duarte on Jan 16, 2018
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-(function() { // BEGIN LOCAL_SCOPE
-
-function init() {
-	Controller.setVPadEnabled(true);
-	Controller.setVPadHidden(false);
-}
-
-init();
-
-}()); // END LOCAL_SCOPE
diff --git a/scripts/system/+android/uniqueColor.js b/scripts/system/+android/uniqueColor.js
deleted file mode 100644
index a2741642d2..0000000000
--- a/scripts/system/+android/uniqueColor.js
+++ /dev/null
@@ -1,54 +0,0 @@
-"use strict";
-//
-//  uniqueColor.js
-//  scripts/system/
-//
-//  Created by Gabriel Calero & Cristian Duarte on 17 Oct 2017
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-var colorsMap = {};
-var colorsCount = 0;
-                            // 'red',  'orange',  'yellow',  'green',    'cyan',    'blue',   'magenta'
-var baseColors = [ '#EB3345', '#F0851F', '#FFCD29', '#94C338', '#11A6C5', '#294C9F', '#C01D84' ];
-
-function getNextColor(n) {
-    var N = baseColors.length;
-    /*if (n < baseColors.length) {
-        return baseColors[n];
-    } else {
-        var baseColor = baseColors[n % N];
-        var d = (n / N) % 10;
-        var c2 = "" + Qt.lighter(baseColor, 1 + d / 10);
-        return c2;
-    }*/
-    return baseColors[n%N];
-}
-
-function getColorForId(uuid) {
-    if (colorsMap == undefined) {
-        colorsMap = {};
-    }
-    if (!colorsMap.hasOwnProperty(uuid)) {
-        colorsMap[uuid] = getNextColor(colorsCount);
-        colorsCount = colorsCount + 1;
-    }
-    return colorsMap[uuid];
-}
-
-module.exports = {
-    getColor: function(id) {
-        return getColorForId(id);
-    },
-    convertHexToRGB: function(hex) {
-    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-        return result ? {
-            red: parseInt(result[1], 16),
-            green: parseInt(result[2], 16),
-            blue: parseInt(result[3], 16)
-        } : null;
-    }
-};
diff --git a/scripts/system/goto.js b/scripts/system/goto.js
index 5cc5bad844..04562bab8d 100644
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@@ -14,52 +14,23 @@
 
 (function() { // BEGIN LOCAL_SCOPE
 
-var button;
-var buttonName = "GOTO";
-var toolBar = null;
-var tablet = null;
-var onGotoScreen = false;
-function onAddressBarShown(visible) {
-    button.editProperties({isActive: visible});
-}
-
-function onClicked(){
-    DialogsManager.toggleAddressBar();
-    onGotoScreen = !onGotoScreen;
-}
-
-if (Settings.getValue("HUDUIEnabled")) {
-    toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system");
-    button = toolBar.addButton({
-        objectName: buttonName,
-        imageURL: Script.resolvePath("assets/images/tools/directory.svg"),
-        visible: true,
-        alpha: 0.9
-    });
-} else {
+function addGotoButton(destination) {
     tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
     button = tablet.addButton({
         icon: "icons/tablet-icons/goto-i.svg",
         activeIcon: "icons/tablet-icons/goto-a.svg",
-        text: buttonName
+        text: destination
+    });
+    var buttonDestination = destination;
+    button.clicked.connect(function() {
+        Window.location = "hifi://" + buttonDestination;
+    });
+    Script.scriptEnding.connect(function () {
+        tablet.removeButton(button);
     });
 }
 
-button.clicked.connect(onClicked);
-DialogsManager.addressBarShown.connect(onAddressBarShown);
-
-Script.scriptEnding.connect(function () {
-    if (onGotoScreen) {
-        DialogsManager.toggleAddressBar();
-    }
-    button.clicked.disconnect(onClicked);
-    if (tablet) {
-        tablet.removeButton(button);
-    }
-    if (toolBar) {
-        toolBar.removeButton(buttonName);
-    }
-    DialogsManager.addressBarShown.disconnect(onAddressBarShown);
-});
+addGotoButton("hell")
+addGotoButton("dev-mobile")
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/html/js/miniTablet.js b/scripts/system/html/js/miniTablet.js
index c48201cef5..21ad3138cd 100644
--- a/scripts/system/html/js/miniTablet.js
+++ b/scripts/system/html/js/miniTablet.js
@@ -135,18 +135,18 @@
         gotoImage = document.getElementById("goto-img");
         expandButton = document.getElementById("expand");
 
-        connectEventBridge();
-
-        document.body.addEventListener("mouseenter", onBodyHover, false);
-        document.body.addEventListener("mouseleave", onBodyUnhover, false);
-
-        muteButton.addEventListener("mouseenter", onButtonHover, false);
-        gotoButton.addEventListener("mouseenter", onButtonHover, false);
-        expandButton.addEventListener("mouseenter", onButtonHover, false);
-        muteButton.addEventListener("click", onMuteButtonClick, true);
-        gotoButton.addEventListener("click", onGotoButtonClick, true);
-        expandButton.addEventListener("click", onExpandButtonClick, true);
-
+       connectEventBridge();
+     
+       document.body.addEventListener("mouseenter", onBodyHover, false);
+       document.body.addEventListener("mouseleave", onBodyUnhover, false);
+     
+       muteButton.addEventListener("mouseenter", onButtonHover, false);
+       gotoButton.addEventListener("mouseenter", onButtonHover, false);
+       expandButton.addEventListener("mouseenter", onButtonHover, false);
+       muteButton.addEventListener("click", onMuteButtonClick, true);
+       gotoButton.addEventListener("click", onGotoButtonClick, true);
+       expandButton.addEventListener("click", onExpandButtonClick, true);
+    
         document.body.onunload = function () {
             onUnload();
         };
diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js
index 780dacf85e..708b3c0c8d 100644
--- a/scripts/system/miniTablet.js
+++ b/scripts/system/miniTablet.js
@@ -44,11 +44,12 @@
             return;
         }
         print("DEBUG: " + message);
+
     }
 
     function error(message) {
         print("ERROR: " + message);
-    }
+	}
 
     function handJointName(hand) {
         var jointName;
@@ -126,7 +127,7 @@
             miniOverlayObject = null,
 
             // Button icons.
-            MUTE_ON_ICON = Script.resourcesPath() + "icons/tablet-icons/mic-mute-a.svg",
+            MUTE_ON_ICON =Script.resourcesPath() + "icons/tablet-icons/mic-mute-a.svg",
             MUTE_OFF_ICON = Script.resourcesPath() + "icons/tablet-icons/mic-unmute-i.svg",
             GOTO_ICON = Script.resourcesPath() + "icons/tablet-icons/goto-i.svg",
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 886f15ded4..3b5c7c2b38 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -31,6 +31,7 @@ if (BUILD_TOOLS)
         atp-client
         oven
         nitpick
+        webview
     )
 
     foreach(TOOL ${ALL_TOOLS})
diff --git a/tools/gpu-frame-player/CMakeLists.txt b/tools/gpu-frame-player/CMakeLists.txt
index bd50839f9c..5914999757 100644
--- a/tools/gpu-frame-player/CMakeLists.txt
+++ b/tools/gpu-frame-player/CMakeLists.txt
@@ -4,10 +4,9 @@ set(TARGET_NAME gpu-frame-player)
 setup_memory_debugger()
 setup_hifi_project(Gui Widgets)
 
-
 # link in the shared libraries
 link_hifi_libraries(
-    shared ktx shaders gpu 
+    shared ktx shaders gpu
 #    vk gpu-vk 
     gl ${PLATFORM_GL_BACKEND}
 )
diff --git a/tools/gpu-frame-player/src/PlayerWindow.cpp b/tools/gpu-frame-player/src/PlayerWindow.cpp
index 7fbf43139f..8146310d52 100644
--- a/tools/gpu-frame-player/src/PlayerWindow.cpp
+++ b/tools/gpu-frame-player/src/PlayerWindow.cpp
@@ -64,11 +64,37 @@ void PlayerWindow::loadFrame() {
 }
 
 void PlayerWindow::keyPressEvent(QKeyEvent* event) {
+    bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
+    float moveScale = isShifted ? 10.0f : 1.0f;
     switch (event->key()) {
         case Qt::Key_F1:
             loadFrame();
             return;
 
+        case Qt::Key_W:
+            _renderThread.move(vec3{ 0, 0, -0.1f } * moveScale);
+            return;
+
+        case Qt::Key_S:
+            _renderThread.move(vec3{ 0, 0, 0.1f } * moveScale);
+            return;
+
+        case Qt::Key_A:
+            _renderThread.move(vec3{ -0.1f, 0, 0 } * moveScale);
+            return;
+
+        case Qt::Key_D:
+            _renderThread.move(vec3{ 0.1f, 0, 0 } * moveScale);
+            return;
+
+        case Qt::Key_E:
+            _renderThread.move(vec3{ 0, 0.1f, 0 } * moveScale);
+            return;
+
+        case Qt::Key_F:
+            _renderThread.move(vec3{ 0, -0.1f, 0 } * moveScale);
+            return;
+
         default:
             break;
     }
@@ -90,6 +116,24 @@ void PlayerWindow::textureLoader(const std::string& filename, const gpu::Texture
 void PlayerWindow::loadFrame(const QString& path) {
     auto frame = gpu::readFrame(path.toStdString(), _renderThread._externalTexture, &PlayerWindow::textureLoader);
     if (frame) {
+
+        {
+            for (auto& batch : frame->batches) {
+                size_t commandCount = batch->_commands.size();
+                for (size_t i = 0; i < commandCount; ++i) {
+                    const auto& command = batch->_commands[i];
+                    const auto& paramOffset = batch->_commandOffsets[i];
+                    if (command == gpu::Batch::Command::COMMAND_setIndexBuffer) {
+
+                    } else if (command == gpu::Batch::Command::COMMAND_drawIndexed) {
+
+                    } else if (command == gpu::Batch::Command::COMMAND_drawIndexedInstanced) {
+
+                    }
+                }
+            }
+        }
+
         _renderThread.submitFrame(frame);
         if (!_renderThread.isThreaded()) {
             _renderThread.process();
@@ -104,7 +148,5 @@ void PlayerWindow::loadFrame(const QString& path) {
         while (glm::any(glm::greaterThan(size, maxSize))) {
             size /= 2;
         }
-        resize(size.x, size.y);
     }
-    _renderThread.submitFrame(frame);
 }
diff --git a/tools/gpu-frame-player/src/RenderThread.cpp b/tools/gpu-frame-player/src/RenderThread.cpp
index 608e8f250f..a9dcf8900f 100644
--- a/tools/gpu-frame-player/src/RenderThread.cpp
+++ b/tools/gpu-frame-player/src/RenderThread.cpp
@@ -20,6 +20,11 @@ void RenderThread::resize(const QSize& newSize) {
     _pendingSize.push(newSize);
 }
 
+void RenderThread::move(const glm::vec3& v) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    _correction = glm::inverse(glm::translate(mat4(), v)) * _correction;
+}
+
 void RenderThread::initialize(QWindow* window) {
     std::unique_lock<std::mutex> lock(_frameLock);
     setObjectName("RenderThread");
@@ -105,6 +110,13 @@ void RenderThread::renderFrame(gpu::FramePointer& frame) {
 #ifdef USE_GL
     _context.makeCurrent();
 #endif
+    if (_correction != glm::mat4()) {
+       std::unique_lock<std::mutex> lock(_frameLock);
+       if (_correction != glm::mat4()) {
+           _backend->setCameraCorrection(_correction, _activeFrame->view);
+           //_prevRenderView = _correction * _activeFrame->view;
+       }
+    }
     _backend->recycle();
     _backend->syncCache();
 
@@ -139,18 +151,29 @@ void RenderThread::renderFrame(gpu::FramePointer& frame) {
     using namespace vks::debug::marker;
     beginRegion(commandBuffer, "executeFrame", glm::vec4{ 1, 1, 1, 1 });
 #endif
+    auto& glbackend = (gpu::gl::GLBackend&)(*_backend);
+    glm::uvec2 fboSize{ frame->framebuffer->getWidth(), frame->framebuffer->getHeight() };
+    auto fbo = glbackend.getFramebufferID(frame->framebuffer);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
+    glClearColor(0, 0, 0, 1);
+    glClearDepth(0);
+    glClear(GL_DEPTH_BUFFER_BIT);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
 
+    //_gpuContext->enableStereo(true);
     if (frame && !frame->batches.empty()) {
         _gpuContext->executeFrame(frame);
     }
 
 #ifdef USE_GL
-    auto& glbackend = (gpu::gl::GLBackend&)(*_backend);
-    glm::uvec2 fboSize{ frame->framebuffer->getWidth(), frame->framebuffer->getHeight() };
-    auto fbo = glbackend.getFramebufferID(frame->framebuffer);
-    glDisable(GL_FRAMEBUFFER_SRGB);
-    glBlitNamedFramebuffer(fbo, 0, 0, 0, fboSize.x, fboSize.y, 0, 0, windowSize.width(), windowSize.height(),
-                           GL_COLOR_BUFFER_BIT, GL_NEAREST);
+    //glDisable(GL_FRAMEBUFFER_SRGB);
+    //glClear(GL_COLOR_BUFFER_BIT);
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+    glBlitFramebuffer(
+        0, 0, fboSize.x, fboSize.y, 
+        0, 0, windowSize.width(), windowSize.height(),
+        GL_COLOR_BUFFER_BIT, GL_NEAREST);
 
     (void)CHECK_GL_ERROR();
     _context.swapBuffers();
@@ -183,11 +206,11 @@ bool RenderThread::process() {
         pendingFrames.swap(_pendingFrames);
         pendingSize.swap(_pendingSize);
     }
-
+    
     while (!pendingFrames.empty()) {
         _activeFrame = pendingFrames.front();
-        _gpuContext->consumeFrameUpdates(_activeFrame);
         pendingFrames.pop();
+        _gpuContext->consumeFrameUpdates(_activeFrame);
     }
 
     while (!pendingSize.empty()) {
diff --git a/tools/gpu-frame-player/src/RenderThread.h b/tools/gpu-frame-player/src/RenderThread.h
index 7312fece6c..09eef56623 100644
--- a/tools/gpu-frame-player/src/RenderThread.h
+++ b/tools/gpu-frame-player/src/RenderThread.h
@@ -55,6 +55,8 @@ public:
     std::queue<QSize> _pendingSize;
     gpu::FramePointer _activeFrame;
     uint32_t _externalTexture{ 0 };
+    void move(const glm::vec3& v);
+    glm::mat4 _correction;
 
 
     void resize(const QSize& newSize);
diff --git a/tools/noramlizeFrame.py b/tools/noramlizeFrame.py
new file mode 100644
index 0000000000..f1012f6428
--- /dev/null
+++ b/tools/noramlizeFrame.py
@@ -0,0 +1,62 @@
+import os
+import json
+import shutil
+import sys
+
+def scriptRelative(*paths):
+    scriptdir = os.path.dirname(os.path.realpath(sys.argv[0]))
+    result = os.path.join(scriptdir, *paths)
+    result = os.path.realpath(result)
+    result = os.path.normcase(result)
+    return result
+
+
+
+class FrameProcessor:
+    def __init__(self, filename):
+        self.filename = filename
+        dir, name = os.path.split(self.filename)
+        self.dir = dir
+        self.ktxDir = os.path.join(self.dir, 'ktx')
+        os.makedirs(self.ktxDir, exist_ok=True)
+        self.resDir = scriptRelative("../interface/resources")
+
+        if (name.endswith(".json")):
+            self.name = name[0:-5]
+        else:
+            self.name = name
+            self.filename = self.filename + '.json'
+
+        with open(self.filename, 'r') as f:
+            self.json = json.load(f)
+
+
+    def processKtx(self, texture):
+        if texture is None: return
+        if not 'ktxFile' in texture: return
+        sourceKtx = texture['ktxFile']
+        if sourceKtx.startswith(':'):
+            sourceKtx = sourceKtx[1:]
+            while sourceKtx.startswith('/'):
+                sourceKtx = sourceKtx[1:]
+            sourceKtx = os.path.join(self.resDir, sourceKtx)
+        sourceKtxDir, sourceKtxName = os.path.split(sourceKtx)
+        destKtx = os.path.join(self.ktxDir, sourceKtxName)
+        if not os.path.isfile(destKtx):
+            shutil.copy(sourceKtx, destKtx)
+        newValue = 'ktx/' + sourceKtxName
+        texture['ktxFile'] = newValue
+        
+
+    def process(self):
+        for texture in self.json['textures']:
+            self.processKtx(texture)
+
+        with open(self.filename, 'w') as f:
+            json.dump(self.json, f, indent=2)
+
+fp = FrameProcessor("D:/Frames/20190114_1629.json")
+fp.process()
+
+
+#C:\Users\bdavi\git\hifi\interface\resources\meshes
\ No newline at end of file
diff --git a/tools/webview/CMakeLists.txt b/tools/webview/CMakeLists.txt
new file mode 100644
index 0000000000..99af12fe07
--- /dev/null
+++ b/tools/webview/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(TARGET_NAME webview)
+setup_hifi_project(Gui WebView)
+link_hifi_libraries(shared ktx gl qml)
+target_opengl()
+
+set(EXTRA_DEPLOY_OPTIONS "--qmldir  \"${PROJECT_SOURCE_DIR}/src\"")
+package_libraries_for_deployment()
\ No newline at end of file
diff --git a/tools/webview/src/PlayerWindow.cpp b/tools/webview/src/PlayerWindow.cpp
new file mode 100644
index 0000000000..67816da671
--- /dev/null
+++ b/tools/webview/src/PlayerWindow.cpp
@@ -0,0 +1,23 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "PlayerWindow.h"
+#include "gl/GLHelpers.h"
+
+PlayerWindow::PlayerWindow() {
+    installEventFilter(this);
+    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
+    setSurfaceType(QSurface::OpenGLSurface);
+    setFormat(getDefaultOpenGLSurfaceFormat());
+    create();
+    resize({ 800, 600 });
+    show();
+    QCoreApplication::processEvents();
+    _renderThread.initialize(this);
+}
+
diff --git a/tools/webview/src/PlayerWindow.h b/tools/webview/src/PlayerWindow.h
new file mode 100644
index 0000000000..5aa207b132
--- /dev/null
+++ b/tools/webview/src/PlayerWindow.h
@@ -0,0 +1,27 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+#include <QtGui/QWindow>
+#include <QtCore/QSettings>
+
+#include "RenderThread.h"
+
+// Create a simple OpenGL window that renders text in various ways
+class PlayerWindow : public QWindow {
+public:
+    PlayerWindow();
+    virtual ~PlayerWindow() = default;
+
+protected:
+    //bool eventFilter(QObject* obj, QEvent* event) override;
+    //void keyPressEvent(QKeyEvent* event) override;
+
+private:
+    RenderThread _renderThread;
+};
diff --git a/tools/webview/src/RenderThread.cpp b/tools/webview/src/RenderThread.cpp
new file mode 100644
index 0000000000..05a39ca841
--- /dev/null
+++ b/tools/webview/src/RenderThread.cpp
@@ -0,0 +1,95 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "RenderThread.h"
+
+#include <mutex>
+
+#include <QtGui/QWindow>
+
+#include <gl/GLHelpers.h>
+#include <GLMHelpers.h>
+
+#define MARGIN 48
+
+void RenderThread::initialize(QWindow* window) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    setObjectName("RenderThread");
+    Parent::initialize();
+
+    _thread->setObjectName("RenderThread");
+    _size = window->size();
+
+    _glContext.setWindow(window);
+    _glContext.create();
+    _glContext.makeCurrent();
+
+    gl::setSwapInterval(0);
+    glGenFramebuffers(1, &_readFbo);
+    OffscreenSurface::setSharedContext(_glContext.qglContext());
+
+    // GPU library init
+    _glContext.doneCurrent();
+    _glContext.moveToThread(_thread);
+
+    _offscreen = std::make_shared<OffscreenSurface>();
+    _offscreen->resize({ _size.width() - (MARGIN * 2), _size.height() - (MARGIN * 2)});
+    _offscreen->load(QUrl("qrc://qml/main.qml"));
+}
+
+void RenderThread::releaseTexture() {
+    if (_uiTexture != 0) {
+        auto readFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
+        glFlush();
+        CHECK_GL_ERROR();
+        _discardLambda(_uiTexture, readFence);
+        _uiTexture = 0;
+    }
+}
+
+void RenderThread::setup() {
+    // Wait until the context has been moved to this thread
+    { std::unique_lock<std::mutex> lock(_frameLock); }
+    _glContext.makeCurrent();
+}
+
+void RenderThread::shutdown() {
+    releaseTexture();
+    _glContext.doneCurrent();
+}
+
+bool RenderThread::process() {
+    float now = secTimestampNow();
+    float red = fabsf(sinf(now * PI));
+    _glContext.makeCurrent();
+    {
+        OffscreenSurface::TextureAndFence newTextureAndFence;
+        if (_offscreen->fetchTexture(newTextureAndFence)) {
+            releaseTexture();
+            const auto& newTexture = newTextureAndFence.first;
+            GLsync writeFence = static_cast<GLsync>(newTextureAndFence.second);
+            _uiTexture = newTexture;
+            glWaitSync(writeFence, 0, GL_TIMEOUT_IGNORED);
+            glDeleteSync(writeFence);
+        }
+    }
+
+    glClearColor(1, red, 1, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+    if (_uiTexture != 0) {
+        auto uiSize = _offscreen->size();
+        glBindFramebuffer(GL_READ_FRAMEBUFFER, _readFbo);
+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _uiTexture, 0);
+        glBlitFramebuffer(
+            0, 0, uiSize.width(), uiSize.height(),
+            MARGIN, MARGIN, uiSize.width()  + MARGIN, uiSize.height() + MARGIN,
+            GL_COLOR_BUFFER_BIT, GL_NEAREST);
+    }
+    _glContext.swapBuffers();
+    return true;
+}
diff --git a/tools/webview/src/RenderThread.h b/tools/webview/src/RenderThread.h
new file mode 100644
index 0000000000..e04715f7ca
--- /dev/null
+++ b/tools/webview/src/RenderThread.h
@@ -0,0 +1,42 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+
+#include <QtCore/QElapsedTimer>
+
+#include <GenericThread.h>
+#include <shared/RateCounter.h>
+#include <gl/Config.h>
+#include <gl/Context.h>
+#include <qml/OffscreenSurface.h>
+
+class RenderThread : public GenericThread {
+    using Parent = GenericThread;
+    using OffscreenSurface = hifi::qml::OffscreenSurface;
+    using OffscreenPtr = std::shared_ptr<OffscreenSurface>;
+    using DiscardLambda = std::function<void(uint32_t, void*)>;
+public:
+    gl::Context _glContext;
+    std::mutex _mutex;
+    std::atomic<size_t> _presentCount{ 0 };
+    std::mutex _frameLock;
+    OffscreenPtr _offscreen;
+    QSize _size;
+    DiscardLambda _discardLambda { OffscreenSurface::getDiscardLambda() };
+    GLuint _readFbo { 0 };
+    GLuint _uiTexture { 0 };
+
+    void setup() override;
+    bool process() override;
+    void shutdown() override;
+    void initialize(QWindow* window);
+
+private:
+    void releaseTexture();
+};
diff --git a/tools/webview/src/main.cpp b/tools/webview/src/main.cpp
new file mode 100644
index 0000000000..6bc92b89b0
--- /dev/null
+++ b/tools/webview/src/main.cpp
@@ -0,0 +1,31 @@
+
+//
+//  Created by Bradley Austin Davis on 2018/11/22
+//  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 <QtGui/QGuiApplication>
+
+#include <Trace.h>
+
+#include "PlayerWindow.h"
+
+void initWebView();
+
+int main(int argc, char** argv) {
+    setupHifiApplication("uiApp");
+    QGuiApplication app(argc, argv);
+    initWebView();
+    {
+        DependencyManager::set<tracing::Tracer>();
+        PlayerWindow window;
+        app.exec();
+    }
+    return 0;
+}
+
+
diff --git a/tools/webview/src/main.qml b/tools/webview/src/main.qml
new file mode 100644
index 0000000000..5d05866998
--- /dev/null
+++ b/tools/webview/src/main.qml
@@ -0,0 +1,23 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtWebView 1.1
+
+WebView {
+    url: "https://old.reddit.com"
+    width: 640; height: 480
+
+    /*
+    Rectangle {
+        id: blue
+        color: "blue"
+        anchors { margins: 48; top: parent.top; bottom: parent.bottom; left: parent.left;  }
+        width: parent.width / 3
+        ColorAnimation on color {
+            from: "yellow";
+            to: "red";
+            loops:  Animation.Infinite;
+            duration: 1000;
+        }
+    }
+    */
+}
diff --git a/tools/webview/src/mainqt.cpp b/tools/webview/src/mainqt.cpp
new file mode 100644
index 0000000000..c4c05569c0
--- /dev/null
+++ b/tools/webview/src/mainqt.cpp
@@ -0,0 +1,5 @@
+#include <QtWebView/QtWebView>
+
+void initWebView() {
+    QtWebView::initialize();
+}
\ No newline at end of file
diff --git a/tools/webview/src/resources.qrc b/tools/webview/src/resources.qrc
new file mode 100644
index 0000000000..f06d416800
--- /dev/null
+++ b/tools/webview/src/resources.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC>
+<RCC version="1.0">
+  <qresource prefix="/">
+    <file>main.qml</file>
+  </qresource>
+</RCC>
diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
index 038c53054c..b408e4f464 100644
--- a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
+++ b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
@@ -137,7 +137,7 @@
                 direction: this.firingDirection
             };
             this.createGunFireEffect(this.barrelPoint)
-            var intersection = Entities.findRayIntersection(pickRay, true);
+            var intersection = Entities.findRayIntersectionBlocking(pickRay, true);
             if (intersection.intersects) {
                 this.createEntityHitEffect(intersection.intersection);
                 if (Math.random() < this.playRichochetSoundChance) {

From f1d3fc36e569b2005879acfbb857d250c1d4e512 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 28 Jan 2019 11:19:15 -0800
Subject: [PATCH 02/58] Cleaning up pre-master merge

---
 .../apps/{ui => interface}/proguard-rules.pro |   0
 .../fragment/SignedInFragment.java            |  73 ----
 .../src/main/res/drawable/ic_launcher.xml     |   0
 ...d_button.xml => rounded_button_color1.xml} |   0
 .../src/main/res/drawable/rounded_edit.xml    |   7 -
 .../src/main/res/layout/fragment_signedin.xml |  63 ---
 android/apps/ui/CMakeLists.txt                |   7 -
 android/apps/ui/src/main/AndroidManifest.xml  |  32 --
 android/apps/ui/src/main/cpp/PlayerWindow.cpp |  22 -
 android/apps/ui/src/main/cpp/PlayerWindow.h   |  27 --
 android/apps/ui/src/main/cpp/RenderThread.cpp |  98 -----
 android/apps/ui/src/main/cpp/RenderThread.h   |  42 --
 android/apps/ui/src/main/cpp/main.cpp         |  58 ---
 android/apps/ui/src/main/cpp/main.qml         |  21 -
 android/apps/ui/src/main/cpp/mainqt.cpp       |   5 -
 android/apps/ui/src/main/cpp/resources.qrc    |   6 -
 .../java/io/highfidelity/ui/UiActivity.java   |  21 -
 .../apps/ui/src/main/res/values/strings.xml   |   3 -
 android/apps/ui/src/main/uiApp.pro            |  22 -
 android/settings.gradle                       |   4 +-
 interface/src/raypick/LaserPointer.cpp        |   6 +-
 .../raypick/LaserPointerScriptingInterface.h  |   2 +-
 interface/src/raypick/ParabolaPick.cpp        |  14 +-
 interface/src/raypick/ParabolaPointer.cpp     |   2 +-
 interface/src/raypick/PathPointer.cpp         |  12 +-
 .../src/raypick/PickScriptingInterface.cpp    |  22 +-
 .../src/raypick/PickScriptingInterface.h      | 113 +++--
 .../src/raypick/PointerScriptingInterface.h   |   9 +-
 interface/src/raypick/RayPick.cpp             |  13 +-
 .../src/raypick/RayPickScriptingInterface.h   |  10 +-
 interface/src/raypick/StylusPointer.cpp       |   2 +-
 .../src/display-plugins/DisplayPlugin.cpp     |   2 +-
 .../hmd/DebugHmdDisplayPlugin.cpp             |  13 -
 .../src/EntityTreeRenderer.cpp                |  10 +-
 .../entities/src/EntityScriptingInterface.cpp | 130 ++----
 .../entities/src/EntityScriptingInterface.h   |  95 ++--
 libraries/entities/src/EntityTree.cpp         | 408 ++++++++++--------
 libraries/entities/src/EntityTree.h           |  57 +--
 libraries/entities/src/EntityTreeElement.cpp  | 256 ++++++++---
 libraries/entities/src/EntityTreeElement.h    |  52 +--
 .../src/gpu/gles/GLESBackendOutput.cpp        |   2 +-
 .../src/input-plugins/InputPlugin.cpp         |   3 +-
 libraries/pointers/src/Pick.cpp               |   5 +-
 libraries/pointers/src/Pick.h                 |  79 +---
 libraries/pointers/src/PickCacheOptimizer.h   |   6 +-
 libraries/render-utils/src/Model.cpp          |   5 -
 libraries/render/src/render/CullTask.cpp      |  16 +-
 .../utilities/tests/entityPerfTest.js         |   8 -
 tools/gpu-frame-player/src/PlayerWindow.cpp   |  19 +-
 tools/webview/CMakeLists.txt                  |   7 -
 tools/webview/src/PlayerWindow.cpp            |  23 -
 tools/webview/src/PlayerWindow.h              |  27 --
 tools/webview/src/RenderThread.cpp            |  95 ----
 tools/webview/src/RenderThread.h              |  42 --
 tools/webview/src/main.cpp                    |  31 --
 tools/webview/src/main.qml                    |  23 -
 tools/webview/src/mainqt.cpp                  |   5 -
 tools/webview/src/resources.qrc               |   6 -
 58 files changed, 684 insertions(+), 1457 deletions(-)
 rename android/apps/{ui => interface}/proguard-rules.pro (100%)
 delete mode 100644 android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
 rename android/apps/{ui => interface}/src/main/res/drawable/ic_launcher.xml (100%)
 rename android/apps/interface/src/main/res/drawable/{rounded_button.xml => rounded_button_color1.xml} (100%)
 delete mode 100644 android/apps/interface/src/main/res/drawable/rounded_edit.xml
 delete mode 100644 android/apps/interface/src/main/res/layout/fragment_signedin.xml
 delete mode 100644 android/apps/ui/CMakeLists.txt
 delete mode 100644 android/apps/ui/src/main/AndroidManifest.xml
 delete mode 100644 android/apps/ui/src/main/cpp/PlayerWindow.cpp
 delete mode 100644 android/apps/ui/src/main/cpp/PlayerWindow.h
 delete mode 100644 android/apps/ui/src/main/cpp/RenderThread.cpp
 delete mode 100644 android/apps/ui/src/main/cpp/RenderThread.h
 delete mode 100644 android/apps/ui/src/main/cpp/main.cpp
 delete mode 100644 android/apps/ui/src/main/cpp/main.qml
 delete mode 100644 android/apps/ui/src/main/cpp/mainqt.cpp
 delete mode 100644 android/apps/ui/src/main/cpp/resources.qrc
 delete mode 100644 android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java
 delete mode 100644 android/apps/ui/src/main/res/values/strings.xml
 delete mode 100644 android/apps/ui/src/main/uiApp.pro
 delete mode 100644 tools/webview/CMakeLists.txt
 delete mode 100644 tools/webview/src/PlayerWindow.cpp
 delete mode 100644 tools/webview/src/PlayerWindow.h
 delete mode 100644 tools/webview/src/RenderThread.cpp
 delete mode 100644 tools/webview/src/RenderThread.h
 delete mode 100644 tools/webview/src/main.cpp
 delete mode 100644 tools/webview/src/main.qml
 delete mode 100644 tools/webview/src/mainqt.cpp
 delete mode 100644 tools/webview/src/resources.qrc

diff --git a/android/apps/ui/proguard-rules.pro b/android/apps/interface/proguard-rules.pro
similarity index 100%
rename from android/apps/ui/proguard-rules.pro
rename to android/apps/interface/proguard-rules.pro
diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
deleted file mode 100644
index 9ed2f1c7f5..0000000000
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/SignedInFragment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package io.highfidelity.hifiinterface.fragment;
-
-import android.app.Fragment;
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.Spanned;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import io.highfidelity.hifiinterface.R;
-
-public class SignedInFragment extends Fragment {
-
-    private Button mGetStartedButton;
-    private OnSignedInInteractionListener mListener;
-
-    public SignedInFragment() {
-        // Required empty public constructor
-    }
-
-    public static SignedInFragment newInstance() {
-        SignedInFragment fragment = new SignedInFragment();
-        return fragment;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_signedin, container, false);
-        mGetStartedButton = rootView.findViewById(R.id.getStarted);
-
-        mGetStartedButton.setOnClickListener(view -> {
-            getStarted();
-        });
-
-        return rootView;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof SignedInFragment.OnSignedInInteractionListener) {
-            mListener = (SignedInFragment.OnSignedInInteractionListener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement OnSignedInInteractionListener");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    public void getStarted() {
-        if (mListener != null) {
-            mListener.onGettingStarted();
-        }
-    }
-
-    public interface OnSignedInInteractionListener {
-        void onGettingStarted();
-    }
-
-}
diff --git a/android/apps/ui/src/main/res/drawable/ic_launcher.xml b/android/apps/interface/src/main/res/drawable/ic_launcher.xml
similarity index 100%
rename from android/apps/ui/src/main/res/drawable/ic_launcher.xml
rename to android/apps/interface/src/main/res/drawable/ic_launcher.xml
diff --git a/android/apps/interface/src/main/res/drawable/rounded_button.xml b/android/apps/interface/src/main/res/drawable/rounded_button_color1.xml
similarity index 100%
rename from android/apps/interface/src/main/res/drawable/rounded_button.xml
rename to android/apps/interface/src/main/res/drawable/rounded_button_color1.xml
diff --git a/android/apps/interface/src/main/res/drawable/rounded_edit.xml b/android/apps/interface/src/main/res/drawable/rounded_edit.xml
deleted file mode 100644
index 3c1cac4d1d..0000000000
--- a/android/apps/interface/src/main/res/drawable/rounded_edit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" android:padding="9dp">
-        <corners android:radius="4dip" />
-        <stroke android:width="1dip" android:color="@android:color/black" />
-        <solid android:color="@color/backgroundEditText"/>
-</shape>
\ No newline at end of file
diff --git a/android/apps/interface/src/main/res/layout/fragment_signedin.xml b/android/apps/interface/src/main/res/layout/fragment_signedin.xml
deleted file mode 100644
index 1c982b0e0d..0000000000
--- a/android/apps/interface/src/main/res/layout/fragment_signedin.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/backgroundLight">
-
-    <ImageView
-        android:id="@+id/header"
-        android:layout_width="@dimen/header_hifi_width"
-        android:layout_height="@dimen/header_hifi_height"
-        android:layout_marginTop="@dimen/header_hifi_margin_top"
-        android:contentDescription="HighFidelity"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/hifi_header" />
-
-    <TextView
-        android:id="@+id/welcome"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:paddingLeft="86dp"
-        android:paddingRight="86dp"
-        android:fontFamily="@font/raleway"
-        android:textColor="@color/clearText"
-        android:textSize="24sp"
-        android:text="@string/signedin_welcome"
-        app:layout_constraintTop_toBottomOf="@id/header"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        android:gravity="center"
-
-        />
-
-    <Button
-        android:id="@+id/getStarted"
-        android:layout_width="217dp"
-        android:layout_height="38dp"
-        android:layout_marginTop="30dp"
-        android:background="@drawable/rounded_button"
-        android:fontFamily="@font/raleway_semibold"
-        android:paddingBottom="0dp"
-        android:paddingLeft="25dp"
-        android:paddingRight="25dp"
-        android:paddingTop="0dp"
-        android:text="@string/get_started"
-        android:textColor="@color/white_opaque"
-        android:textAllCaps="false"
-        android:textSize="18sp"
-        app:layout_constraintTop_toBottomOf="@id/welcome"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-
-        app:layout_goneMarginTop="4dp"/>
-
-
-
-
-
-</android.support.constraint.ConstraintLayout>
diff --git a/android/apps/ui/CMakeLists.txt b/android/apps/ui/CMakeLists.txt
deleted file mode 100644
index f1f04eb829..0000000000
--- a/android/apps/ui/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(TARGET_NAME uiApp)
-setup_hifi_library(AndroidExtras)
-link_hifi_libraries(shared ktx shaders gl oculusMobile qml)
-target_link_libraries(${TARGET_NAME} android log m)
-target_opengl()
-target_oculus_mobile()
-
diff --git a/android/apps/ui/src/main/AndroidManifest.xml b/android/apps/ui/src/main/AndroidManifest.xml
deleted file mode 100644
index 81be094a3c..0000000000
--- a/android/apps/ui/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.highfidelity.ui"
-    android:installLocation="auto">
-    <uses-feature android:glEsVersion="0x00030002" android:required="true" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <application android:label="UI Test" android:allowBackup="false" android:name="org.qtproject.qt5.android.bindings.QtApplication">
-        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
-        <activity
-            android:name=".UiActivity"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
-            android:launchMode="singleTask"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
-            android:excludeFromRecents="false"
-            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode">
-            <meta-data android:name="android.app.lib_name" android:value="uiApp"/>
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="plugins/webview/libqtwebview_android.so:plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/android/apps/ui/src/main/cpp/PlayerWindow.cpp b/android/apps/ui/src/main/cpp/PlayerWindow.cpp
deleted file mode 100644
index 1030158daf..0000000000
--- a/android/apps/ui/src/main/cpp/PlayerWindow.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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 "PlayerWindow.h"
-
-#include <QtWidgets/QFileDialog>
-
-PlayerWindow::PlayerWindow() {
-    installEventFilter(this);
-    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
-    setSurfaceType(QSurface::OpenGLSurface);
-    create();
-    showFullScreen();
-    QCoreApplication::processEvents();
-    _renderThread.initialize(this);
-}
-
diff --git a/android/apps/ui/src/main/cpp/PlayerWindow.h b/android/apps/ui/src/main/cpp/PlayerWindow.h
deleted file mode 100644
index 5aa207b132..0000000000
--- a/android/apps/ui/src/main/cpp/PlayerWindow.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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
-//
-
-#pragma once
-#include <QtGui/QWindow>
-#include <QtCore/QSettings>
-
-#include "RenderThread.h"
-
-// Create a simple OpenGL window that renders text in various ways
-class PlayerWindow : public QWindow {
-public:
-    PlayerWindow();
-    virtual ~PlayerWindow() = default;
-
-protected:
-    //bool eventFilter(QObject* obj, QEvent* event) override;
-    //void keyPressEvent(QKeyEvent* event) override;
-
-private:
-    RenderThread _renderThread;
-};
diff --git a/android/apps/ui/src/main/cpp/RenderThread.cpp b/android/apps/ui/src/main/cpp/RenderThread.cpp
deleted file mode 100644
index f309fb01a8..0000000000
--- a/android/apps/ui/src/main/cpp/RenderThread.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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 "RenderThread.h"
-
-#include <mutex>
-
-#include <jni.h>
-#include <android/log.h>
-
-#include <QtGui/QWindow>
-
-#include <gl/GLHelpers.h>
-#include <GLMHelpers.h>
-
-#define MARGIN 48
-
-void RenderThread::initialize(QWindow* window) {
-    std::unique_lock<std::mutex> lock(_frameLock);
-    setObjectName("RenderThread");
-    Parent::initialize();
-
-    _thread->setObjectName("RenderThread");
-    _size = window->size();
-
-    _glContext.setWindow(window);
-    _glContext.create();
-    _glContext.makeCurrent();
-
-    gl::setSwapInterval(0);
-    glGenFramebuffers(1, &_readFbo);
-    OffscreenSurface::setSharedContext(_glContext.qglContext());
-
-    // GPU library init
-    _glContext.doneCurrent();
-    _glContext.moveToThread(_thread);
-
-    _offscreen = std::make_shared<OffscreenSurface>();
-    _offscreen->resize({ _size.width() - (MARGIN * 2), _size.height() - (MARGIN * 2)});
-    _offscreen->load(QUrl("qrc://qml/main.qml"));
-}
-
-void RenderThread::releaseTexture() {
-    if (_uiTexture != 0) {
-        auto readFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-        glFlush();
-        CHECK_GL_ERROR();
-        _discardLambda(_uiTexture, readFence);
-        _uiTexture = 0;
-    }
-}
-
-void RenderThread::setup() {
-    // Wait until the context has been moved to this thread
-    { std::unique_lock<std::mutex> lock(_frameLock); }
-    _glContext.makeCurrent();
-}
-
-void RenderThread::shutdown() {
-    releaseTexture();
-    _glContext.doneCurrent();
-}
-
-bool RenderThread::process() {
-    float now = secTimestampNow();
-    float red = fabsf(sinf(now * PI));
-    _glContext.makeCurrent();
-    {
-        OffscreenSurface::TextureAndFence newTextureAndFence;
-        if (_offscreen->fetchTexture(newTextureAndFence)) {
-            releaseTexture();
-            const auto& newTexture = newTextureAndFence.first;
-            GLsync writeFence = static_cast<GLsync>(newTextureAndFence.second);
-            _uiTexture = newTexture;
-            glWaitSync(writeFence, 0, GL_TIMEOUT_IGNORED);
-            glDeleteSync(writeFence);
-        }
-    }
-
-    glClearColor(1, red, 1, 1);
-    glClear(GL_COLOR_BUFFER_BIT);
-    if (_uiTexture != 0) {
-        auto uiSize = _offscreen->size();
-        glBindFramebuffer(GL_READ_FRAMEBUFFER, _readFbo);
-        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _uiTexture, 0);
-        glBlitFramebuffer(
-            0, 0, uiSize.width(), uiSize.height(),
-            MARGIN, MARGIN, uiSize.width()  + MARGIN, uiSize.height() + MARGIN,
-            GL_COLOR_BUFFER_BIT, GL_NEAREST);
-    }
-    _glContext.swapBuffers();
-    return true;
-}
diff --git a/android/apps/ui/src/main/cpp/RenderThread.h b/android/apps/ui/src/main/cpp/RenderThread.h
deleted file mode 100644
index e04715f7ca..0000000000
--- a/android/apps/ui/src/main/cpp/RenderThread.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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
-//
-
-#pragma once
-
-#include <QtCore/QElapsedTimer>
-
-#include <GenericThread.h>
-#include <shared/RateCounter.h>
-#include <gl/Config.h>
-#include <gl/Context.h>
-#include <qml/OffscreenSurface.h>
-
-class RenderThread : public GenericThread {
-    using Parent = GenericThread;
-    using OffscreenSurface = hifi::qml::OffscreenSurface;
-    using OffscreenPtr = std::shared_ptr<OffscreenSurface>;
-    using DiscardLambda = std::function<void(uint32_t, void*)>;
-public:
-    gl::Context _glContext;
-    std::mutex _mutex;
-    std::atomic<size_t> _presentCount{ 0 };
-    std::mutex _frameLock;
-    OffscreenPtr _offscreen;
-    QSize _size;
-    DiscardLambda _discardLambda { OffscreenSurface::getDiscardLambda() };
-    GLuint _readFbo { 0 };
-    GLuint _uiTexture { 0 };
-
-    void setup() override;
-    bool process() override;
-    void shutdown() override;
-    void initialize(QWindow* window);
-
-private:
-    void releaseTexture();
-};
diff --git a/android/apps/ui/src/main/cpp/main.cpp b/android/apps/ui/src/main/cpp/main.cpp
deleted file mode 100644
index 611f652fad..0000000000
--- a/android/apps/ui/src/main/cpp/main.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-
-//
-//  Created by Bradley Austin Davis on 2018/11/22
-//  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 <android/log.h>
-
-#include <QtGui/QGuiApplication>
-
-#include <Trace.h>
-
-#include "PlayerWindow.h"
-
-void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
-    if (!message.isEmpty()) {
-        const char * local=message.toStdString().c_str();
-        switch (type) {
-            case QtDebugMsg:
-                __android_log_write(ANDROID_LOG_DEBUG,"QQ",local);
-                break;
-            case QtInfoMsg:
-                __android_log_write(ANDROID_LOG_INFO,"QQ",local);
-                break;
-            case QtWarningMsg:
-                __android_log_write(ANDROID_LOG_WARN,"QQ",local);
-                break;
-            case QtCriticalMsg:
-                __android_log_write(ANDROID_LOG_ERROR,"QQ",local);
-                break;
-            case QtFatalMsg:
-            default:
-                __android_log_write(ANDROID_LOG_FATAL,"QQ",local);
-                abort();
-        }
-    }
-}
-
-void initWebView();
-
-int main(int argc, char** argv) {
-    setupHifiApplication("uiApp");
-    QGuiApplication app(argc, argv);
-    initWebView();
-    auto oldMessageHandler = qInstallMessageHandler(messageHandler);
-    {
-        DependencyManager::set<tracing::Tracer>();
-        PlayerWindow window;
-        app.exec();
-    }
-    qInstallMessageHandler(oldMessageHandler);
-    return 0;
-}
-
-
diff --git a/android/apps/ui/src/main/cpp/main.qml b/android/apps/ui/src/main/cpp/main.qml
deleted file mode 100644
index 8a99918152..0000000000
--- a/android/apps/ui/src/main/cpp/main.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtWebView 1.1
-
-WebView {
-    url: "https://old.reddit.com"
-    width: 640; height: 480
-
-    Rectangle {
-        id: blue
-        color: "blue"
-        anchors { margins: 48; top: parent.top; bottom: parent.bottom; left: parent.left;  }
-        width: parent.width / 3
-        ColorAnimation on color {
-            from: "yellow";
-            to: "red";
-            loops:  Animation.Infinite;
-            duration: 1000;
-        }
-    }
-}
diff --git a/android/apps/ui/src/main/cpp/mainqt.cpp b/android/apps/ui/src/main/cpp/mainqt.cpp
deleted file mode 100644
index c4c05569c0..0000000000
--- a/android/apps/ui/src/main/cpp/mainqt.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <QtWebView/QtWebView>
-
-void initWebView() {
-    QtWebView::initialize();
-}
\ No newline at end of file
diff --git a/android/apps/ui/src/main/cpp/resources.qrc b/android/apps/ui/src/main/cpp/resources.qrc
deleted file mode 100644
index f06d416800..0000000000
--- a/android/apps/ui/src/main/cpp/resources.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource prefix="/">
-    <file>main.qml</file>
-  </qresource>
-</RCC>
diff --git a/android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java b/android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java
deleted file mode 100644
index bc6dcb3cd3..0000000000
--- a/android/apps/ui/src/main/java/io/highfidelity/ui/UiActivity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/11/20
-//  Copyright 2013-2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-package io.highfidelity.ui;
-
-import android.os.Bundle;
-import org.qtproject.qt5.android.bindings.QtActivity;
-
-
-
-public class UiActivity extends QtActivity {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        //System.loadLibrary("uiApp");
-        super.onCreate(savedInstanceState);
-    }
-}
diff --git a/android/apps/ui/src/main/res/values/strings.xml b/android/apps/ui/src/main/res/values/strings.xml
deleted file mode 100644
index 8bf550f74e..0000000000
--- a/android/apps/ui/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name" translatable="false">GPU Frame Player</string>
-</resources>
diff --git a/android/apps/ui/src/main/uiApp.pro b/android/apps/ui/src/main/uiApp.pro
deleted file mode 100644
index 812ea8e1b8..0000000000
--- a/android/apps/ui/src/main/uiApp.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-TEMPLATE = app
-
-QT += gui qml quick xml webview widgets
-
-CONFIG += c++11
-
-SOURCES += \
-    cpp/main.cpp \
-    cpp/PlayerWindow.cpp \
-    cpp/RenderThread.cpp \
-    cpp/resources.qrc
-
-HEADERS += \
-    cpp/PlayerWindow.h \
-    cpp/RenderThread.h
-
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH = cpp
-
-#DISTFILES += \
-#    cpp/*.qml
diff --git a/android/settings.gradle b/android/settings.gradle
index ffa2c93d6d..23e54b0457 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -25,5 +25,5 @@ project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterfa
 //include ':framePlayer'
 //project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
 
-//include ':ui'
-//project(':ui').projectDir = new File(settingsDir, 'apps/ui')
+//include ':questFramePlayer'
+//project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
diff --git a/interface/src/raypick/LaserPointer.cpp b/interface/src/raypick/LaserPointer.cpp
index 1b53f9ab30..236512f2fe 100644
--- a/interface/src/raypick/LaserPointer.cpp
+++ b/interface/src/raypick/LaserPointer.cpp
@@ -125,7 +125,7 @@ LaserPointer::RenderState::RenderState(const OverlayID& startID, const OverlayID
     StartEndRenderState(startID, endID), _pathID(pathID)
 {
     if (!_pathID.isNull()) {
-        _pathIgnoreRays = qApp->getOverlays().getProperty(_pathID, "ignoreRayIntersection").value.toBool();
+        _pathIgnoreRays = qApp->getOverlays().getProperty(_pathID, "ignorePickIntersection").value.toBool();
         _lineWidth = qApp->getOverlays().getProperty(_pathID, "lineWidth").value.toFloat();
     }
 }
@@ -142,7 +142,7 @@ void LaserPointer::RenderState::disable() {
     if (!getPathID().isNull()) {
         QVariantMap pathProps;
         pathProps.insert("visible", false);
-        pathProps.insert("ignoreRayIntersection", true);
+        pathProps.insert("ignorePickIntersection", true);
         qApp->getOverlays().editOverlay(getPathID(), pathProps);
     }
 }
@@ -156,7 +156,7 @@ void LaserPointer::RenderState::update(const glm::vec3& origin, const glm::vec3&
         pathProps.insert("start", vec3toVariant(origin));
         pathProps.insert("end", endVariant);
         pathProps.insert("visible", true);
-        pathProps.insert("ignoreRayIntersection", doesPathIgnoreRays());
+        pathProps.insert("ignorePickIntersection", doesPathIgnoreRays());
         pathProps.insert("lineWidth", getLineWidth() * parentScale);
         qApp->getOverlays().editOverlay(getPathID(), pathProps);
     }
diff --git a/interface/src/raypick/LaserPointerScriptingInterface.h b/interface/src/raypick/LaserPointerScriptingInterface.h
index 5aaacd7960..d85e329e9a 100644
--- a/interface/src/raypick/LaserPointerScriptingInterface.h
+++ b/interface/src/raypick/LaserPointerScriptingInterface.h
@@ -21,7 +21,7 @@ class LaserPointerScriptingInterface : public QObject, public Dependency {
     SINGLETON_DEPENDENCY
 
 /**jsdoc
- * Synonym for {@link Pointers} as used for laser pointers.
+ * Synonym for {@link Pointers} as used for laser pointers.  Deprecated.
  *
  * @namespace LaserPointers
  *
diff --git a/interface/src/raypick/ParabolaPick.cpp b/interface/src/raypick/ParabolaPick.cpp
index 571f4a6ea6..b93ced17c6 100644
--- a/interface/src/raypick/ParabolaPick.cpp
+++ b/interface/src/raypick/ParabolaPick.cpp
@@ -9,6 +9,7 @@
 
 #include "Application.h"
 #include "EntityScriptingInterface.h"
+#include "PickScriptingInterface.h"
 #include "ui/overlays/Overlays.h"
 #include "avatar/AvatarManager.h"
 #include "scripting/HMDScriptingInterface.h"
@@ -57,10 +58,15 @@ PickParabola ParabolaPick::getMathematicalPick() const {
 
 PickResultPointer ParabolaPick::getEntityIntersection(const PickParabola& pick) {
     if (glm::length2(pick.acceleration) > EPSILON && glm::length2(pick.velocity) > EPSILON) {
-        bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
+        PickFilter searchFilter = getFilter();
+        if (DependencyManager::get<PickManager>()->getForceCoarsePicking()) {
+            searchFilter.setFlag(PickFilter::COARSE, true);
+            searchFilter.setFlag(PickFilter::PRECISE, false);
+        }
+
         ParabolaToEntityIntersectionResult entityRes =
-            DependencyManager::get<EntityScriptingInterface>()->findParabolaIntersectionVector(pick, precisionPicking,
-                getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
+            DependencyManager::get<EntityScriptingInterface>()->evalParabolaIntersectionVector(pick, searchFilter,
+                getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>());
         if (entityRes.intersects) {
             return std::make_shared<ParabolaPickResult>(IntersectionType::ENTITY, entityRes.entityID, entityRes.distance, entityRes.parabolicDistance, entityRes.intersection, pick, entityRes.surfaceNormal, entityRes.extraInfo);
         }
@@ -70,7 +76,7 @@ PickResultPointer ParabolaPick::getEntityIntersection(const PickParabola& pick)
 
 PickResultPointer ParabolaPick::getOverlayIntersection(const PickParabola& pick) {
     if (glm::length2(pick.acceleration) > EPSILON && glm::length2(pick.velocity) > EPSILON) {
-        bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
+        bool precisionPicking = !(getFilter().isCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
         ParabolaToOverlayIntersectionResult overlayRes =
             qApp->getOverlays().findParabolaIntersectionVector(pick, precisionPicking,
                 getIncludeItemsAs<OverlayID>(), getIgnoreItemsAs<OverlayID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp
index 162c26276f..e45b11b479 100644
--- a/interface/src/raypick/ParabolaPointer.cpp
+++ b/interface/src/raypick/ParabolaPointer.cpp
@@ -404,7 +404,7 @@ void ParabolaPointer::RenderState::ParabolaRenderItem::updateBounds() {
 const gpu::PipelinePointer ParabolaPointer::RenderState::ParabolaRenderItem::getParabolaPipeline() {
     if (!_parabolaPipeline || !_transparentParabolaPipeline) {
         {
-            gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola );
+            gpu::ShaderPointer program = gpu::Shader::createProgram(shader::render_utils::program::parabola);
             auto state = std::make_shared<gpu::State>();
             state->setDepthTest(true, true, gpu::LESS_EQUAL);
             state->setBlendFunction(false,
diff --git a/interface/src/raypick/PathPointer.cpp b/interface/src/raypick/PathPointer.cpp
index 8a6995936f..ae0ce4671b 100644
--- a/interface/src/raypick/PathPointer.cpp
+++ b/interface/src/raypick/PathPointer.cpp
@@ -253,12 +253,12 @@ StartEndRenderState::StartEndRenderState(const OverlayID& startID, const Overlay
     _startID(startID), _endID(endID) {
     if (!_startID.isNull()) {
         _startDim = vec3FromVariant(qApp->getOverlays().getProperty(_startID, "dimensions").value);
-        _startIgnoreRays = qApp->getOverlays().getProperty(_startID, "ignoreRayIntersection").value.toBool();
+        _startIgnoreRays = qApp->getOverlays().getProperty(_startID, "ignorePickIntersection").value.toBool();
     }
     if (!_endID.isNull()) {
         _endDim = vec3FromVariant(qApp->getOverlays().getProperty(_endID, "dimensions").value);
         _endRot = quatFromVariant(qApp->getOverlays().getProperty(_endID, "rotation").value);
-        _endIgnoreRays = qApp->getOverlays().getProperty(_endID, "ignoreRayIntersection").value.toBool();
+        _endIgnoreRays = qApp->getOverlays().getProperty(_endID, "ignorePickIntersection").value.toBool();
     }
 }
 
@@ -275,13 +275,13 @@ void StartEndRenderState::disable() {
     if (!getStartID().isNull()) {
         QVariantMap startProps;
         startProps.insert("visible", false);
-        startProps.insert("ignoreRayIntersection", true);
+        startProps.insert("ignorePickIntersection", true);
         qApp->getOverlays().editOverlay(getStartID(), startProps);
     }
     if (!getEndID().isNull()) {
         QVariantMap endProps;
         endProps.insert("visible", false);
-        endProps.insert("ignoreRayIntersection", true);
+        endProps.insert("ignorePickIntersection", true);
         qApp->getOverlays().editOverlay(getEndID(), endProps);
     }
     _enabled = false;
@@ -294,7 +294,7 @@ void StartEndRenderState::update(const glm::vec3& origin, const glm::vec3& end,
         startProps.insert("position", vec3toVariant(origin));
         startProps.insert("visible", true);
         startProps.insert("dimensions", vec3toVariant(getStartDim() * parentScale));
-        startProps.insert("ignoreRayIntersection", doesStartIgnoreRays());
+        startProps.insert("ignorePickIntersection", doesStartIgnoreRays());
         qApp->getOverlays().editOverlay(getStartID(), startProps);
     }
 
@@ -346,7 +346,7 @@ void StartEndRenderState::update(const glm::vec3& origin, const glm::vec3& end,
         endProps.insert("position", vec3toVariant(position));
         endProps.insert("rotation", quatToVariant(rotation));
         endProps.insert("visible", true);
-        endProps.insert("ignoreRayIntersection", doesEndIgnoreRays());
+        endProps.insert("ignorePickIntersection", doesEndIgnoreRays());
         qApp->getOverlays().editOverlay(getEndID(), endProps);
     }
     _enabled = true;
diff --git a/interface/src/raypick/PickScriptingInterface.cpp b/interface/src/raypick/PickScriptingInterface.cpp
index 6e979d2d91..e8f84e63fe 100644
--- a/interface/src/raypick/PickScriptingInterface.cpp
+++ b/interface/src/raypick/PickScriptingInterface.cpp
@@ -49,11 +49,17 @@ unsigned int PickScriptingInterface::createPick(const PickQuery::PickType type,
     }
 }
 
+PickFilter getPickFilter(unsigned int filter) {
+    // FIXME: Picks always intersect visible and collidable things right now
+    filter = filter | (PickScriptingInterface::PICK_INCLUDE_VISIBLE() | PickScriptingInterface::PICK_INCLUDE_COLLIDABLE());
+    return PickFilter(filter);
+}
+
 /**jsdoc
  * A set of properties that can be passed to {@link Picks.createPick} to create a new Ray Pick.
  * @typedef {object} Picks.RayPickProperties
  * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
- * @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+ * @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
  * @property {number} [maxDistance=0.0] The max distance at which this Pick will intersect.  0.0 = no max.  < 0.0 is invalid.
  * @property {Uuid} parentID - The ID of the parent, either an avatar, an entity, an overlay, or a pick.
  * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, the joints on the model of an avatar. (default = 0, no joint)
@@ -73,7 +79,7 @@ unsigned int PickScriptingInterface::createRayPick(const QVariant& properties) {
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = PickFilter(propMap["filter"].toUInt());
+        filter = getPickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
@@ -111,7 +117,7 @@ unsigned int PickScriptingInterface::createRayPick(const QVariant& properties) {
  * @typedef {object} Picks.StylusPickProperties
  * @property {number} [hand=-1] An integer.  0 == left, 1 == right.  Invalid otherwise.
  * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
- * @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+ * @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
  * @property {number} [maxDistance=0.0] The max distance at which this Pick will intersect.  0.0 = no max.  < 0.0 is invalid.
  */
 unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties) {
@@ -132,7 +138,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = PickFilter(propMap["filter"].toUInt());
+        filter = getPickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
@@ -153,7 +159,7 @@ unsigned int PickScriptingInterface::createStylusPick(const QVariant& properties
  * A set of properties that can be passed to {@link Picks.createPick} to create a new Parabola Pick.
  * @typedef {object} Picks.ParabolaPickProperties
  * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
- * @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+ * @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
  * @property {number} [maxDistance=0.0] The max distance at which this Pick will intersect.  0.0 = no max.  < 0.0 is invalid.
  * @property {Uuid} parentID - The ID of the parent, either an avatar, an entity, an overlay, or a pick.
  * @property {number} [parentJointIndex=0] - The joint of the parent to parent to, for example, the joints on the model of an avatar. (default = 0, no joint)
@@ -178,7 +184,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = PickFilter(propMap["filter"].toUInt());
+        filter = getPickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
@@ -250,7 +256,7 @@ unsigned int PickScriptingInterface::createParabolaPick(const QVariant& properti
 
 * @typedef {object} Picks.CollisionPickProperties
 * @property {boolean} [enabled=false] If this Pick should start enabled or not.  Disabled Picks do not updated their pick results.
-* @property {number} [filter=Picks.PICK_NOTHING] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
+* @property {number} [filter=0] The filter for this Pick to use, constructed using filter flags combined using bitwise OR.
 * @property {Shape} shape - The information about the collision region's size and shape. Dimensions are in world space, but will scale with the parent if defined.
 * @property {Vec3} position - The position of the collision region, relative to a parent if defined.
 * @property {Quat} orientation - The orientation of the collision region, relative to a parent if defined.
@@ -273,7 +279,7 @@ unsigned int PickScriptingInterface::createCollisionPick(const QVariant& propert
 
     PickFilter filter = PickFilter();
     if (propMap["filter"].isValid()) {
-        filter = PickFilter(propMap["filter"].toUInt());
+        filter = getPickFilter(propMap["filter"].toUInt());
     }
 
     float maxDistance = 0.0f;
diff --git a/interface/src/raypick/PickScriptingInterface.h b/interface/src/raypick/PickScriptingInterface.h
index 94112d5fae..e795068cd3 100644
--- a/interface/src/raypick/PickScriptingInterface.h
+++ b/interface/src/raypick/PickScriptingInterface.h
@@ -14,6 +14,7 @@
 #include <DependencyManager.h>
 #include <PhysicsEngine.h>
 #include <Pick.h>
+#include <PickFilter.h>
 
 /**jsdoc
  * The Picks API lets you create and manage objects for repeatedly calculating intersections in different ways.
@@ -23,41 +24,62 @@
  * @hifi-interface
  * @hifi-client-entity
  *
- * @property {number} PICK_NOTHING A filter flag. Don't intersect with anything. <em>Read-only.</em>
- * @property {number} PICK_ENTITIES A filter flag. Include entities when intersecting. <em>Read-only.</em>
- * @property {number} PICK_OVERLAYS A filter flag. Include overlays when intersecting. <em>Read-only.</em>
- * @property {number} PICK_AVATARS A filter flag. Include avatars when intersecting. <em>Read-only.</em>
- * @property {number} PICK_HUD A filter flag. Include the HUD sphere when intersecting in HMD mode. <em>Read-only.</em>
- * @property {number} PICK_COARSE A filter flag. Pick against coarse meshes, instead of exact meshes. <em>Read-only.</em>
- * @property {number} PICK_INCLUDE_INVISIBLE A filter flag. Include invisible objects when intersecting. <em>Read-only.</em>
- * @property {number} PICK_INCLUDE_NONCOLLIDABLE A filter flag. Include non-collidable objects when intersecting. 
- *     <em>Read-only.</em>
- * @property {number} PICK_ALL_INTERSECTIONS <em>Read-only.</em>
- * @property {number} INTERSECTED_NONE An intersection type. Intersected nothing with the given filter flags. 
- *     <em>Read-only.</em>
+ * @property {number} PICK_ENTITIES A filter flag. Include domain and avatar entities when intersecting. <em>Read-only.</em>.  Deprecated.
+ * @property {number} PICK_OVERLAYS A filter flag. Include local entities when intersecting. <em>Read-only.</em>. Deprecated.
+ *
+ * @property {number} PICK_DOMAIN_ENTITIES A filter flag. Include domain entities when intersecting. <em>Read-only.</em>.
+ * @property {number} PICK_AVATAR_ENTITIES A filter flag. Include avatar entities when intersecting. <em>Read-only.</em>.
+ * @property {number} PICK_LOCAL_ENTITIES A filter flag. Include local entities when intersecting. <em>Read-only.</em>.
+ * @property {number} PICK_AVATARS A filter flag. Include avatars when intersecting. <em>Read-only.</em>.
+ * @property {number} PICK_HUD A filter flag. Include the HUD sphere when intersecting in HMD mode. <em>Read-only.</em>.
+ *
+ * @property {number} PICK_INCLUDE_VISIBLE A filter flag. Include visible objects when intersecting. <em>Read-only.</em>.
+ * @property {number} PICK_INCLUDE_INVISIBLE A filter flag. Include invisible objects when intersecting. <em>Read-only.</em>.
+ *
+ * @property {number} PICK_INCLUDE_COLLIDABLE A filter flag. Include collidable objects when intersecting. <em>Read-only.</em>.
+ * @property {number} PICK_INCLUDE_NONCOLLIDABLE A filter flag. Include non-collidable objects when intersecting. <em>Read-only.</em>.
+ *
+ * @property {number} PICK_PRECISE A filter flag. Pick against exact meshes. <em>Read-only.</em>.
+ * @property {number} PICK_COARSE A filter flag. Pick against coarse meshes. <em>Read-only.</em>.
+ *
+ * @property {number} PICK_ALL_INTERSECTIONS <em>Read-only.</em>.
+ *
+ * @property {number} INTERSECTED_NONE An intersection type. Intersected nothing with the given filter flags. <em>Read-only.</em>
  * @property {number} INTERSECTED_ENTITY An intersection type. Intersected an entity. <em>Read-only.</em>
  * @property {number} INTERSECTED_OVERLAY An intersection type. Intersected an overlay. <em>Read-only.</em>
  * @property {number} INTERSECTED_AVATAR An intersection type. Intersected an avatar. <em>Read-only.</em>
  * @property {number} INTERSECTED_HUD An intersection type. Intersected the HUD sphere. <em>Read-only.</em>
- * @property {number} perFrameTimeBudget - The max number of usec to spend per frame updating Pick results. <em>Read-only.</em>
+ * @property {number} perFrameTimeBudget - The max number of usec to spend per frame updating Pick results.
  */
 
 class PickScriptingInterface : 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_DOMAIN_ENTITIES READ PICK_DOMAIN_ENTITIES CONSTANT)
+    Q_PROPERTY(unsigned int PICK_AVATAR_ENTITIES READ PICK_AVATAR_ENTITIES CONSTANT)
+    Q_PROPERTY(unsigned int PICK_LOCAL_ENTITIES READ PICK_LOCAL_ENTITIES CONSTANT)
     Q_PROPERTY(unsigned int PICK_AVATARS READ PICK_AVATARS CONSTANT)
     Q_PROPERTY(unsigned int PICK_HUD READ PICK_HUD CONSTANT)
-    Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE CONSTANT)
+
+    Q_PROPERTY(unsigned int PICK_INCLUDE_VISIBLE READ PICK_INCLUDE_VISIBLE CONSTANT)
     Q_PROPERTY(unsigned int PICK_INCLUDE_INVISIBLE READ PICK_INCLUDE_INVISIBLE CONSTANT)
+
+    Q_PROPERTY(unsigned int PICK_INCLUDE_COLLIDABLE READ PICK_INCLUDE_COLLIDABLE CONSTANT)
     Q_PROPERTY(unsigned int PICK_INCLUDE_NONCOLLIDABLE READ PICK_INCLUDE_NONCOLLIDABLE CONSTANT)
+
+    Q_PROPERTY(unsigned int PICK_PRECISE READ PICK_PRECISE CONSTANT)
+    Q_PROPERTY(unsigned int PICK_COARSE READ PICK_COARSE 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)
+    Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget)
     SINGLETON_DEPENDENCY
 
 public:
@@ -72,11 +94,13 @@ public:
      * Adds a new Pick.
      * Different {@link PickType}s use different properties, and within one PickType, the properties you choose can lead to a wide range of behaviors.  For example,
      *   with PickType.Ray, depending on which optional parameters you pass, you could create a Static Ray Pick, a Mouse Ray Pick, or a Joint Ray Pick.
+     * Picks created with this method always intersect at least visible and collidable things
      * @function Picks.createPick
      * @param {PickType} type A PickType that specifies the method of picking to use
      * @param {Picks.RayPickProperties|Picks.StylusPickProperties|Picks.ParabolaPickProperties|Picks.CollisionPickProperties} properties A PickProperties object, containing all the properties for initializing this Pick
      * @returns {number} The ID of the created Pick.  Used for managing the Pick.  0 if invalid.
      */
+    // TODO: expand Pointers to be able to be fully configurable with PickFilters
     Q_INVOKABLE unsigned int createPick(const PickQuery::PickType type, const QVariant& properties);
 
     /**jsdoc
@@ -227,61 +251,80 @@ public:
      */
     Q_INVOKABLE bool isMouse(unsigned int uid);
 
-    // FIXME: Move to other property definitions.
-    Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget)
-
     unsigned int getPerFrameTimeBudget() const;
     void setPerFrameTimeBudget(unsigned int numUsecs);
 
 public slots:
 
-    /**jsdoc
-     * @function Picks.PICK_NOTHING
-     * @returns {number}
-     */
-    static constexpr unsigned int PICK_NOTHING() { return 0; }
-
     /**jsdoc
      * @function Picks.PICK_ENTITIES
      * @returns {number}
      */
-    static constexpr unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_ENTITIES); }
-
+    static constexpr unsigned int PICK_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); }
     /**jsdoc
      * @function Picks.PICK_OVERLAYS
      * @returns {number}
      */
-    static constexpr unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_OVERLAYS); }
+    static constexpr unsigned int PICK_OVERLAYS() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); }
 
+    /**jsdoc
+     * @function Picks.PICK_DOMAIN_ENTITIES
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_DOMAIN_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES); }
+    /**jsdoc
+     * @function Picks.PICK_AVATAR_ENTITIES
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_AVATAR_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES); }
+    /**jsdoc
+     * @function Picks.PICK_LOCAL_ENTITIES
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_LOCAL_ENTITIES() { return PickFilter::getBitMask(PickFilter::FlagBit::LOCAL_ENTITIES); }
     /**jsdoc
      * @function Picks.PICK_AVATARS
      * @returns {number}
      */
-    static constexpr unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_AVATARS); }
-
+    static constexpr unsigned int PICK_AVATARS() { return PickFilter::getBitMask(PickFilter::FlagBit::AVATARS); }
     /**jsdoc
      * @function Picks.PICK_HUD
      * @returns {number}
      */
-    static constexpr unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_HUD); }
+    static constexpr unsigned int PICK_HUD() { return PickFilter::getBitMask(PickFilter::FlagBit::HUD); }
 
     /**jsdoc
-     * @function Picks.PICK_COARSE
+     * @function Picks.PICK_INCLUDE_VISIBLE
      * @returns {number}
      */
-    static constexpr unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_COARSE); }
-
+    static constexpr unsigned int PICK_INCLUDE_VISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::VISIBLE); }
     /**jsdoc
      * @function Picks.PICK_INCLUDE_INVISIBLE
      * @returns {number}
      */
-    static constexpr unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_INVISIBLE); }
+    static constexpr unsigned int PICK_INCLUDE_INVISIBLE() { return PickFilter::getBitMask(PickFilter::FlagBit::INVISIBLE); }
 
+    /**jsdoc
+     * @function Picks.PICK_INCLUDE_COLLIDABLE
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_INCLUDE_COLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE); }
     /**jsdoc
      * @function Picks.PICK_INCLUDE_NONCOLLIDABLE
      * @returns {number}
      */
-    static constexpr unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_INCLUDE_NONCOLLIDABLE); }
+    static constexpr unsigned int PICK_INCLUDE_NONCOLLIDABLE() { return PickFilter::getBitMask(PickFilter::FlagBit::NONCOLLIDABLE); }
+
+    /**jsdoc
+     * @function Picks.PICK_PRECISE
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_PRECISE() { return PickFilter::getBitMask(PickFilter::FlagBit::PRECISE); }
+    /**jsdoc
+     * @function Picks.PICK_COARSE
+     * @returns {number}
+     */
+    static constexpr unsigned int PICK_COARSE() { return PickFilter::getBitMask(PickFilter::FlagBit::COARSE); }
 
     /**jsdoc
      * @function Picks.PICK_ALL_INTERSECTIONS
diff --git a/interface/src/raypick/PointerScriptingInterface.h b/interface/src/raypick/PointerScriptingInterface.h
index 2677f37fae..a21c1f2470 100644
--- a/interface/src/raypick/PointerScriptingInterface.h
+++ b/interface/src/raypick/PointerScriptingInterface.h
@@ -41,10 +41,12 @@ public:
     * @property {string} button Which button to trigger.  "Primary", "Secondary", "Tertiary", and "Focus" are currently supported.  Only "Primary" will trigger clicks on web surfaces.  If "Focus" is triggered,
     * it will try to set the entity or overlay focus to the object at which the Pointer is aimed.  Buttons besides the first three will still trigger events, but event.button will be "None".
     */
+
     /**jsdoc
      * Adds a new Pointer
      * Different {@link PickType}s use different properties, and within one PickType, the properties you choose can lead to a wide range of behaviors.  For example,
      *   with PickType.Ray, depending on which optional parameters you pass, you could create a Static Ray Pointer, a Mouse Ray Pointer, or a Joint Ray Pointer.
+     * Pointers created with this method always intersect at least visible and collidable things
      * @function Pointers.createPointer
      * @param {PickType} type A PickType that specifies the method of picking to use
      * @param {Pointers.LaserPointerProperties|Pointers.StylusPointerProperties|Pointers.ParabolaPointerProperties} properties A PointerProperties object, containing all the properties for initializing this Pointer <b>and</b> the {@link Picks.PickProperties} for the Pick that
@@ -58,21 +60,21 @@ public:
      *     dimensions: {x:0.5, y:0.5, z:0.5},
      *     solid: true,
      *     color: {red:0, green:255, blue:0},
-     *     ignoreRayIntersection: true
+     *     ignorePickIntersection: true
      * };
      * var end2 = {
      *     type: "sphere",
      *     dimensions: {x:0.5, y:0.5, z:0.5},
      *     solid: true,
      *     color: {red:255, green:0, blue:0},
-     *     ignoreRayIntersection: true
+     *     ignorePickIntersection: true
      * };
      *
      * var renderStates = [ {name: "test", end: end} ];
      * var defaultRenderStates = [ {name: "test", distance: 10.0, end: end2} ];
      * var pointer = Pointers.createPointer(PickType.Ray, {
      *     joint: "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND",
-     *     filter: Picks.PICK_OVERLAYS | Picks.PICK_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE,
+     *     filter: Picks.PICK_LOCAL_ENTITIES | Picks.PICK_DOMAIN_ENTITIES | Picks.PICK_INCLUDE_NONCOLLIDABLE,
      *     renderStates: renderStates,
      *     defaultRenderStates: defaultRenderStates,
      *     distanceScaleEnd: true,
@@ -82,6 +84,7 @@ public:
      * });
      * Pointers.setRenderState(pointer, "test");
      */
+    // TODO: expand Pointers to be able to be fully configurable with PickFilters
     Q_INVOKABLE unsigned int createPointer(const PickQuery::PickType& type, const QVariant& properties);
 
     /**jsdoc
diff --git a/interface/src/raypick/RayPick.cpp b/interface/src/raypick/RayPick.cpp
index a48d858504..507e45b470 100644
--- a/interface/src/raypick/RayPick.cpp
+++ b/interface/src/raypick/RayPick.cpp
@@ -27,10 +27,15 @@ PickRay RayPick::getMathematicalPick() const {
 }
 
 PickResultPointer RayPick::getEntityIntersection(const PickRay& pick) {
-    bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
+    PickFilter searchFilter = getFilter();
+    if (DependencyManager::get<PickManager>()->getForceCoarsePicking()) {
+        searchFilter.setFlag(PickFilter::COARSE, true);
+        searchFilter.setFlag(PickFilter::PRECISE, false);
+    }
+
     RayToEntityIntersectionResult entityRes =
-        DependencyManager::get<EntityScriptingInterface>()->findRayIntersectionVector(pick, precisionPicking,
-            getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
+        DependencyManager::get<EntityScriptingInterface>()->evalRayIntersectionVector(pick, searchFilter,
+            getIncludeItemsAs<EntityItemID>(), getIgnoreItemsAs<EntityItemID>());
     if (entityRes.intersects) {
         return std::make_shared<RayPickResult>(IntersectionType::ENTITY, entityRes.entityID, entityRes.distance, entityRes.intersection, pick, entityRes.surfaceNormal, entityRes.extraInfo);
     } else {
@@ -39,7 +44,7 @@ PickResultPointer RayPick::getEntityIntersection(const PickRay& pick) {
 }
 
 PickResultPointer RayPick::getOverlayIntersection(const PickRay& pick) {
-    bool precisionPicking = !(getFilter().doesPickCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
+    bool precisionPicking = !(getFilter().isCoarse() || DependencyManager::get<PickManager>()->getForceCoarsePicking());
     RayToOverlayIntersectionResult overlayRes =
         qApp->getOverlays().findRayIntersectionVector(pick, precisionPicking,
             getIncludeItemsAs<OverlayID>(), getIgnoreItemsAs<OverlayID>(), !getFilter().doesPickInvisible(), !getFilter().doesPickNonCollidable());
diff --git a/interface/src/raypick/RayPickScriptingInterface.h b/interface/src/raypick/RayPickScriptingInterface.h
index d5e224018e..3ad0efd439 100644
--- a/interface/src/raypick/RayPickScriptingInterface.h
+++ b/interface/src/raypick/RayPickScriptingInterface.h
@@ -19,14 +19,13 @@
 #include "PickScriptingInterface.h"
 
 /**jsdoc
- * Synonym for {@link Picks} as used for ray picks.
+ * Synonym for {@link Picks} as used for ray picks.  Deprecated.
  *
  * @namespace RayPick
  *
  * @hifi-interface
  * @hifi-client-entity
  *
- * @property {number} PICK_NOTHING <em>Read-only.</em>
  * @property {number} PICK_ENTITIES <em>Read-only.</em>
  * @property {number} PICK_OVERLAYS <em>Read-only.</em>
  * @property {number} PICK_AVATARS <em>Read-only.</em>
@@ -44,7 +43,6 @@
 
 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)
@@ -140,12 +138,6 @@ public:
 
 public slots:
 
-    /**jsdoc
-     * @function RayPick.PICK_NOTHING
-     * @returns {number}
-     */
-    static unsigned int PICK_NOTHING() { return PickScriptingInterface::PICK_NOTHING(); }
-
     /**jsdoc
      * @function RayPick.PICK_ENTITIES
      * @returns {number}
diff --git a/interface/src/raypick/StylusPointer.cpp b/interface/src/raypick/StylusPointer.cpp
index 5595c54b71..867f896763 100644
--- a/interface/src/raypick/StylusPointer.cpp
+++ b/interface/src/raypick/StylusPointer.cpp
@@ -61,7 +61,7 @@ OverlayID StylusPointer::buildStylusOverlay(const QVariantMap& properties) {
     overlayProperties["loadPriority"] = 10.0f;
     overlayProperties["solid"] = true;
     overlayProperties["visible"] = false;
-    overlayProperties["ignoreRayIntersection"] = true;
+    overlayProperties["ignorePickIntersection"] = true;
     overlayProperties["drawInFront"] = false;
 
     return qApp->getOverlays().addOverlay("model", overlayProperties);
diff --git a/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
index 2fcaf72f2d..69590aae82 100644
--- a/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/DisplayPlugin.cpp
@@ -20,7 +20,7 @@ const QString& DisplayPlugin::MENU_PATH() {
     return value;
 }
 
-#if !defined(USE_QUEST)
+#if !defined(CUSTOM_DISPLAY_PLUGINS)
 // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
 DisplayPluginList getDisplayPlugins() {
     DisplayPlugin* PLUGIN_POOL[] = {
diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
index 4d1dfa639b..b4527ff90c 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp
@@ -51,8 +51,6 @@ bool DebugHmdDisplayPlugin::internalActivate() {
     }, true, _isAutoRotateEnabled);
 
     _ipd = 0.0327499993f * 2.0f;
-
-
     // Quest 
     _eyeProjections[0][0] = vec4{ 0.91729, 0.0, -0.17407, 0.0  };
     _eyeProjections[0][1] = vec4{ 0.0, 0.083354, -0.106141, 0.0 };
@@ -62,17 +60,6 @@ bool DebugHmdDisplayPlugin::internalActivate() {
     _eyeProjections[1][1] = vec4{ 0.0, 0.083354, -0.106141, 0.0 };
     _eyeProjections[1][2] = vec4{ 0.0, 0.0, -1.0, -0.2 };
     _eyeProjections[1][3] = vec4{ 0.0, 0.0, -1.0, 0.0 };
-
-
-    // Would be nice to know why the left and right projection matrices are slightly dissymetrical
-    _eyeProjections[0][0] = vec4{ 0.759056330, 0.000000000, 0.000000000, 0.000000000 };
-    _eyeProjections[0][1] = vec4{ 0.000000000, 0.682773232, 0.000000000, 0.000000000 };
-    _eyeProjections[0][2] = vec4{ -0.0580431037, -0.00619550655, -1.00000489, -1.00000000 };
-    _eyeProjections[0][3] = vec4{ 0.000000000, 0.000000000, -0.0800003856, 0.000000000 };
-    _eyeProjections[1][0] = vec4{ 0.752847493, 0.000000000, 0.000000000, 0.000000000 };
-    _eyeProjections[1][1] = vec4{ 0.000000000, 0.678060353, 0.000000000, 0.000000000 };
-    _eyeProjections[1][2] = vec4{ 0.0578232110, -0.00669418881, -1.00000489, -1.000000000 };
-    _eyeProjections[1][3] = vec4{ 0.000000000, 0.000000000, -0.0800003856, 0.000000000 };
     // No need to do so here as this will done in Parent::internalActivate
     //_eyeInverseProjections[0] = glm::inverse(_eyeProjections[0]);
     //_eyeInverseProjections[1] = glm::inverse(_eyeProjections[1]);
diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 5bcf1e6205..c71b296a74 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -547,11 +547,12 @@ void EntityTreeRenderer::handleSpaceUpdate(std::pair<int32_t, glm::vec4> proxyUp
 bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityItemID>* entitiesContainingAvatar) {
     bool didUpdate = false;
     float radius = 0.01f; // for now, assume 0.01 meter radius, because we actually check the point inside later
-    QVector<EntityItemPointer> foundEntities;
+    QVector<QUuid> entityIDs;
 
     // find the entities near us
     // don't let someone else change our tree while we search
     _tree->withReadLock([&] {
+        auto entityTree = std::static_pointer_cast<EntityTree>(_tree);
 
         // FIXME - if EntityTree had a findEntitiesContainingPoint() this could theoretically be a little faster
         entityTree->evalEntitiesInSphere(_avatarPosition, radius, PickFilter(), entityIDs);
@@ -560,7 +561,12 @@ bool EntityTreeRenderer::findBestZoneAndMaybeContainingEntities(QVector<EntityIt
         _layeredZones.clear();
 
         // create a list of entities that actually contain the avatar's position
-        for (auto& entity : foundEntities) {
+        for (auto& entityID : entityIDs) {
+            auto entity = entityTree->findEntityByID(entityID);
+            if (!entity) {
+                continue;
+            }
+
             auto isZone = entity->getType() == EntityTypes::Zone;
             auto hasScript = !entity->getScript().isEmpty();
 
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index cdcecb2b15..286f0dd650 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -1082,13 +1082,10 @@ QUuid EntityScriptingInterface::findClosestEntity(const glm::vec3& center, float
 
     EntityItemID result;
     if (_entityTree) {
-        EntityItemPointer closestEntity;
+        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
         _entityTree->withReadLock([&] {
-            closestEntity = _entityTree->findClosestEntity(center, radius);
+            result = _entityTree->evalClosestEntity(center, radius, PickFilter(searchFilter));
         });
-        if (closestEntity) {
-            result = closestEntity->getEntityItemID();
-        }
     }
     return result;
 }
@@ -1107,14 +1104,10 @@ QVector<QUuid> EntityScriptingInterface::findEntities(const glm::vec3& center, f
 
     QVector<QUuid> result;
     if (_entityTree) {
-        QVector<EntityItemPointer> entities;
+        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
         _entityTree->withReadLock([&] {
-            _entityTree->findEntities(center, radius, entities);
+            _entityTree->evalEntitiesInSphere(center, radius, PickFilter(searchFilter), result);
         });
-
-        foreach (EntityItemPointer entity, entities) {
-            result << entity->getEntityItemID();
-        }
     }
     return result;
 }
@@ -1124,15 +1117,11 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInBox(const glm::vec3& corn
 
     QVector<QUuid> result;
     if (_entityTree) {
-        QVector<EntityItemPointer> entities;
+        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
         _entityTree->withReadLock([&] {
             AABox box(corner, dimensions);
-            _entityTree->findEntities(box, entities);
+            _entityTree->evalEntitiesInBox(box, PickFilter(searchFilter), result);
         });
-
-        foreach (EntityItemPointer entity, entities) {
-            result << entity->getEntityItemID();
-        }
     }
     return result;
 }
@@ -1167,14 +1156,10 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesInFrustum(QVariantMap frust
         viewFrustum.calculate();
 
         if (_entityTree) {
-            QVector<EntityItemPointer> entities;
+            unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
             _entityTree->withReadLock([&] {
-                _entityTree->findEntities(viewFrustum, entities);
+                _entityTree->evalEntitiesInFrustum(viewFrustum, PickFilter(searchFilter), result);
             });
-
-            foreach(EntityItemPointer entity, entities) {
-                result << entity->getEntityItemID();
-            }
         }
     }
 
@@ -1186,86 +1171,64 @@ QVector<QUuid> EntityScriptingInterface::findEntitiesByType(const QString entity
 
     QVector<QUuid> result;
     if (_entityTree) {
-        QVector<EntityItemPointer> entities;
+        unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
         _entityTree->withReadLock([&] {
-            _entityTree->findEntities(center, radius, entities);
+            _entityTree->evalEntitiesInSphereWithType(center, radius, type, PickFilter(searchFilter), result);
         });
-
-        foreach(EntityItemPointer entity, entities) {
-            if (entity->getType() == type) {
-                result << entity->getEntityItemID().toString();
-            }
-        }
     }
     return result;
 }
 
 QVector<QUuid> EntityScriptingInterface::findEntitiesByName(const QString entityName, const glm::vec3& center, float radius, bool caseSensitiveSearch) const {
-    
     QVector<QUuid> result;
     if (_entityTree) {
-        QVector<EntityItemPointer> entities;
         _entityTree->withReadLock([&] {
-            _entityTree->findEntities(center, radius, entities);
+            unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+            _entityTree->evalEntitiesInSphereWithName(center, radius, entityName, caseSensitiveSearch, PickFilter(searchFilter), result);
         });
-
-        if (caseSensitiveSearch) {
-            foreach(EntityItemPointer entity, entities) {
-                if (entity->getName() == entityName) {
-                    result << entity->getEntityItemID();
-                }
-            }
-
-        } else {
-            QString entityNameLowerCase = entityName.toLower();
-
-            foreach(EntityItemPointer entity, entities) {
-                QString entityItemLowerCase = entity->getName().toLower();
-                if (entityItemLowerCase == entityNameLowerCase) {
-                    result << entity->getEntityItemID();
-                }
-            }
-        }
     }
     return result;
 }
 
-RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking, 
-                const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
+RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersection(const PickRay& ray, bool precisionPicking,
+        const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) const {
+    PROFILE_RANGE(script_entities, __FUNCTION__);
     QVector<EntityItemID> entitiesToInclude = qVectorEntityItemIDFromScriptValue(entityIdsToInclude);
     QVector<EntityItemID> entitiesToDiscard = qVectorEntityItemIDFromScriptValue(entityIdsToDiscard);
 
-    return findRayIntersectionVector(ray, precisionPicking, entitiesToInclude, entitiesToDiscard, visibleOnly, collidableOnly);
+    unsigned int searchFilter = PickFilter::getBitMask(PickFilter::FlagBit::DOMAIN_ENTITIES) | PickFilter::getBitMask(PickFilter::FlagBit::AVATAR_ENTITIES);
+
+    if (!precisionPicking) {
+        searchFilter = searchFilter | PickFilter::getBitMask(PickFilter::FlagBit::COARSE);
+    }
+
+    if (visibleOnly) {
+        searchFilter = searchFilter | PickFilter::getBitMask(PickFilter::FlagBit::VISIBLE);
+    }
+
+    if (collidableOnly) {
+        searchFilter = searchFilter | PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE);
+    }
+
+    return evalRayIntersectionWorker(ray, Octree::Lock, PickFilter(searchFilter), entitiesToInclude, entitiesToDiscard);
 }
 
-RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionVector(const PickRay& ray, bool precisionPicking,
-                const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
+RayToEntityIntersectionResult EntityScriptingInterface::evalRayIntersectionVector(const PickRay& ray, PickFilter searchFilter,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
 
-    return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly);
+    return evalRayIntersectionWorker(ray, Octree::Lock, searchFilter, entityIdsToInclude, entityIdsToDiscard);
 }
 
-// FIXME - we should remove this API and encourage all users to use findRayIntersection() instead. We've changed
-//         findRayIntersection() to be blocking because it never makes sense for a script to get back a non-answer
-RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionBlocking(const PickRay& ray, bool precisionPicking, 
-                const QScriptValue& entityIdsToInclude, const QScriptValue& entityIdsToDiscard) {
-
-    qWarning() << "Entities.findRayIntersectionBlocking() is obsolete, use Entities.findRayIntersection() instead.";
-    const QVector<EntityItemID>& entitiesToInclude = qVectorEntityItemIDFromScriptValue(entityIdsToInclude);
-    const QVector<EntityItemID> entitiesToDiscard = qVectorEntityItemIDFromScriptValue(entityIdsToDiscard);
-    return findRayIntersectionWorker(ray, Octree::Lock, precisionPicking, entitiesToInclude, entitiesToDiscard);
-}
-
-RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionWorker(const PickRay& ray,
-        Octree::lockType lockType, bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude,
-        const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
-
+RayToEntityIntersectionResult EntityScriptingInterface::evalRayIntersectionWorker(const PickRay& ray,
+        Octree::lockType lockType, PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude,
+        const QVector<EntityItemID>& entityIdsToDiscard) const {
 
     RayToEntityIntersectionResult result;
     if (_entityTree) {
         OctreeElementPointer element;
-        result.entityID = _entityTree->findRayIntersection(ray.origin, ray.direction,
-            entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly, precisionPicking,
+        result.entityID = _entityTree->evalRayIntersection(ray.origin, ray.direction,
+            entityIdsToInclude, entityIdsToDiscard, searchFilter,
             element, result.distance, result.face, result.surfaceNormal,
             result.extraInfo, lockType, &result.accurate);
         result.intersects = !result.entityID.isNull();
@@ -1276,23 +1239,22 @@ RayToEntityIntersectionResult EntityScriptingInterface::findRayIntersectionWorke
     return result;
 }
 
-ParabolaToEntityIntersectionResult EntityScriptingInterface::findParabolaIntersectionVector(const PickParabola& parabola, bool precisionPicking,
-    const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
+ParabolaToEntityIntersectionResult EntityScriptingInterface::evalParabolaIntersectionVector(const PickParabola& parabola, PickFilter searchFilter,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
 
-    return findParabolaIntersectionWorker(parabola, Octree::Lock, precisionPicking, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly);
+    return evalParabolaIntersectionWorker(parabola, Octree::Lock, searchFilter, entityIdsToInclude, entityIdsToDiscard);
 }
 
-ParabolaToEntityIntersectionResult EntityScriptingInterface::findParabolaIntersectionWorker(const PickParabola& parabola,
-    Octree::lockType lockType, bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude,
-    const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly) {
-
+ParabolaToEntityIntersectionResult EntityScriptingInterface::evalParabolaIntersectionWorker(const PickParabola& parabola,
+    Octree::lockType lockType, PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude,
+    const QVector<EntityItemID>& entityIdsToDiscard) const {
 
     ParabolaToEntityIntersectionResult result;
     if (_entityTree) {
         OctreeElementPointer element;
-        result.entityID = _entityTree->findParabolaIntersection(parabola,
-            entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly, precisionPicking,
+        result.entityID = _entityTree->evalParabolaIntersection(parabola,
+            entityIdsToInclude, entityIdsToDiscard, searchFilter,
             element, result.intersection, result.distance, result.parabolicDistance, result.face, result.surfaceNormal,
             result.extraInfo, lockType, &result.accurate);
         result.intersects = !result.entityID.isNull();
diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h
index add7e26c6c..0e96cb2d25 100644
--- a/libraries/entities/src/EntityScriptingInterface.h
+++ b/libraries/entities/src/EntityScriptingInterface.h
@@ -24,6 +24,7 @@
 #include <OctreeScriptingInterface.h>
 #include <RegisteredMetaTypes.h>
 #include <PointerEvent.h>
+#include <PickFilter.h>
 
 #include "PolyVoxEntityItem.h"
 #include "LineEntityItem.h"
@@ -56,8 +57,7 @@ private:
 };
 
 /**jsdoc
- * The result of a {@link PickRay} search using {@link Entities.findRayIntersection|findRayIntersection} or 
- * {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}.
+ * The result of a {@link PickRay} search using {@link Entities.findRayIntersection|findRayIntersection}.
  * @typedef {object} Entities.RayToEntityIntersectionResult
  * @property {boolean} intersects - <code>true</code> if the {@link PickRay} intersected an entity, otherwise 
  *     <code>false</code>.
@@ -119,7 +119,6 @@ public:
 /// handles scripting of Entity commands from JS passed to assigned clients
 class EntityScriptingInterface : public OctreeScriptingInterface, public Dependency  {
     Q_OBJECT
-
     Q_PROPERTY(QUuid keyboardFocusEntity READ getKeyboardFocusEntity WRITE setKeyboardFocusEntity)
 
     friend EntityPropertyMetadataRequest;
@@ -144,10 +143,10 @@ public:
     void resetActivityTracking();
     ActivityTracking getActivityTracking() const { return _activityTracking; }
 
-    // TODO: expose to script?
-    ParabolaToEntityIntersectionResult findParabolaIntersectionVector(const PickParabola& parabola, bool precisionPicking,
-        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-        bool visibleOnly, bool collidableOnly);
+    RayToEntityIntersectionResult evalRayIntersectionVector(const PickRay& ray, PickFilter searchFilter,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard);
+    ParabolaToEntityIntersectionResult evalParabolaIntersectionVector(const PickParabola& parabola, PickFilter searchFilter,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard);
 
     /**jsdoc
     * Get the properties of multiple entities.
@@ -394,9 +393,8 @@ public slots:
     Q_INVOKABLE void callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, 
         const QStringList& params = QStringList());
 
-
     /**jsdoc
-     * Find the entity with a position closest to a specified point and within a specified radius.
+     * Find the non-local entity with a position closest to a specified point and within a specified radius.
      * @function Entities.findClosestEntity
      * @param {Vec3} center - The point about which to search.
      * @param {number} radius - The radius within which to search.
@@ -410,7 +408,7 @@ public slots:
     Q_INVOKABLE QUuid findClosestEntity(const glm::vec3& center, float radius) const;
 
     /**jsdoc
-     * Find all entities that intersect a sphere defined by a center point and radius.
+     * Find all non-local entities that intersect a sphere defined by a center point and radius.
      * @function Entities.findEntities
      * @param {Vec3} center - The point about which to search.
      * @param {number} radius - The radius within which to search.
@@ -424,23 +422,23 @@ public slots:
     Q_INVOKABLE QVector<QUuid> findEntities(const glm::vec3& center, float radius) const;
 
     /**jsdoc
-     * Find all entities whose axis-aligned boxes intersect a search axis-aligned box defined by its minimum coordinates corner
+     * Find all non-local entities whose axis-aligned boxes intersect a search axis-aligned box defined by its minimum coordinates corner
      * and dimensions.
      * @function Entities.findEntitiesInBox
      * @param {Vec3} corner - The corner of the search AA box with minimum co-ordinate values.
      * @param {Vec3} dimensions - The dimensions of the search AA box.
-     * @returns {Uuid[]} An array of entity IDs whose AA boxes intersect the search AA box. The array is empty if no entities 
+     * @returns {Uuid[]} An array of entity IDs whose AA boxes intersect the search AA box. The array is empty if no entities
      *     could be found.
      */
     /// this function will not find any models in script engine contexts which don't have access to models
     Q_INVOKABLE QVector<QUuid> findEntitiesInBox(const glm::vec3& corner, const glm::vec3& dimensions) const;
 
     /**jsdoc
-     * Find all entities whose axis-aligned boxes intersect a search frustum.
+     * Find all non-local entities whose axis-aligned boxes intersect a search frustum.
      * @function Entities.findEntitiesInFrustum
      * @param {ViewFrustum} frustum - The frustum to search in. The <code>position</code>, <code>orientation</code>, 
      *     <code>projection</code>, and <code>centerRadius</code> properties must be specified.
-     * @returns {Uuid[]} An array of entity IDs axis-aligned boxes intersect the frustum. The array is empty if no entities 
+     * @returns {Uuid[]} An array of entity IDs axis-aligned boxes intersect the frustum. The array is empty if no entities
      *     could be found.
      * @example <caption>Report the number of entities in view.</caption>
      * var entityIDs = Entities.findEntitiesInFrustum(Camera.frustum);
@@ -450,12 +448,12 @@ public slots:
     Q_INVOKABLE QVector<QUuid> findEntitiesInFrustum(QVariantMap frustum) const;
 
     /**jsdoc
-     * Find all entities of a particular type that intersect a sphere defined by a center point and radius.
+     * Find all non-local entities of a particular type that intersect a sphere defined by a center point and radius.
      * @function Entities.findEntitiesByType
      * @param {Entities.EntityType} entityType - The type of entity to search for.
      * @param {Vec3} center - The point about which to search.
      * @param {number} radius - The radius within which to search.
-     * @returns {Uuid[]} An array of entity IDs of the specified type that intersect the search sphere. The array is empty if 
+     * @returns {Uuid[]} An array of entity IDs of the specified type that intersect the search sphere. The array is empty if
      *     no entities could be found.
      * @example <caption>Report the number of Model entities within 10m of your avatar.</caption>
      * var entityIDs = Entities.findEntitiesByType("Model", MyAvatar.position, 10);
@@ -465,7 +463,7 @@ public slots:
     Q_INVOKABLE QVector<QUuid> findEntitiesByType(const QString entityType, const glm::vec3& center, float radius) const;
 
     /**jsdoc
-    * Find all entities of a particular name that intersect a sphere defined by a center point and radius.
+    * Find all non-local entities with a particular name that intersect a sphere defined by a center point and radius.
     * @function Entities.findEntitiesByName
     * @param {string} entityName - The name of the entity to search for.
     * @param {Vec3} center - The point about which to search.
@@ -475,13 +473,13 @@ public slots:
     *     if no entities could be found.
     * @example <caption>Report the number of entities with the name, "Light-Target".</caption>
     * var entityIDs = Entities.findEntitiesByName("Light-Target", MyAvatar.position, 10, false);
-    * print("Number of entities with the name "Light-Target": " + entityIDs.length);
+    * print("Number of entities with the name Light-Target: " + entityIDs.length);
     */
-    Q_INVOKABLE QVector<QUuid> findEntitiesByName(const QString entityName, const glm::vec3& center, float radius, 
-        bool caseSensitiveSearch = false ) const;
+    Q_INVOKABLE QVector<QUuid> findEntitiesByName(const QString entityName, const glm::vec3& center, float radius,
+        bool caseSensitiveSearch = false) const;
 
     /**jsdoc
-     * Find the first entity intersected by a {@link PickRay}. <code>Light</code> and <code>Zone</code> entities are not 
+     * Find the first non-local entity intersected by a {@link PickRay}. <code>Light</code> and <code>Zone</code> entities are not
      * intersected unless they've been configured as pickable using {@link Entities.setLightsArePickable|setLightsArePickable}
      * and {@link Entities.setZonesArePickable|setZonesArePickable}, respectively.<br />
      * @function Entities.findRayIntersection
@@ -512,33 +510,8 @@ public slots:
     /// may be inaccurate if the engine is unable to access the visible entities, in which case result.accurate
     /// will be false.
     Q_INVOKABLE RayToEntityIntersectionResult findRayIntersection(const PickRay& ray, bool precisionPicking = false,
-        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);
-
-    /**jsdoc
-     * Find the first entity intersected by a {@link PickRay}. <code>Light</code> and <code>Zone</code> entities are not 
-     * intersected unless they've been configured as pickable using {@link Entities.setLightsArePickable|setLightsArePickable} 
-     * and {@link Entities.setZonesArePickable|setZonesArePickable}, respectively.<br />
-     * This is a synonym for {@link Entities.findRayIntersection|findRayIntersection}.
-     * @function Entities.findRayIntersectionBlocking
-     * @param {PickRay} pickRay - The PickRay to use for finding entities.
-     * @param {boolean} [precisionPicking=false] - If <code>true</code> and the intersected entity is a <code>Model</code>
-     *     entity, the result's <code>extraInfo</code> property includes more information than it otherwise would.
-     * @param {Uuid[]} [entitiesToInclude=[]] - If not empty then the search is restricted to these entities.
-     * @param {Uuid[]} [entitiesToDiscard=[]] - Entities to ignore during the search.
-     * @deprecated This function is deprecated and will soon be removed. Use 
-     *    {@link Entities.findRayIntersection|findRayIntersection} instead; it blocks and performs the same function.
-     */
-    /// 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());
-
+            const QScriptValue& entityIdsToInclude = QScriptValue(), const QScriptValue& entityIdsToDiscard = QScriptValue(),
+            bool visibleOnly = false, bool collidableOnly = false) const;
 
     /**jsdoc
      * Reloads an entity's server entity script such that the latest version re-downloaded.
@@ -603,9 +576,7 @@ public slots:
     /**jsdoc
      * Set whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Light} entities. By default, Light 
      * entities are not intersected. The setting lasts for the Interface session. Ray picks are done using 
-     *     {@link Entities.findRayIntersection|findRayIntersection} or 
-     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
-     *     APIs.
+     *     {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
      * @function Entities.setLightsArePickable
      * @param {boolean} value - Set <code>true</code> to make ray picks intersect the bounding box of 
      *     {@link Entities.EntityType|Light} entities, otherwise <code>false</code>.
@@ -615,9 +586,7 @@ public slots:
 
     /**jsdoc
      * Get whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Light} entities. Ray picks are 
-     *     done using {@link Entities.findRayIntersection|findRayIntersection} or 
-     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
-     *     APIs.
+     *     done using {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
      * @function Entities.getLightsArePickable
      * @returns {boolean} <code>true</code> if ray picks intersect the bounding box of {@link Entities.EntityType|Light} 
      *     entities, otherwise <code>false</code>.
@@ -628,9 +597,7 @@ public slots:
     /**jsdoc
      * Set whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Zone} entities. By default, Light 
      * entities are not intersected. The setting lasts for the Interface session. Ray picks are done using 
-     *     {@link Entities.findRayIntersection|findRayIntersection} or 
-     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
-     *     APIs.
+     *     {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
      * @function Entities.setZonesArePickable
      * @param {boolean} value - Set <code>true</code> to make ray picks intersect the bounding box of 
      *     {@link Entities.EntityType|Zone} entities, otherwise <code>false</code>.
@@ -640,9 +607,7 @@ public slots:
 
     /**jsdoc
      * Get whether or not ray picks intersect the bounding box of {@link Entities.EntityType|Zone} entities. Ray picks are 
-     *     done using {@link Entities.findRayIntersection|findRayIntersection} or 
-     *     {@link Entities.findRayIntersectionBlocking|findRayIntersectionBlocking}, or the {@link Picks} and {@link RayPick} 
-     *     APIs.
+     *     done using {@link Entities.findRayIntersection|findRayIntersection}, or the {@link Picks} API.
      * @function Entities.getZonesArePickable
      * @returns {boolean} <code>true</code> if ray picks intersect the bounding box of {@link Entities.EntityType|Zone} 
      *      entities, otherwise <code>false</code>.
@@ -2100,14 +2065,12 @@ private:
 
 
     /// actually does the work of finding the ray intersection, can be called in locking mode or tryLock mode
-    RayToEntityIntersectionResult findRayIntersectionWorker(const PickRay& ray, Octree::lockType lockType,
-        bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-        bool visibleOnly = false, bool collidableOnly = false);
+    RayToEntityIntersectionResult evalRayIntersectionWorker(const PickRay& ray, Octree::lockType lockType,
+        PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) const;
 
     /// actually does the work of finding the parabola intersection, can be called in locking mode or tryLock mode
-    ParabolaToEntityIntersectionResult findParabolaIntersectionWorker(const PickParabola& parabola, Octree::lockType lockType,
-        bool precisionPicking, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-        bool visibleOnly = false, bool collidableOnly = false);
+    ParabolaToEntityIntersectionResult evalParabolaIntersectionWorker(const PickParabola& parabola, Octree::lockType lockType,
+        PickFilter searchFilter, const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard) const;
 
     EntityTreePointer _entityTree;
 
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 98fcdc1db1..954462a9f2 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -43,50 +43,6 @@
 static const quint64 DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER = USECS_PER_MSEC * 50;
 const float EntityTree::DEFAULT_MAX_TMP_ENTITY_LIFETIME = 60 * 60; // 1 hour
 
-// combines the ray cast arguments into a single object
-class RayArgs {
-public:
-    // Inputs
-    glm::vec3 origin;
-    glm::vec3 direction;
-    glm::vec3 invDirection;
-    const QVector<EntityItemID>& entityIdsToInclude;
-    const QVector<EntityItemID>& entityIdsToDiscard;
-    bool visibleOnly;
-    bool collidableOnly;
-    bool precisionPicking;
-
-    // Outputs
-    OctreeElementPointer& element;
-    float& distance;
-    BoxFace& face;
-    glm::vec3& surfaceNormal;
-    QVariantMap& extraInfo;
-    EntityItemID entityID;
-};
-
-class ParabolaArgs {
-public:
-    // Inputs
-    glm::vec3 origin;
-    glm::vec3 velocity;
-    glm::vec3 acceleration;
-    const QVector<EntityItemID>& entityIdsToInclude;
-    const QVector<EntityItemID>& entityIdsToDiscard;
-    bool visibleOnly;
-    bool collidableOnly;
-    bool precisionPicking;
-
-    // Outputs
-    OctreeElementPointer& element;
-    float& parabolicDistance;
-    BoxFace& face;
-    glm::vec3& surfaceNormal;
-    QVariantMap& extraInfo;
-    EntityItemID entityID;
-};
-
-
 EntityTree::EntityTree(bool shouldReaverage) :
     Octree(shouldReaverage)
 {
@@ -816,59 +772,32 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator)
     }
 }
 
-
-class FindNearPointArgs {
+class RayArgs {
 public:
-    glm::vec3 position;
-    float targetRadius;
-    bool found;
-    EntityItemPointer closestEntity;
-    float closestEntityDistance;
+    // Inputs
+    glm::vec3 origin;
+    glm::vec3 direction;
+    glm::vec3 invDirection;
+    const QVector<EntityItemID>& entityIdsToInclude;
+    const QVector<EntityItemID>& entityIdsToDiscard;
+    PickFilter searchFilter;
+
+    // Outputs
+    OctreeElementPointer& element;
+    float& distance;
+    BoxFace& face;
+    glm::vec3& surfaceNormal;
+    QVariantMap& extraInfo;
+    EntityItemID entityID;
 };
 
-
-bool EntityTree::findNearPointOperation(const OctreeElementPointer& element, void* extraData) {
-    FindNearPointArgs* args = static_cast<FindNearPointArgs*>(extraData);
-    EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-
-    glm::vec3 penetration;
-    bool sphereIntersection = entityTreeElement->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
-
-    // If this entityTreeElement contains the point, then search it...
-    if (sphereIntersection) {
-        EntityItemPointer thisClosestEntity = entityTreeElement->getClosestEntity(args->position);
-
-        // we may have gotten NULL back, meaning no entity was available
-        if (thisClosestEntity) {
-            glm::vec3 entityPosition = thisClosestEntity->getWorldPosition();
-            float distanceFromPointToEntity = glm::distance(entityPosition, args->position);
-
-            // If we're within our target radius
-            if (distanceFromPointToEntity <= args->targetRadius) {
-                // we are closer than anything else we've found
-                if (distanceFromPointToEntity < args->closestEntityDistance) {
-                    args->closestEntity = thisClosestEntity;
-                    args->closestEntityDistance = distanceFromPointToEntity;
-                    args->found = true;
-                }
-            }
-        }
-
-        // we should be able to optimize this...
-        return true; // keep searching in case children have closer entities
-    }
-
-    // if this element doesn't contain the point, then none of its children can contain the point, so stop searching
-    return false;
-}
-
-bool findRayIntersectionOp(const OctreeElementPointer& element, void* extraData) {
+bool evalRayIntersectionOp(const OctreeElementPointer& element, void* extraData) {
     RayArgs* args = static_cast<RayArgs*>(extraData);
     bool keepSearching = true;
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
-    EntityItemID entityID = entityTreeElementPointer->findRayIntersection(args->origin, args->direction,
+    EntityItemID entityID = entityTreeElementPointer->evalRayIntersection(args->origin, args->direction,
         args->element, args->distance, args->face, args->surfaceNormal, args->entityIdsToInclude,
-        args->entityIdsToDiscard, args->visibleOnly, args->collidableOnly, args->extraInfo, args->precisionPicking);
+        args->entityIdsToDiscard, args->searchFilter, args->extraInfo);
     if (!entityID.isNull()) {
         args->entityID = entityID;
         // We recurse OctreeElements in order, so if we hit something, we can stop immediately
@@ -877,7 +806,7 @@ bool findRayIntersectionOp(const OctreeElementPointer& element, void* extraData)
     return keepSearching;
 }
 
-float findRayIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
+float evalRayIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
     RayArgs* args = static_cast<RayArgs*>(extraData);
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
     float distance = FLT_MAX;
@@ -898,19 +827,18 @@ float findRayIntersectionSortingOp(const OctreeElementPointer& element, void* ex
     return distance;
 }
 
-EntityItemID EntityTree::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+EntityItemID EntityTree::evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                                     QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-                                    bool visibleOnly, bool collidableOnly, bool precisionPicking, 
-                                    OctreeElementPointer& element, float& distance,
+                                    PickFilter searchFilter, OctreeElementPointer& element, float& distance,
                                     BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
                                     Octree::lockType lockType, bool* accurateResult) {
     RayArgs args = { origin, direction, 1.0f / direction, entityIdsToInclude, entityIdsToDiscard,
-            visibleOnly, collidableOnly, precisionPicking, element, distance, face, surfaceNormal, extraInfo, EntityItemID() };
+            searchFilter, element, distance, face, surfaceNormal, extraInfo, EntityItemID() };
     distance = FLT_MAX;
 
     bool requireLock = lockType == Octree::Lock;
     bool lockResult = withReadLock([&]{
-        recurseTreeWithOperationSorted(findRayIntersectionOp, findRayIntersectionSortingOp, &args);
+        recurseTreeWithOperationSorted(evalRayIntersectionOp, evalRayIntersectionSortingOp, &args);
     }, requireLock);
 
     if (accurateResult) {
@@ -920,13 +848,32 @@ EntityItemID EntityTree::findRayIntersection(const glm::vec3& origin, const glm:
     return args.entityID;
 }
 
-bool findParabolaIntersectionOp(const OctreeElementPointer& element, void* extraData) {
+class ParabolaArgs {
+public:
+    // Inputs
+    glm::vec3 origin;
+    glm::vec3 velocity;
+    glm::vec3 acceleration;
+    const QVector<EntityItemID>& entityIdsToInclude;
+    const QVector<EntityItemID>& entityIdsToDiscard;
+    PickFilter searchFilter;
+
+    // Outputs
+    OctreeElementPointer& element;
+    float& parabolicDistance;
+    BoxFace& face;
+    glm::vec3& surfaceNormal;
+    QVariantMap& extraInfo;
+    EntityItemID entityID;
+};
+
+bool evalParabolaIntersectionOp(const OctreeElementPointer& element, void* extraData) {
     ParabolaArgs* args = static_cast<ParabolaArgs*>(extraData);
     bool keepSearching = true;
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
-    EntityItemID entityID = entityTreeElementPointer->findParabolaIntersection(args->origin, args->velocity, args->acceleration,
+    EntityItemID entityID = entityTreeElementPointer->evalParabolaIntersection(args->origin, args->velocity, args->acceleration,
         args->element, args->parabolicDistance, args->face, args->surfaceNormal, args->entityIdsToInclude,
-        args->entityIdsToDiscard, args->visibleOnly, args->collidableOnly, args->extraInfo, args->precisionPicking);
+        args->entityIdsToDiscard, args->searchFilter, args->extraInfo);
     if (!entityID.isNull()) {
         args->entityID = entityID;
         // We recurse OctreeElements in order, so if we hit something, we can stop immediately
@@ -935,7 +882,7 @@ bool findParabolaIntersectionOp(const OctreeElementPointer& element, void* extra
     return keepSearching;
 }
 
-float findParabolaIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
+float evalParabolaIntersectionSortingOp(const OctreeElementPointer& element, void* extraData) {
     ParabolaArgs* args = static_cast<ParabolaArgs*>(extraData);
     EntityTreeElementPointer entityTreeElementPointer = std::static_pointer_cast<EntityTreeElement>(element);
     float distance = FLT_MAX;
@@ -956,20 +903,20 @@ float findParabolaIntersectionSortingOp(const OctreeElementPointer& element, voi
     return distance;
 }
 
-EntityItemID EntityTree::findParabolaIntersection(const PickParabola& parabola,
+EntityItemID EntityTree::evalParabolaIntersection(const PickParabola& parabola,
                                     QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-                                    bool visibleOnly, bool collidableOnly, bool precisionPicking,
+                                    PickFilter searchFilter,
                                     OctreeElementPointer& element, glm::vec3& intersection, float& distance, float& parabolicDistance,
                                     BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
                                     Octree::lockType lockType, bool* accurateResult) {
     ParabolaArgs args = { parabola.origin, parabola.velocity, parabola.acceleration, entityIdsToInclude, entityIdsToDiscard,
-        visibleOnly, collidableOnly, precisionPicking, element, parabolicDistance, face, surfaceNormal, extraInfo, EntityItemID() };
+        searchFilter, element, parabolicDistance, face, surfaceNormal, extraInfo, EntityItemID() };
     parabolicDistance = FLT_MAX;
     distance = FLT_MAX;
 
     bool requireLock = lockType == Octree::Lock;
     bool lockResult = withReadLock([&] {
-        recurseTreeWithOperationSorted(findParabolaIntersectionOp, findParabolaIntersectionSortingOp, &args);
+        recurseTreeWithOperationSorted(evalParabolaIntersectionOp, evalParabolaIntersectionSortingOp, &args);
     }, requireLock);
 
     if (accurateResult) {
@@ -984,33 +931,80 @@ EntityItemID EntityTree::findParabolaIntersection(const PickParabola& parabola,
     return args.entityID;
 }
 
-
-EntityItemPointer EntityTree::findClosestEntity(const glm::vec3& position, float targetRadius) {
-    FindNearPointArgs args = { position, targetRadius, false, NULL, FLT_MAX };
-    withReadLock([&] {
-        // NOTE: This should use recursion, since this is a spatial operation
-        recurseTreeWithOperation(findNearPointOperation, &args);
-    });
-    return args.closestEntity;
-}
-
-class FindAllNearPointArgs {
+class FindClosestEntityArgs {
 public:
+    // Inputs
     glm::vec3 position;
     float targetRadius;
-    QVector<EntityItemPointer> entities;
+    PickFilter searchFilter;
+
+    // Outputs
+    QUuid closestEntity;
+    float closestEntityDistance;
 };
 
 
-bool EntityTree::findInSphereOperation(const OctreeElementPointer& element, void* extraData) {
-    FindAllNearPointArgs* args = static_cast<FindAllNearPointArgs*>(extraData);
+bool evalClosestEntityOperation(const OctreeElementPointer& element, void* extraData) {
+    FindClosestEntityArgs* args = static_cast<FindClosestEntityArgs*>(extraData);
+    EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+
+    glm::vec3 penetration;
+    bool sphereIntersection = entityTreeElement->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
+
+    // If this entityTreeElement contains the point, then search it...
+    if (sphereIntersection) {
+        float closestDistanceSquared = FLT_MAX;
+        QUuid thisClosestEntity = entityTreeElement->evalClosetEntity(args->position, args->searchFilter, closestDistanceSquared);
+
+        // we may have gotten NULL back, meaning no entity was available
+        if (!thisClosestEntity.isNull()) {
+            float distanceFromPointToEntity = glm::sqrt(closestDistanceSquared);
+
+            // If we're within our target radius
+            if (distanceFromPointToEntity <= args->targetRadius) {
+                // we are closer than anything else we've found
+                if (distanceFromPointToEntity < args->closestEntityDistance) {
+                    args->closestEntity = thisClosestEntity;
+                    args->closestEntityDistance = distanceFromPointToEntity;
+                }
+            }
+        }
+
+        // we should be able to optimize this...
+        return true; // keep searching in case children have closer entities
+    }
+
+    // if this element doesn't contain the point, then none of its children can contain the point, so stop searching
+    return false;
+}
+
+// NOTE: assumes caller has handled locking
+QUuid EntityTree::evalClosestEntity(const glm::vec3& position, float targetRadius, PickFilter searchFilter) {
+    FindClosestEntityArgs args = { position, targetRadius, searchFilter, QUuid(), FLT_MAX };
+    recurseTreeWithOperation(evalClosestEntityOperation, &args);
+    return args.closestEntity;
+}
+
+class FindEntitiesInSphereArgs {
+public:
+    // Inputs
+    glm::vec3 position;
+    float targetRadius;
+    PickFilter searchFilter;
+
+    // Outputs
+    QVector<QUuid> entities;
+};
+
+bool evalInSphereOperation(const OctreeElementPointer& element, void* extraData) {
+    FindEntitiesInSphereArgs* args = static_cast<FindEntitiesInSphereArgs*>(extraData);
     glm::vec3 penetration;
     bool sphereIntersection = element->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
 
     // If this element contains the point, then search it...
     if (sphereIntersection) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->getEntities(args->position, args->targetRadius, args->entities);
+        entityTreeElement->evalEntitiesInSphere(args->position, args->targetRadius, args->searchFilter, args->entities);
         return true; // keep searching in case children have closer entities
     }
 
@@ -1019,102 +1013,166 @@ bool EntityTree::findInSphereOperation(const OctreeElementPointer& element, void
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::findEntities(const glm::vec3& center, float radius, QVector<EntityItemPointer>& foundEntities) {
-    FindAllNearPointArgs args = { center, radius, QVector<EntityItemPointer>() };
-    // NOTE: This should use recursion, since this is a spatial operation
-    recurseTreeWithOperation(findInSphereOperation, &args);
+void EntityTree::evalEntitiesInSphere(const glm::vec3& center, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
+    FindEntitiesInSphereArgs args = { center, radius, searchFilter, QVector<QUuid>() };
+    recurseTreeWithOperation(evalInSphereOperation, &args);
+    foundEntities.swap(args.entities);
+}
 
-    // swap the two lists of entity pointers instead of copy
+class FindEntitiesInSphereWithTypeArgs {
+public:
+    // Inputs
+    glm::vec3 position;
+    float targetRadius;
+    EntityTypes::EntityType type;
+    PickFilter searchFilter;
+
+    // Outputs
+    QVector<QUuid> entities;
+};
+
+bool evalInSphereWithTypeOperation(const OctreeElementPointer& element, void* extraData) {
+    FindEntitiesInSphereWithTypeArgs* args = static_cast<FindEntitiesInSphereWithTypeArgs*>(extraData);
+    glm::vec3 penetration;
+    bool sphereIntersection = element->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
+
+    // If this element contains the point, then search it...
+    if (sphereIntersection) {
+        EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+        entityTreeElement->evalEntitiesInSphereWithType(args->position, args->targetRadius, args->type, args->searchFilter, args->entities);
+        return true; // keep searching in case children have closer entities
+    }
+
+    // if this element doesn't contain the point, then none of it's children can contain the point, so stop searching
+    return false;
+}
+
+// NOTE: assumes caller has handled locking
+void EntityTree::evalEntitiesInSphereWithType(const glm::vec3& center, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
+    FindEntitiesInSphereWithTypeArgs args = { center, radius, type, searchFilter, QVector<QUuid>() };
+    recurseTreeWithOperation(evalInSphereWithTypeOperation, &args);
+    foundEntities.swap(args.entities);
+}
+
+class FindEntitiesInSphereWithNameArgs {
+public:
+    // Inputs
+    glm::vec3 position;
+    float targetRadius;
+    QString name;
+    bool caseSensitive;
+    PickFilter searchFilter;
+
+    // Outputs
+    QVector<QUuid> entities;
+};
+
+bool evalInSphereWithNameOperation(const OctreeElementPointer& element, void* extraData) {
+    FindEntitiesInSphereWithNameArgs* args = static_cast<FindEntitiesInSphereWithNameArgs*>(extraData);
+    glm::vec3 penetration;
+    bool sphereIntersection = element->getAACube().findSpherePenetration(args->position, args->targetRadius, penetration);
+
+    // If this element contains the point, then search it...
+    if (sphereIntersection) {
+        EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+        entityTreeElement->evalEntitiesInSphereWithName(args->position, args->targetRadius, args->name, args->caseSensitive, args->searchFilter, args->entities);
+        return true; // keep searching in case children have closer entities
+    }
+
+    // if this element doesn't contain the point, then none of it's children can contain the point, so stop searching
+    return false;
+}
+
+// NOTE: assumes caller has handled locking
+void EntityTree::evalEntitiesInSphereWithName(const glm::vec3& center, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
+    FindEntitiesInSphereWithNameArgs args = { center, radius, name, caseSensitive, searchFilter, QVector<QUuid>() };
+    recurseTreeWithOperation(evalInSphereWithNameOperation, &args);
     foundEntities.swap(args.entities);
 }
 
 class FindEntitiesInCubeArgs {
 public:
-    FindEntitiesInCubeArgs(const AACube& cube)
-        : _cube(cube), _foundEntities() {
-    }
+    // Inputs
+    AACube cube;
+    PickFilter searchFilter;
 
-    AACube _cube;
-    QVector<EntityItemPointer> _foundEntities;
+    // Outputs
+    QVector<QUuid> entities;
 };
 
-bool EntityTree::findInCubeOperation(const OctreeElementPointer& element, void* extraData) {
+bool findInCubeOperation(const OctreeElementPointer& element, void* extraData) {
     FindEntitiesInCubeArgs* args = static_cast<FindEntitiesInCubeArgs*>(extraData);
-    if (element->getAACube().touches(args->_cube)) {
+    if (element->getAACube().touches(args->cube)) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->getEntities(args->_cube, args->_foundEntities);
+        entityTreeElement->evalEntitiesInCube(args->cube, args->searchFilter, args->entities);
         return true;
     }
     return false;
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::findEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities) {
-    FindEntitiesInCubeArgs args(cube);
-    // NOTE: This should use recursion, since this is a spatial operation
+void EntityTree::evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
+    FindEntitiesInCubeArgs args { cube, searchFilter, QVector<QUuid>() };
     recurseTreeWithOperation(findInCubeOperation, &args);
-    // swap the two lists of entity pointers instead of copy
-    foundEntities.swap(args._foundEntities);
+    foundEntities.swap(args.entities);
 }
 
 class FindEntitiesInBoxArgs {
 public:
-    FindEntitiesInBoxArgs(const AABox& box)
-    : _box(box), _foundEntities() {
-    }
+    // Inputs
+    AABox box;
+    PickFilter searchFilter;
 
-    AABox _box;
-    QVector<EntityItemPointer> _foundEntities;
+    // Outputs
+    QVector<QUuid> entities;
 };
 
-bool EntityTree::findInBoxOperation(const OctreeElementPointer& element, void* extraData) {
+bool findInBoxOperation(const OctreeElementPointer& element, void* extraData) {
     FindEntitiesInBoxArgs* args = static_cast<FindEntitiesInBoxArgs*>(extraData);
-    if (element->getAACube().touches(args->_box)) {
+    if (element->getAACube().touches(args->box)) {
         EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->getEntities(args->_box, args->_foundEntities);
+        entityTreeElement->evalEntitiesInBox(args->box, args->searchFilter, args->entities);
         return true;
     }
     return false;
 }
 
 // NOTE: assumes caller has handled locking
-void EntityTree::findEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities) {
-    FindEntitiesInBoxArgs args(box);
+void EntityTree::evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
+    FindEntitiesInBoxArgs args { box, searchFilter, QVector<QUuid>() };
     // NOTE: This should use recursion, since this is a spatial operation
     recurseTreeWithOperation(findInBoxOperation, &args);
     // swap the two lists of entity pointers instead of copy
-    foundEntities.swap(args._foundEntities);
-}
-
-class FindInFrustumArgs {
-public:
-    ViewFrustum frustum;
-    QVector<EntityItemPointer> entities;
-};
-
-bool EntityTree::findInFrustumOperation(const OctreeElementPointer& element, void* extraData) {
-    FindInFrustumArgs* args = static_cast<FindInFrustumArgs*>(extraData);
-    if (element->isInView(args->frustum)) {
-        EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
-        entityTreeElement->getEntities(args->frustum, args->entities);
-        return true;
-    }
-    return false;
-}
-
-// NOTE: assumes caller has handled locking
-void EntityTree::findEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities) {
-    FindInFrustumArgs args = { frustum, QVector<EntityItemPointer>() };
-    // NOTE: This should use recursion, since this is a spatial operation
-    recurseTreeWithOperation(findInFrustumOperation, &args);
-    // swap the two lists of entity pointers instead of copy
     foundEntities.swap(args.entities);
 }
 
+class FindEntitiesInFrustumArgs {
+public:
+    // Inputs
+    ViewFrustum frustum;
+    PickFilter searchFilter;
+
+    // Outputs
+    QVector<QUuid> entities;
+};
+
+bool findInFrustumOperation(const OctreeElementPointer& element, void* extraData) {
+    FindEntitiesInFrustumArgs* args = static_cast<FindEntitiesInFrustumArgs*>(extraData);
+    if (element->isInView(args->frustum)) {
+        EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+        entityTreeElement->evalEntitiesInFrustum(args->frustum, args->searchFilter, args->entities);
+        return true;
+    }
+    return false;
+}
+
 // NOTE: assumes caller has handled locking
-void EntityTree::findEntities(RecurseOctreeOperation& elementFilter,
-                              QVector<EntityItemPointer>& foundEntities) {
-    recurseTreeWithOperation(elementFilter, nullptr);
+void EntityTree::evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities) {
+    FindEntitiesInFrustumArgs args = { frustum, searchFilter, QVector<QUuid>() };
+    // NOTE: This should use recursion, since this is a spatial operation
+    recurseTreeWithOperation(findInFrustumOperation, &args);
+    // swap the two lists of entity pointers instead of copy
+    foundEntities.swap(args.entities);
 }
 
 EntityItemPointer EntityTree::findEntityByID(const QUuid& id) const {
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index 46c45714aa..f9b7b8d67f 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -45,7 +45,6 @@ public:
     QHash<EntityItemID, EntityItemID>* map;
 };
 
-
 class EntityTree : public Octree, public SpatialParentTree {
     Q_OBJECT
 public:
@@ -94,18 +93,16 @@ public:
     virtual void processChallengeOwnershipReplyPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
     virtual void processChallengeOwnershipPacket(ReceivedMessage& message, const SharedNodePointer& sourceNode) override;
 
-    virtual EntityItemID findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+    virtual EntityItemID evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
         QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-        bool visibleOnly, bool collidableOnly, bool precisionPicking, 
-        OctreeElementPointer& element, float& distance,
+        PickFilter searchFilter, OctreeElementPointer& element, float& distance,
         BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
         Octree::lockType lockType = Octree::TryLock, bool* accurateResult = NULL);
 
-    virtual EntityItemID findParabolaIntersection(const PickParabola& parabola,
+    virtual EntityItemID evalParabolaIntersection(const PickParabola& parabola,
         QVector<EntityItemID> entityIdsToInclude, QVector<EntityItemID> entityIdsToDiscard,
-        bool visibleOnly, bool collidableOnly, bool precisionPicking,
-        OctreeElementPointer& element, glm::vec3& intersection, float& distance, float& parabolicDistance,
-        BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
+        PickFilter searchFilter, OctreeElementPointer& element, glm::vec3& intersection,
+        float& distance, float& parabolicDistance, BoxFace& face, glm::vec3& surfaceNormal, QVariantMap& extraInfo,
         Octree::lockType lockType = Octree::TryLock, bool* accurateResult = NULL);
 
     virtual bool rootElementHasData() const override { return true; }
@@ -130,44 +127,19 @@ public:
     void deleteEntity(const EntityItemID& entityID, bool force = false, bool ignoreWarnings = true);
     void deleteEntities(QSet<EntityItemID> entityIDs, bool force = false, bool ignoreWarnings = true);
 
-    /// \param position point of query in world-frame (meters)
-    /// \param targetRadius radius of query (meters)
-    EntityItemPointer findClosestEntity(const glm::vec3& position, float targetRadius);
     EntityItemPointer findEntityByID(const QUuid& id) const;
     EntityItemPointer findEntityByEntityItemID(const EntityItemID& entityID) const;
     virtual SpatiallyNestablePointer findByID(const QUuid& id) const override { return findEntityByID(id); }
 
     EntityItemID assignEntityID(const EntityItemID& entityItemID); /// Assigns a known ID for a creator token ID
 
-
-    /// finds all entities that touch a sphere
-    /// \param center the center of the sphere in world-frame (meters)
-    /// \param radius the radius of the sphere in world-frame (meters)
-    /// \param foundEntities[out] vector of EntityItemPointer
-    /// \remark Side effect: any initial contents in foundEntities will be lost
-    void findEntities(const glm::vec3& center, float radius, QVector<EntityItemPointer>& foundEntities);
-
-    /// finds all entities that touch a cube
-    /// \param cube the query cube in world-frame (meters)
-    /// \param foundEntities[out] vector of non-EntityItemPointer
-    /// \remark Side effect: any initial contents in entities will be lost
-    void findEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities);
-
-    /// finds all entities that touch a box
-    /// \param box the query box in world-frame (meters)
-    /// \param foundEntities[out] vector of non-EntityItemPointer
-    /// \remark Side effect: any initial contents in entities will be lost
-    void findEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities);
-
-    /// finds all entities within a frustum
-    /// \parameter frustum the query frustum
-    /// \param foundEntities[out] vector of EntityItemPointer
-    void findEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities);
-
-    /// finds all entities that match scanOperator
-    /// \parameter scanOperator function that scans entities that match criteria
-    /// \parameter foundEntities[out] vector of EntityItemPointer
-    void findEntities(RecurseOctreeOperation& scanOperator, QVector<EntityItemPointer>& foundEntities);
+    QUuid evalClosestEntity(const glm::vec3& position, float targetRadius, PickFilter searchFilter);
+    void evalEntitiesInSphere(const glm::vec3& center, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities);
+    void evalEntitiesInSphereWithType(const glm::vec3& center, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities);
+    void evalEntitiesInSphereWithName(const glm::vec3& center, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities);
+    void evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities);
+    void evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities);
+    void evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities);
 
     void addNewlyCreatedHook(NewlyCreatedEntityHook* hook);
     void removeNewlyCreatedHook(NewlyCreatedEntityHook* hook);
@@ -327,11 +299,6 @@ protected:
     void processRemovedEntities(const DeleteEntityOperator& theOperator);
     bool updateEntity(EntityItemPointer entity, const EntityItemProperties& properties,
             const SharedNodePointer& senderNode = SharedNodePointer(nullptr));
-    static bool findNearPointOperation(const OctreeElementPointer& element, void* extraData);
-    static bool findInSphereOperation(const OctreeElementPointer& element, void* extraData);
-    static bool findInCubeOperation(const OctreeElementPointer& element, void* extraData);
-    static bool findInBoxOperation(const OctreeElementPointer& element, void* extraData);
-    static bool findInFrustumOperation(const OctreeElementPointer& element, void* extraData);
     static bool sendEntitiesOperation(const OctreeElementPointer& element, void* extraData);
     static void bumpTimestamp(EntityItemProperties& properties);
 
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index b6fdea4e0d..3b085457d1 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -139,10 +139,23 @@ bool EntityTreeElement::bestFitBounds(const glm::vec3& minPoint, const glm::vec3
     return false;
 }
 
-EntityItemID EntityTreeElement::findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
-    OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
-    const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-    bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking) {
+bool checkFilterSettings(const EntityItemPointer& entity, PickFilter searchFilter) {
+    bool visible = entity->isVisible();
+    bool collidable = !entity->getCollisionless() && (entity->getShapeType() != SHAPE_TYPE_NONE);
+    if ((!searchFilter.doesPickVisible() && visible) || (!searchFilter.doesPickInvisible() && !visible) ||
+        (!searchFilter.doesPickCollidable() && collidable) || (!searchFilter.doesPickNonCollidable() && !collidable) ||
+        (!searchFilter.doesPickDomainEntities() && entity->isDomainEntity()) ||
+        (!searchFilter.doesPickAvatarEntities() && entity->isAvatarEntity()) ||
+        (!searchFilter.doesPickLocalEntities() && entity->isLocalEntity())) {
+        return false;
+    }
+    return true;
+}
+
+EntityItemID EntityTreeElement::evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+        OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
+        const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
+        PickFilter searchFilter, QVariantMap& extraInfo) {
 
     EntityItemID result;
     BoxFace localFace { UNKNOWN_FACE };
@@ -154,9 +167,8 @@ EntityItemID EntityTreeElement::findRayIntersection(const glm::vec3& origin, con
 
     QVariantMap localExtraInfo;
     float distanceToElementDetails = distance;
-    EntityItemID entityID = findDetailedRayIntersection(origin, direction, element, distanceToElementDetails,
-            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly,
-            localExtraInfo, precisionPicking);
+    EntityItemID entityID = evalDetailedRayIntersection(origin, direction, element, distanceToElementDetails,
+            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, searchFilter, localExtraInfo);
     if (!entityID.isNull() && distanceToElementDetails < distance) {
         distance = distanceToElementDetails;
         face = localFace;
@@ -167,13 +179,12 @@ EntityItemID EntityTreeElement::findRayIntersection(const glm::vec3& origin, con
     return result;
 }
 
-EntityItemID EntityTreeElement::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                                     OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
                                     const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIDsToDiscard,
-                                    bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking) {
+                                    PickFilter searchFilter, QVariantMap& extraInfo) {
 
     // only called if we do intersect our bounding cube, but find if we actually intersect with entities...
-    int entityNumber = 0;
     EntityItemID entityID;
     forEachEntity([&](EntityItemPointer entity) {
         if (entity->getIgnorePickIntersection()) {
@@ -191,11 +202,9 @@ EntityItemID EntityTreeElement::findDetailedRayIntersection(const glm::vec3& ori
             return;
         }
 
-        // check RayPick filter settings
-        if ((visibleOnly && !entity->isVisible())
-                || (collidableOnly && (entity->getCollisionless() || entity->getShapeType() == SHAPE_TYPE_NONE))
-                || (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID()))
-                || (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID())) ) {
+        if (!checkFilterSettings(entity, searchFilter) ||
+            (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID())) ||
+            (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID())) ) {
             return;
         }
 
@@ -226,7 +235,7 @@ EntityItemID EntityTreeElement::findDetailedRayIntersection(const glm::vec3& ori
                 if (entity->supportsDetailedIntersection()) {
                     QVariantMap localExtraInfo;
                     if (entity->findDetailedRayIntersection(origin, direction, element, localDistance,
-                            localFace, localSurfaceNormal, localExtraInfo, precisionPicking)) {
+                            localFace, localSurfaceNormal, localExtraInfo, searchFilter.isPrecise())) {
                         if (localDistance < distance) {
                             distance = localDistance;
                             face = localFace;
@@ -248,7 +257,6 @@ EntityItemID EntityTreeElement::findDetailedRayIntersection(const glm::vec3& ori
                 }
             }
         }
-        entityNumber++;
     });
     return entityID;
 }
@@ -279,11 +287,10 @@ bool EntityTreeElement::findSpherePenetration(const glm::vec3& center, float rad
     return result;
 }
 
-EntityItemID EntityTreeElement::findParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
+EntityItemID EntityTreeElement::evalParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
     const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
     BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-    const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
-    QVariantMap& extraInfo, bool precisionPicking) {
+    const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo) {
 
     EntityItemID result;
     BoxFace localFace;
@@ -304,9 +311,8 @@ EntityItemID EntityTreeElement::findParabolaIntersection(const glm::vec3& origin
     }
     // Get the normal of the plane, the cross product of two vectors on the plane
     glm::vec3 normal = glm::normalize(glm::cross(vectorOnPlane, acceleration));
-    EntityItemID entityID = findDetailedParabolaIntersection(origin, velocity, acceleration, normal, element, distanceToElementDetails,
-            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, visibleOnly, collidableOnly,
-            localExtraInfo, precisionPicking);
+    EntityItemID entityID = evalDetailedParabolaIntersection(origin, velocity, acceleration, normal, element, distanceToElementDetails,
+            localFace, localSurfaceNormal, entityIdsToInclude, entityIdsToDiscard, searchFilter, localExtraInfo);
     if (!entityID.isNull() && distanceToElementDetails < parabolicDistance) {
         parabolicDistance = distanceToElementDetails;
         face = localFace;
@@ -317,13 +323,12 @@ EntityItemID EntityTreeElement::findParabolaIntersection(const glm::vec3& origin
     return result;
 }
 
-EntityItemID EntityTreeElement::findDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity, const glm::vec3& acceleration,
+EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity, const glm::vec3& acceleration,
                                     const glm::vec3& normal, OctreeElementPointer& element, float& parabolicDistance, BoxFace& face, glm::vec3& surfaceNormal,
                                     const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIDsToDiscard,
-                                    bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking) {
+                                    PickFilter searchFilter, QVariantMap& extraInfo) {
 
     // only called if we do intersect our bounding cube, but find if we actually intersect with entities...
-    int entityNumber = 0;
     EntityItemID entityID;
     forEachEntity([&](EntityItemPointer entity) {
         if (entity->getIgnorePickIntersection()) {
@@ -346,11 +351,9 @@ EntityItemID EntityTreeElement::findDetailedParabolaIntersection(const glm::vec3
             return;
         }
 
-        // check RayPick filter settings
-        if ((visibleOnly && !entity->isVisible())
-                || (collidableOnly && (entity->getCollisionless() || entity->getShapeType() == SHAPE_TYPE_NONE))
-                || (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID()))
-                || (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID())) ) {
+        if (!checkFilterSettings(entity, searchFilter) ||
+            (entityIdsToInclude.size() > 0 && !entityIdsToInclude.contains(entity->getID())) ||
+            (entityIDsToDiscard.size() > 0 && entityIDsToDiscard.contains(entity->getID()))) {
             return;
         }
 
@@ -382,7 +385,7 @@ EntityItemID EntityTreeElement::findDetailedParabolaIntersection(const glm::vec3
                 if (entity->supportsDetailedIntersection()) {
                     QVariantMap localExtraInfo;
                     if (entity->findDetailedParabolaIntersection(origin, velocity, acceleration, element, localDistance,
-                            localFace, localSurfaceNormal, localExtraInfo, precisionPicking)) {
+                            localFace, localSurfaceNormal, localExtraInfo, searchFilter.isPrecise())) {
                         if (localDistance < parabolicDistance) {
                             parabolicDistance = localDistance;
                             face = localFace;
@@ -404,55 +407,56 @@ EntityItemID EntityTreeElement::findDetailedParabolaIntersection(const glm::vec3
                 }
             }
         }
-        entityNumber++;
     });
     return entityID;
 }
 
-EntityItemPointer EntityTreeElement::getClosestEntity(glm::vec3 position) const {
-    EntityItemPointer closestEntity = NULL;
-    float closestEntityDistance = FLT_MAX;
-    withReadLock([&] {
-        foreach(EntityItemPointer entity, _entityItems) {
-            float distanceToEntity = glm::distance2(position, entity->getWorldPosition());
-            if (distanceToEntity < closestEntityDistance) {
-                closestEntity = entity;
-            }
+QUuid EntityTreeElement::evalClosetEntity(const glm::vec3& position, PickFilter searchFilter, float& closestDistanceSquared) const {
+    QUuid closestEntity;
+    forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter)) {
+            return;
+        }
+
+        float distanceToEntity = glm::distance2(position, entity->getWorldPosition());
+        if (distanceToEntity < closestDistanceSquared) {
+            closestEntity = entity->getID();
+            closestDistanceSquared = distanceToEntity;
         }
     });
     return closestEntity;
 }
 
-// TODO: change this to use better bounding shape for entity than sphere
-void EntityTreeElement::getEntities(const glm::vec3& searchPosition, float searchRadius, QVector<EntityItemPointer>& foundEntities) const {
+void EntityTreeElement::evalEntitiesInSphere(const glm::vec3& position, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
     forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter)) {
+            return;
+        }
 
         bool success;
         AABox entityBox = entity->getAABox(success);
 
         // if the sphere doesn't intersect with our world frame AABox, we don't need to consider the more complex case
         glm::vec3 penetration;
-        if (!success || entityBox.findSpherePenetration(searchPosition, searchRadius, penetration)) {
+        if (success && entityBox.findSpherePenetration(position, radius, penetration)) {
 
             glm::vec3 dimensions = entity->getRaycastDimensions();
 
             // FIXME - consider allowing the entity to determine penetration so that
-            //         entities could presumably dull actuall hull testing if they wanted to
+            //         entities could presumably do actual hull testing if they wanted to
             // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better in particular
             //         can we handle the ellipsoid case better? We only currently handle perfect spheres
             //         with centered registration points
-            if (entity->getShapeType() == SHAPE_TYPE_SPHERE &&
-                (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
+            if (entity->getShapeType() == SHAPE_TYPE_SPHERE && (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
 
                 // NOTE: entity->getRadius() doesn't return the true radius, it returns the radius of the
                 //       maximum bounding sphere, which is actually larger than our actual radius
                 float entityTrueRadius = dimensions.x / 2.0f;
 
                 bool success;
-                if (findSphereSpherePenetration(searchPosition, searchRadius,
-                        entity->getCenterPosition(success), entityTrueRadius, penetration)) {
+                if (findSphereSpherePenetration(position, radius, entity->getCenterPosition(success), entityTrueRadius, penetration)) {
                     if (success) {
-                        foundEntities.push_back(entity);
+                        foundEntities.push_back(entity->getID());
                     }
                 }
             } else {
@@ -468,17 +472,134 @@ void EntityTreeElement::getEntities(const glm::vec3& searchPosition, float searc
 
                 AABox entityFrameBox(corner, dimensions);
 
-                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(searchPosition, 1.0f));
-                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, searchRadius, penetration)) {
-                    foundEntities.push_back(entity);
+                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(position, 1.0f));
+                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, radius, penetration)) {
+                    foundEntities.push_back(entity->getID());
                 }
             }
         }
     });
 }
 
-void EntityTreeElement::getEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities) {
+void EntityTreeElement::evalEntitiesInSphereWithType(const glm::vec3& position, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
     forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter) || type != entity->getType()) {
+            return;
+        }
+
+        bool success;
+        AABox entityBox = entity->getAABox(success);
+
+        // if the sphere doesn't intersect with our world frame AABox, we don't need to consider the more complex case
+        glm::vec3 penetration;
+        if (success && entityBox.findSpherePenetration(position, radius, penetration)) {
+
+            glm::vec3 dimensions = entity->getRaycastDimensions();
+
+            // FIXME - consider allowing the entity to determine penetration so that
+            //         entities could presumably do actual hull testing if they wanted to
+            // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better in particular
+            //         can we handle the ellipsoid case better? We only currently handle perfect spheres
+            //         with centered registration points
+            if (entity->getShapeType() == SHAPE_TYPE_SPHERE && (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
+
+                // NOTE: entity->getRadius() doesn't return the true radius, it returns the radius of the
+                //       maximum bounding sphere, which is actually larger than our actual radius
+                float entityTrueRadius = dimensions.x / 2.0f;
+
+                bool success;
+                if (findSphereSpherePenetration(position, radius, entity->getCenterPosition(success), entityTrueRadius, penetration)) {
+                    if (success) {
+                        foundEntities.push_back(entity->getID());
+                    }
+                }
+            } else {
+                // determine the worldToEntityMatrix that doesn't include scale because
+                // we're going to use the registration aware aa box in the entity frame
+                glm::mat4 rotation = glm::mat4_cast(entity->getWorldOrientation());
+                glm::mat4 translation = glm::translate(entity->getWorldPosition());
+                glm::mat4 entityToWorldMatrix = translation * rotation;
+                glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
+
+                glm::vec3 registrationPoint = entity->getRegistrationPoint();
+                glm::vec3 corner = -(dimensions * registrationPoint);
+
+                AABox entityFrameBox(corner, dimensions);
+
+                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(position, 1.0f));
+                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, radius, penetration)) {
+                    foundEntities.push_back(entity->getID());
+                }
+            }
+        }
+    });
+}
+
+void EntityTreeElement::evalEntitiesInSphereWithName(const glm::vec3& position, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
+    forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter)) {
+            return;
+        }
+
+        QString entityName = entity->getName();
+        if ((caseSensitive && name != entityName) || (!caseSensitive && name.toLower() != entityName.toLower())) {
+            return;
+        }
+
+        bool success;
+        AABox entityBox = entity->getAABox(success);
+
+        // if the sphere doesn't intersect with our world frame AABox, we don't need to consider the more complex case
+        glm::vec3 penetration;
+        if (success && entityBox.findSpherePenetration(position, radius, penetration)) {
+
+            glm::vec3 dimensions = entity->getRaycastDimensions();
+
+            // FIXME - consider allowing the entity to determine penetration so that
+            //         entities could presumably do actual hull testing if they wanted to
+            // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better in particular
+            //         can we handle the ellipsoid case better? We only currently handle perfect spheres
+            //         with centered registration points
+            if (entity->getShapeType() == SHAPE_TYPE_SPHERE && (dimensions.x == dimensions.y && dimensions.y == dimensions.z)) {
+
+                // NOTE: entity->getRadius() doesn't return the true radius, it returns the radius of the
+                //       maximum bounding sphere, which is actually larger than our actual radius
+                float entityTrueRadius = dimensions.x / 2.0f;
+
+                bool success;
+                if (findSphereSpherePenetration(position, radius, entity->getCenterPosition(success), entityTrueRadius, penetration)) {
+                    if (success) {
+                        foundEntities.push_back(entity->getID());
+                    }
+                }
+            } else {
+                // determine the worldToEntityMatrix that doesn't include scale because
+                // we're going to use the registration aware aa box in the entity frame
+                glm::mat4 rotation = glm::mat4_cast(entity->getWorldOrientation());
+                glm::mat4 translation = glm::translate(entity->getWorldPosition());
+                glm::mat4 entityToWorldMatrix = translation * rotation;
+                glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
+
+                glm::vec3 registrationPoint = entity->getRegistrationPoint();
+                glm::vec3 corner = -(dimensions * registrationPoint);
+
+                AABox entityFrameBox(corner, dimensions);
+
+                glm::vec3 entityFrameSearchPosition = glm::vec3(worldToEntityMatrix * glm::vec4(position, 1.0f));
+                if (entityFrameBox.findSpherePenetration(entityFrameSearchPosition, radius, penetration)) {
+                    foundEntities.push_back(entity->getID());
+                }
+            }
+        }
+    });
+}
+
+void EntityTreeElement::evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
+    forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter)) {
+            return;
+        }
+
         bool success;
         AABox entityBox = entity->getAABox(success);
         // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better
@@ -497,14 +618,18 @@ void EntityTreeElement::getEntities(const AACube& cube, QVector<EntityItemPointe
         //
 
         // If the entities AABox touches the search cube then consider it to be found
-        if (!success || entityBox.touches(cube)) {
-            foundEntities.push_back(entity);
+        if (success && entityBox.touches(cube)) {
+            foundEntities.push_back(entity->getID());
         }
     });
 }
 
-void EntityTreeElement::getEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities) {
+void EntityTreeElement::evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
     forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter)) {
+            return;
+        }
+
         bool success;
         AABox entityBox = entity->getAABox(success);
         // FIXME - handle entity->getShapeType() == SHAPE_TYPE_SPHERE case better
@@ -523,19 +648,24 @@ void EntityTreeElement::getEntities(const AABox& box, QVector<EntityItemPointer>
         //
 
         // If the entities AABox touches the search cube then consider it to be found
-        if (!success || entityBox.touches(box)) {
-            foundEntities.push_back(entity);
+        if (success && entityBox.touches(box)) {
+            foundEntities.push_back(entity->getID());
         }
     });
 }
 
-void EntityTreeElement::getEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities) {
+void EntityTreeElement::evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities) const {
     forEachEntity([&](EntityItemPointer entity) {
+        if (!checkFilterSettings(entity, searchFilter)) {
+            return;
+        }
+
         bool success;
         AABox entityBox = entity->getAABox(success);
+
         // FIXME - See FIXMEs for similar methods above.
-        if (!success || frustum.boxIntersectsFrustum(entityBox) || frustum.boxIntersectsKeyhole(entityBox)) {
-            foundEntities.push_back(entity);
+        if (success && (frustum.boxIntersectsFrustum(entityBox) || frustum.boxIntersectsKeyhole(entityBox))) {
+            foundEntities.push_back(entity->getID());
         }
     });
 }
diff --git a/libraries/entities/src/EntityTreeElement.h b/libraries/entities/src/EntityTreeElement.h
index c65a4ebe05..3f1fda57bd 100644
--- a/libraries/entities/src/EntityTreeElement.h
+++ b/libraries/entities/src/EntityTreeElement.h
@@ -19,7 +19,8 @@
 
 #include "EntityEditPacketSender.h"
 #include "EntityItem.h"
-#include "EntityTree.h"
+
+#include <PickFilter.h>
 
 class EntityTree;
 class EntityTreeElement;
@@ -77,7 +78,6 @@ public:
     EntityEditPacketSender* packetSender;
 };
 
-
 class EntityTreeElement : public OctreeElement, ReadWriteLockable {
     friend class EntityTree; // to allow createElement to new us...
 
@@ -135,28 +135,25 @@ public:
     virtual bool deleteApproved() const override { return !hasEntities(); }
 
     virtual bool canPickIntersect() const override { return hasEntities(); }
-    virtual EntityItemID findRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+    virtual EntityItemID evalRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
         OctreeElementPointer& element, float& distance, BoxFace& face, glm::vec3& surfaceNormal,
         const QVector<EntityItemID>& entityIdsToInclude, const QVector<EntityItemID>& entityIdsToDiscard,
-        bool visibleOnly, bool collidableOnly, QVariantMap& extraInfo, bool precisionPicking = false);
-    virtual EntityItemID findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
+        PickFilter searchFilter, QVariantMap& extraInfo);
+    virtual EntityItemID evalDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
                          OctreeElementPointer& element, float& distance,
                          BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-                         const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
-                         QVariantMap& extraInfo, bool precisionPicking);
+                         const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo);
     virtual bool findSpherePenetration(const glm::vec3& center, float radius,
                         glm::vec3& penetration, void** penetratedObject) const override;
 
-    virtual EntityItemID findParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
+    virtual EntityItemID evalParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
         const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
         BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-        const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
-        QVariantMap& extraInfo, bool precisionPicking = false);
-    virtual EntityItemID findDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
+        const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo);
+    virtual EntityItemID evalDetailedParabolaIntersection(const glm::vec3& origin, const glm::vec3& velocity,
         const glm::vec3& normal, const glm::vec3& acceleration, OctreeElementPointer& element, float& parabolicDistance,
         BoxFace& face, glm::vec3& surfaceNormal, const QVector<EntityItemID>& entityIdsToInclude,
-        const QVector<EntityItemID>& entityIdsToDiscard, bool visibleOnly, bool collidableOnly,
-        QVariantMap& extraInfo, bool precisionPicking);
+        const QVector<EntityItemID>& entityIdsToDiscard, PickFilter searchFilter, QVariantMap& extraInfo);
 
     template <typename F>
     void forEachEntity(F f) const {
@@ -175,28 +172,13 @@ public:
 
     void addEntityItem(EntityItemPointer entity);
 
-    EntityItemPointer getClosestEntity(glm::vec3 position) const;
-
-    /// finds all entities that touch a sphere
-    /// \param position the center of the query sphere
-    /// \param radius the radius of the query sphere
-    /// \param entities[out] vector of const EntityItemPointer
-    void getEntities(const glm::vec3& position, float radius, QVector<EntityItemPointer>& foundEntities) const;
-
-    /// finds all entities that touch a box
-    /// \param box the query box
-    /// \param entities[out] vector of non-const EntityItemPointer
-    void getEntities(const AACube& cube, QVector<EntityItemPointer>& foundEntities);
-
-    /// finds all entities that touch a box
-    /// \param box the query box
-    /// \param entities[out] vector of non-const EntityItemPointer
-    void getEntities(const AABox& box, QVector<EntityItemPointer>& foundEntities);
-
-    /// finds all entities that touch a frustum
-    /// \param frustum the query frustum
-    /// \param entities[out] vector of non-const EntityItemPointer
-    void getEntities(const ViewFrustum& frustum, QVector<EntityItemPointer>& foundEntities);
+    QUuid evalClosetEntity(const glm::vec3& position, PickFilter searchFilter, float& closestDistanceSquared) const;
+    void evalEntitiesInSphere(const glm::vec3& position, float radius, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
+    void evalEntitiesInSphereWithType(const glm::vec3& position, float radius, EntityTypes::EntityType type, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
+    void evalEntitiesInSphereWithName(const glm::vec3& position, float radius, const QString& name, bool caseSensitive, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
+    void evalEntitiesInCube(const AACube& cube, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
+    void evalEntitiesInBox(const AABox& box, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
+    void evalEntitiesInFrustum(const ViewFrustum& frustum, PickFilter searchFilter, QVector<QUuid>& foundEntities) const;
 
     /// finds all entities that match filter
     /// \param filter function that adds matching entities to foundEntities
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
index f7decd805c..9c3a83ce13 100644
--- a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
@@ -15,7 +15,7 @@
 #include <gpu/gl/GLFramebuffer.h>
 #include <gpu/gl/GLTexture.h>
 
-namespace gpu { namespace gles {
+namespace gpu { namespace gles { 
 
 class GLESFramebuffer : public gl::GLFramebuffer {
     using Parent = gl::GLFramebuffer;
diff --git a/libraries/input-plugins/src/input-plugins/InputPlugin.cpp b/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
index 37b9adfe8b..c18c4cde65 100644
--- a/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
+++ b/libraries/input-plugins/src/input-plugins/InputPlugin.cpp
@@ -16,8 +16,7 @@
 #include "TouchscreenDevice.h"
 #include "TouchscreenVirtualPadDevice.h"
 
-#if !defined(Q_OS_ANDROID)
-
+#if !defined(CUSTOM_INPUT_PLUGINS)
 // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
 InputPluginList getInputPlugins() {
     InputPlugin* PLUGIN_POOL[] = {
diff --git a/libraries/pointers/src/Pick.cpp b/libraries/pointers/src/Pick.cpp
index 7ac53a2643..e95721c04b 100644
--- a/libraries/pointers/src/Pick.cpp
+++ b/libraries/pointers/src/Pick.cpp
@@ -7,8 +7,6 @@
 //
 #include "Pick.h"
 
-const PickFilter PickFilter::NOTHING;
-
 int pickTypeMetaTypeId = qRegisterMetaType<PickQuery::PickType>("PickType");
 
 PickQuery::PickQuery(const PickFilter& filter, const float maxDistance, const bool enabled) :
@@ -41,7 +39,8 @@ bool PickQuery::isEnabled() const {
 
 void PickQuery::setPrecisionPicking(bool precisionPicking) {
     withWriteLock([&] {
-        _filter.setFlag(PickFilter::PICK_COARSE, !precisionPicking);
+        _filter.setFlag(PickFilter::PRECISE, precisionPicking);
+        _filter.setFlag(PickFilter::COARSE, !precisionPicking);
     });
 }
 
diff --git a/libraries/pointers/src/Pick.h b/libraries/pointers/src/Pick.h
index 9ca0f14c5f..857a72caa8 100644
--- a/libraries/pointers/src/Pick.h
+++ b/libraries/pointers/src/Pick.h
@@ -18,6 +18,7 @@
 
 #include <shared/ReadWriteLockable.h>
 #include <TransformNode.h>
+#include <PickFilter.h>
 
 enum IntersectionType {
     NONE = 0,
@@ -27,84 +28,6 @@ enum IntersectionType {
     HUD
 };
 
-class PickFilter {
-public:
-    enum FlagBit {
-        PICK_ENTITIES = 0,
-        PICK_OVERLAYS,
-        PICK_AVATARS,
-        PICK_HUD,
-
-        PICK_COARSE, // if not set, does precise intersection, otherwise, doesn't
-
-        PICK_INCLUDE_INVISIBLE, // if not set, will not intersect invisible elements, otherwise, intersects both visible and invisible elements
-        PICK_INCLUDE_NONCOLLIDABLE, // if not set, will not intersect noncollidable elements, otherwise, intersects both collidable and noncollidable elements
-
-        // NOT YET IMPLEMENTED
-        PICK_ALL_INTERSECTIONS, // if not set, returns closest intersection, otherwise, returns list of all intersections
-
-        NUM_FLAGS, // Not a valid flag
-    };
-    typedef std::bitset<NUM_FLAGS> Flags;
-
-    // The key is the Flags
-    Flags _flags;
-
-    PickFilter() {}
-    PickFilter(const Flags& flags) : _flags(flags) {}
-
-    bool operator== (const PickFilter& rhs) const { return _flags == rhs._flags; }
-    bool operator!= (const PickFilter& rhs) const { return _flags != rhs._flags; }
-
-    void setFlag(FlagBit flag, bool value) { _flags[flag] = value; }
-
-    bool doesPickNothing() const { return _flags == NOTHING._flags; }
-    bool doesPickEntities() const { return _flags[PICK_ENTITIES]; }
-    bool doesPickOverlays() const { return _flags[PICK_OVERLAYS]; }
-    bool doesPickAvatars() const { return _flags[PICK_AVATARS]; }
-    bool doesPickHUD() const { return _flags[PICK_HUD]; }
-
-    bool doesPickCoarse() const { return _flags[PICK_COARSE]; }
-    bool doesPickInvisible() const { return _flags[PICK_INCLUDE_INVISIBLE]; }
-    bool doesPickNonCollidable() const { return _flags[PICK_INCLUDE_NONCOLLIDABLE]; }
-
-    bool doesWantAllIntersections() const { return _flags[PICK_ALL_INTERSECTIONS]; }
-
-    // Helpers for RayPickManager
-    Flags getEntityFlags() const {
-        unsigned int toReturn = getBitMask(PICK_ENTITIES);
-        if (doesPickInvisible()) {
-            toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
-        }
-        if (doesPickNonCollidable()) {
-            toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
-        }
-        if (doesPickCoarse()) {
-            toReturn |= getBitMask(PICK_COARSE);
-        }
-        return Flags(toReturn);
-    }
-    Flags getOverlayFlags() const {
-        unsigned int toReturn = getBitMask(PICK_OVERLAYS);
-        if (doesPickInvisible()) {
-            toReturn |= getBitMask(PICK_INCLUDE_INVISIBLE);
-        }
-        if (doesPickNonCollidable()) {
-            toReturn |= getBitMask(PICK_INCLUDE_NONCOLLIDABLE);
-        }
-        if (doesPickCoarse()) {
-            toReturn |= getBitMask(PICK_COARSE);
-        }
-        return Flags(toReturn);
-    }
-    Flags getAvatarFlags() const { return Flags(getBitMask(PICK_AVATARS)); }
-    Flags getHUDFlags() const { return Flags(getBitMask(PICK_HUD)); }
-
-    static constexpr unsigned int getBitMask(FlagBit bit) { return 1 << bit; }
-
-    static const PickFilter NOTHING;
-};
-
 class PickResult {
 public:
     PickResult() {}
diff --git a/libraries/pointers/src/PickCacheOptimizer.h b/libraries/pointers/src/PickCacheOptimizer.h
index c74e84937b..e91283f02c 100644
--- a/libraries/pointers/src/PickCacheOptimizer.h
+++ b/libraries/pointers/src/PickCacheOptimizer.h
@@ -85,10 +85,10 @@ QVector4D PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared
         T mathematicalPick = pick->getMathematicalPick();
         PickResultPointer res = pick->getDefaultResult(mathematicalPick.toVariantMap());
 
-        if (!pick->isEnabled() || pick->getFilter().doesPickNothing() || pick->getMaxDistance() < 0.0f || !mathematicalPick) {
+        if (!pick->isEnabled() || pick->getMaxDistance() < 0.0f || !mathematicalPick) {
             pick->setPickResult(res);
         } else {
-            if (pick->getFilter().doesPickEntities()) {
+            if (pick->getFilter().doesPickDomainEntities() || pick->getFilter().doesPickAvatarEntities()) {
                 PickCacheKey entityKey = { pick->getFilter().getEntityFlags(), pick->getIncludeItems(), pick->getIgnoreItems() };
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, entityKey)) {
                     PickResultPointer entityRes = pick->getEntityIntersection(mathematicalPick);
@@ -99,7 +99,7 @@ QVector4D PickCacheOptimizer<T>::update(std::unordered_map<uint32_t, std::shared
                 }
             }
 
-            if (pick->getFilter().doesPickOverlays()) {
+            if (pick->getFilter().doesPickLocalEntities()) {
                 PickCacheKey overlayKey = { pick->getFilter().getOverlayFlags(), pick->getIncludeItems(), pick->getIgnoreItems() };
                 if (!checkAndCompareCachedResults(mathematicalPick, results, res, overlayKey)) {
                     PickResultPointer overlayRes = pick->getOverlayIntersection(mathematicalPick);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index eb4ef5e028..da8dceb176 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -135,11 +135,6 @@ void Model::setScale(const glm::vec3& scale) {
 const float SCALE_CHANGE_EPSILON = 0.0000001f;
 
 void Model::setScaleInternal(const glm::vec3& scale) {
-    if (scale == glm::vec3(0)) {
-        setScaleInternal(glm::vec3{1});
-        return;
-    }
-
     if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
         _scale = scale;
         assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f);
diff --git a/libraries/render/src/render/CullTask.cpp b/libraries/render/src/render/CullTask.cpp
index 1a130d18d8..5e5c6b4c6e 100644
--- a/libraries/render/src/render/CullTask.cpp
+++ b/libraries/render/src/render/CullTask.cpp
@@ -75,8 +75,6 @@ void render::cullItems(const RenderContextPointer& renderContext, const CullFunc
     details._considered += (int)inItems.size();
 
     // Culling / LOD
-#if 0 
-    // Culling / LOD
     for (auto item : inItems) {
         if (item.bound.isNull()) {
             outItems.emplace_back(item); // One more Item to render
@@ -105,12 +103,6 @@ void render::cullItems(const RenderContextPointer& renderContext, const CullFunc
             details._outOfView++;
         }
     }
-#else
-    for (auto item : inItems) {
-        outItems.emplace_back(item);
-    }
-#endif
-
     details._rendered += (int)outItems.size();
 }
 
@@ -125,9 +117,9 @@ void FetchNonspatialItems::run(const RenderContextPointer& renderContext, const
     outItems.reserve(items.size());
     for (auto& id : items) {
         auto& item = scene->getItem(id);
-        //if (filter.test(item.getKey())) {
+        if (filter.test(item.getKey())) {
             outItems.emplace_back(ItemBound(id, item.getBound()));
-        //}
+        }
     }
 }
 
@@ -443,9 +435,9 @@ void ApplyCullFunctorOnItemBounds::run(const RenderContextPointer& renderContext
     outItems.reserve(inItems.size());
 
     for (auto& item : inItems) {
-        //if (_cullFunctor(args, item.bound)) {
+        if (_cullFunctor(args, item.bound)) {
             outItems.emplace_back(item);
-        //}
+        }
     }
 
     if (inputFrustum != nullptr) {
diff --git a/scripts/developer/utilities/tests/entityPerfTest.js b/scripts/developer/utilities/tests/entityPerfTest.js
index 181afcf360..d3846baba9 100644
--- a/scripts/developer/utilities/tests/entityPerfTest.js
+++ b/scripts/developer/utilities/tests/entityPerfTest.js
@@ -87,14 +87,6 @@ function makeEntity () {
         .withRay(function(){
             Entities.findRayIntersection(this.ray, false);
         });
-    entityTests.addTestCase('findRayIntersectionBlocking, precisionPicking=true')
-        .withRay(function(){
-            Entities.findRayIntersectionBlocking(this.ray, true);
-        })
-    entityTests.addTestCase('findRayIntersectionBlocking, precisionPicking=false')
-        .withRay(function(){
-            Entities.findRayIntersectionBlocking(this.ray, false);
-        })
     entityTests.addTestCase('no-op')
         .run(function(){});
 
diff --git a/tools/gpu-frame-player/src/PlayerWindow.cpp b/tools/gpu-frame-player/src/PlayerWindow.cpp
index 8146310d52..e74caddd5e 100644
--- a/tools/gpu-frame-player/src/PlayerWindow.cpp
+++ b/tools/gpu-frame-player/src/PlayerWindow.cpp
@@ -116,24 +116,6 @@ void PlayerWindow::textureLoader(const std::string& filename, const gpu::Texture
 void PlayerWindow::loadFrame(const QString& path) {
     auto frame = gpu::readFrame(path.toStdString(), _renderThread._externalTexture, &PlayerWindow::textureLoader);
     if (frame) {
-
-        {
-            for (auto& batch : frame->batches) {
-                size_t commandCount = batch->_commands.size();
-                for (size_t i = 0; i < commandCount; ++i) {
-                    const auto& command = batch->_commands[i];
-                    const auto& paramOffset = batch->_commandOffsets[i];
-                    if (command == gpu::Batch::Command::COMMAND_setIndexBuffer) {
-
-                    } else if (command == gpu::Batch::Command::COMMAND_drawIndexed) {
-
-                    } else if (command == gpu::Batch::Command::COMMAND_drawIndexedInstanced) {
-
-                    }
-                }
-            }
-        }
-
         _renderThread.submitFrame(frame);
         if (!_renderThread.isThreaded()) {
             _renderThread.process();
@@ -148,5 +130,6 @@ void PlayerWindow::loadFrame(const QString& path) {
         while (glm::any(glm::greaterThan(size, maxSize))) {
             size /= 2;
         }
+        resize(size.x, size.y);
     }
 }
diff --git a/tools/webview/CMakeLists.txt b/tools/webview/CMakeLists.txt
deleted file mode 100644
index 99af12fe07..0000000000
--- a/tools/webview/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(TARGET_NAME webview)
-setup_hifi_project(Gui WebView)
-link_hifi_libraries(shared ktx gl qml)
-target_opengl()
-
-set(EXTRA_DEPLOY_OPTIONS "--qmldir  \"${PROJECT_SOURCE_DIR}/src\"")
-package_libraries_for_deployment()
\ No newline at end of file
diff --git a/tools/webview/src/PlayerWindow.cpp b/tools/webview/src/PlayerWindow.cpp
deleted file mode 100644
index 67816da671..0000000000
--- a/tools/webview/src/PlayerWindow.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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 "PlayerWindow.h"
-#include "gl/GLHelpers.h"
-
-PlayerWindow::PlayerWindow() {
-    installEventFilter(this);
-    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
-    setSurfaceType(QSurface::OpenGLSurface);
-    setFormat(getDefaultOpenGLSurfaceFormat());
-    create();
-    resize({ 800, 600 });
-    show();
-    QCoreApplication::processEvents();
-    _renderThread.initialize(this);
-}
-
diff --git a/tools/webview/src/PlayerWindow.h b/tools/webview/src/PlayerWindow.h
deleted file mode 100644
index 5aa207b132..0000000000
--- a/tools/webview/src/PlayerWindow.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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
-//
-
-#pragma once
-#include <QtGui/QWindow>
-#include <QtCore/QSettings>
-
-#include "RenderThread.h"
-
-// Create a simple OpenGL window that renders text in various ways
-class PlayerWindow : public QWindow {
-public:
-    PlayerWindow();
-    virtual ~PlayerWindow() = default;
-
-protected:
-    //bool eventFilter(QObject* obj, QEvent* event) override;
-    //void keyPressEvent(QKeyEvent* event) override;
-
-private:
-    RenderThread _renderThread;
-};
diff --git a/tools/webview/src/RenderThread.cpp b/tools/webview/src/RenderThread.cpp
deleted file mode 100644
index 05a39ca841..0000000000
--- a/tools/webview/src/RenderThread.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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 "RenderThread.h"
-
-#include <mutex>
-
-#include <QtGui/QWindow>
-
-#include <gl/GLHelpers.h>
-#include <GLMHelpers.h>
-
-#define MARGIN 48
-
-void RenderThread::initialize(QWindow* window) {
-    std::unique_lock<std::mutex> lock(_frameLock);
-    setObjectName("RenderThread");
-    Parent::initialize();
-
-    _thread->setObjectName("RenderThread");
-    _size = window->size();
-
-    _glContext.setWindow(window);
-    _glContext.create();
-    _glContext.makeCurrent();
-
-    gl::setSwapInterval(0);
-    glGenFramebuffers(1, &_readFbo);
-    OffscreenSurface::setSharedContext(_glContext.qglContext());
-
-    // GPU library init
-    _glContext.doneCurrent();
-    _glContext.moveToThread(_thread);
-
-    _offscreen = std::make_shared<OffscreenSurface>();
-    _offscreen->resize({ _size.width() - (MARGIN * 2), _size.height() - (MARGIN * 2)});
-    _offscreen->load(QUrl("qrc://qml/main.qml"));
-}
-
-void RenderThread::releaseTexture() {
-    if (_uiTexture != 0) {
-        auto readFence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-        glFlush();
-        CHECK_GL_ERROR();
-        _discardLambda(_uiTexture, readFence);
-        _uiTexture = 0;
-    }
-}
-
-void RenderThread::setup() {
-    // Wait until the context has been moved to this thread
-    { std::unique_lock<std::mutex> lock(_frameLock); }
-    _glContext.makeCurrent();
-}
-
-void RenderThread::shutdown() {
-    releaseTexture();
-    _glContext.doneCurrent();
-}
-
-bool RenderThread::process() {
-    float now = secTimestampNow();
-    float red = fabsf(sinf(now * PI));
-    _glContext.makeCurrent();
-    {
-        OffscreenSurface::TextureAndFence newTextureAndFence;
-        if (_offscreen->fetchTexture(newTextureAndFence)) {
-            releaseTexture();
-            const auto& newTexture = newTextureAndFence.first;
-            GLsync writeFence = static_cast<GLsync>(newTextureAndFence.second);
-            _uiTexture = newTexture;
-            glWaitSync(writeFence, 0, GL_TIMEOUT_IGNORED);
-            glDeleteSync(writeFence);
-        }
-    }
-
-    glClearColor(1, red, 1, 1);
-    glClear(GL_COLOR_BUFFER_BIT);
-    if (_uiTexture != 0) {
-        auto uiSize = _offscreen->size();
-        glBindFramebuffer(GL_READ_FRAMEBUFFER, _readFbo);
-        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _uiTexture, 0);
-        glBlitFramebuffer(
-            0, 0, uiSize.width(), uiSize.height(),
-            MARGIN, MARGIN, uiSize.width()  + MARGIN, uiSize.height() + MARGIN,
-            GL_COLOR_BUFFER_BIT, GL_NEAREST);
-    }
-    _glContext.swapBuffers();
-    return true;
-}
diff --git a/tools/webview/src/RenderThread.h b/tools/webview/src/RenderThread.h
deleted file mode 100644
index e04715f7ca..0000000000
--- a/tools/webview/src/RenderThread.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/10/21
-//  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
-//
-
-#pragma once
-
-#include <QtCore/QElapsedTimer>
-
-#include <GenericThread.h>
-#include <shared/RateCounter.h>
-#include <gl/Config.h>
-#include <gl/Context.h>
-#include <qml/OffscreenSurface.h>
-
-class RenderThread : public GenericThread {
-    using Parent = GenericThread;
-    using OffscreenSurface = hifi::qml::OffscreenSurface;
-    using OffscreenPtr = std::shared_ptr<OffscreenSurface>;
-    using DiscardLambda = std::function<void(uint32_t, void*)>;
-public:
-    gl::Context _glContext;
-    std::mutex _mutex;
-    std::atomic<size_t> _presentCount{ 0 };
-    std::mutex _frameLock;
-    OffscreenPtr _offscreen;
-    QSize _size;
-    DiscardLambda _discardLambda { OffscreenSurface::getDiscardLambda() };
-    GLuint _readFbo { 0 };
-    GLuint _uiTexture { 0 };
-
-    void setup() override;
-    bool process() override;
-    void shutdown() override;
-    void initialize(QWindow* window);
-
-private:
-    void releaseTexture();
-};
diff --git a/tools/webview/src/main.cpp b/tools/webview/src/main.cpp
deleted file mode 100644
index 6bc92b89b0..0000000000
--- a/tools/webview/src/main.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-
-//
-//  Created by Bradley Austin Davis on 2018/11/22
-//  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 <QtGui/QGuiApplication>
-
-#include <Trace.h>
-
-#include "PlayerWindow.h"
-
-void initWebView();
-
-int main(int argc, char** argv) {
-    setupHifiApplication("uiApp");
-    QGuiApplication app(argc, argv);
-    initWebView();
-    {
-        DependencyManager::set<tracing::Tracer>();
-        PlayerWindow window;
-        app.exec();
-    }
-    return 0;
-}
-
-
diff --git a/tools/webview/src/main.qml b/tools/webview/src/main.qml
deleted file mode 100644
index 5d05866998..0000000000
--- a/tools/webview/src/main.qml
+++ /dev/null
@@ -1,23 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtWebView 1.1
-
-WebView {
-    url: "https://old.reddit.com"
-    width: 640; height: 480
-
-    /*
-    Rectangle {
-        id: blue
-        color: "blue"
-        anchors { margins: 48; top: parent.top; bottom: parent.bottom; left: parent.left;  }
-        width: parent.width / 3
-        ColorAnimation on color {
-            from: "yellow";
-            to: "red";
-            loops:  Animation.Infinite;
-            duration: 1000;
-        }
-    }
-    */
-}
diff --git a/tools/webview/src/mainqt.cpp b/tools/webview/src/mainqt.cpp
deleted file mode 100644
index c4c05569c0..0000000000
--- a/tools/webview/src/mainqt.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <QtWebView/QtWebView>
-
-void initWebView() {
-    QtWebView::initialize();
-}
\ No newline at end of file
diff --git a/tools/webview/src/resources.qrc b/tools/webview/src/resources.qrc
deleted file mode 100644
index f06d416800..0000000000
--- a/tools/webview/src/resources.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0">
-  <qresource prefix="/">
-    <file>main.qml</file>
-  </qresource>
-</RCC>

From 3ab86cfafa78fb2b5c485cabb14b9404427607a5 Mon Sep 17 00:00:00 2001
From: Amer Cerkic <amer@ad.highfidelity.io>
Date: Mon, 28 Jan 2019 14:01:41 -0800
Subject: [PATCH 03/58] removed duplicated code and type redefinition

---
 libraries/gl/src/gl/ContextQt.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/gl/src/gl/ContextQt.cpp b/libraries/gl/src/gl/ContextQt.cpp
index 2f1319e689..af2e7df6a6 100644
--- a/libraries/gl/src/gl/ContextQt.cpp
+++ b/libraries/gl/src/gl/ContextQt.cpp
@@ -58,10 +58,6 @@ void Context::debugMessageHandler(const QOpenGLDebugMessage& debugMessage) {
     }
 
     auto severity = debugMessage.severity();
-    auto type = debugMessage.type();
-    if (type == QOpenGLDebugMessage::PerformanceType) {
-        return;
-    }
     switch (severity) {
         case QOpenGLDebugMessage::NotificationSeverity:
         case QOpenGLDebugMessage::LowSeverity:

From 60912b7c76372104fadcce94ce39782f386e71d6 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 29 Jan 2019 14:23:12 -0800
Subject: [PATCH 04/58] Updated controller API

---
 .../src/OculusMobileControllerManager.cpp        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
index c44e4cc1f5..8de563ee4c 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
@@ -418,10 +418,10 @@ void OculusMobileInputDevice::update(float deltaTime, const controller::InputCal
     // Axes
     {
         const auto& inputState = _hands[0].state;
-        _axisStateMap[LX] = inputState.JoystickNoDeadZone.x;
-        _axisStateMap[LY] = inputState.JoystickNoDeadZone.y;
-        _axisStateMap[LT] = inputState.IndexTrigger;
-        _axisStateMap[LEFT_GRIP] = inputState.GripTrigger;
+        _axisStateMap[LX].value = inputState.JoystickNoDeadZone.x;
+        _axisStateMap[LY].value = inputState.JoystickNoDeadZone.y;
+        _axisStateMap[LT].value = inputState.IndexTrigger;
+        _axisStateMap[LEFT_GRIP].value = inputState.GripTrigger;
         for (const auto& pair : BUTTON_MAP) {
             if (inputState.Buttons & pair.first) {
                 _buttonPressedMap.insert(pair.second);
@@ -437,10 +437,10 @@ void OculusMobileInputDevice::update(float deltaTime, const controller::InputCal
 
     {
         const auto& inputState = _hands[1].state;
-        _axisStateMap[RX] = inputState.JoystickNoDeadZone.x;
-        _axisStateMap[RY] = inputState.JoystickNoDeadZone.y;
-        _axisStateMap[RT] = inputState.IndexTrigger;
-        _axisStateMap[RIGHT_GRIP] = inputState.GripTrigger;
+        _axisStateMap[RX].value = inputState.JoystickNoDeadZone.x;
+        _axisStateMap[RY].value = inputState.JoystickNoDeadZone.y;
+        _axisStateMap[RT].value = inputState.IndexTrigger;
+        _axisStateMap[RIGHT_GRIP].value = inputState.GripTrigger;
 
         for (const auto& pair : BUTTON_MAP) {
             if (inputState.Buttons & pair.first) {

From efff29639857f41173e180b99310322b3e938393 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 29 Jan 2019 14:45:05 -0800
Subject: [PATCH 05/58] Master merge cleanup

---
 interface/src/Application.cpp     | 23 +++++++++++------------
 interface/src/Application.h       |  2 +-
 interface/src/avatar/MyAvatar.cpp | 12 +++++-------
 interface/src/ui/LoginDialog.cpp  |  2 +-
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1f69b704a9..03f43a0a45 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3255,9 +3255,9 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
     surfaceContext->setContextProperty("AnimStats", AnimStats::getInstance());
 
 #if !defined(Q_OS_ANDROID)
-//  auto offscreenUi = getOffscreenUI();
-//  auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
-//  offscreenUi->show(qml, "AvatarInputsBar");
+    auto offscreenUi = getOffscreenUI();
+    auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
+    offscreenUi->show(qml, "AvatarInputsBar");
 #endif
 }
 
@@ -5102,7 +5102,7 @@ void Application::calibrateEyeTracker5Points() {
 #endif
 
 bool Application::exportEntities(const QString& filename,
-                                 const QVector<EntityItemID>& entityIDs,
+                                 const QVector<QUuid>& entityIDs,
                                  const glm::vec3* givenOffset) {
     QHash<EntityItemID, EntityItemPointer> entities;
 
@@ -5177,16 +5177,12 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa
     glm::vec3 minCorner = center - vec3(scale);
     float cubeSize = scale * 2;
     AACube boundingCube(minCorner, cubeSize);
-    QVector<EntityItemPointer> entities;
-    QVector<EntityItemID> ids;
+    QVector<QUuid> entities;
     auto entityTree = getEntities()->getTree();
     entityTree->withReadLock([&] {
-        entityTree->findEntities(boundingCube, entities);
-        foreach(EntityItemPointer entity, entities) {
-            ids << entity->getEntityItemID();
-        }
+        entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities);
     });
-    return exportEntities(filename, ids, &center);
+    return exportEntities(filename, entities, &center);
 }
 
 void Application::loadSettings() {
@@ -7253,7 +7249,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
 
     bool clientScript = scriptEngine->isClientScript();
     scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor);
-#if !defined(DISABLE_QML)
+#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
     scriptEngine->registerFunction("OverlayWebWindow", clientScript ? QmlWebWindowClass::constructor : QmlWebWindowClass::restricted_constructor);
 #endif
     scriptEngine->registerFunction("QmlFragment", clientScript ? QmlFragmentClass::constructor : QmlFragmentClass::restricted_constructor);
@@ -8302,6 +8298,9 @@ void Application::loadDomainConnectionDialog() {
 
 void Application::toggleLogDialog() {
 #ifndef Q_OS_ANDROID
+    if (getLoginDialogPoppedUp()) {
+        return;
+    }
     if (! _logDialog) {
 
         bool keepOnTop =_keepLogWindowOnTop.get();
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 099c5d3d15..2b4902f72e 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -359,7 +359,7 @@ signals:
 
 public slots:
     QVector<EntityItemID> pasteEntities(float x, float y, float z);
-    bool exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs, const glm::vec3* givenOffset = nullptr);
+    bool exportEntities(const QString& filename, const QVector<QUuid>& entityIDs, const glm::vec3* givenOffset = nullptr);
     bool exportEntities(const QString& filename, float x, float y, float z, float scale);
     bool importEntities(const QString& url, const bool isObservable = true, const qint64 callerId = -1);
     void updateThreadPoolCount() const;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index e8db1af25b..92d9270d20 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -3683,17 +3683,15 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette
         OctreeElementPointer element;
         float distance;
         BoxFace face;
-        const bool visibleOnly = false;
-        // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable.
-        // What we really want is to use the collision hull!
-        // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders
-        const bool collidableOnly = true;
-        const bool precisionPicking = true;
         const auto lockType = Octree::Lock; // Should we refactor to take a lock just once?
         bool* accurateResult = NULL;
 
+        // This isn't quite what we really want here. findRayIntersection always works on mesh, skipping entirely based on collidable.
+        // What we really want is to use the collision hull!
+        // See https://highfidelity.fogbugz.com/f/cases/5003/findRayIntersection-has-option-to-use-collidableOnly-but-doesn-t-actually-use-colliders
         QVariantMap extraInfo;
-        EntityItemID entityID = entityTree->findRayIntersection(startPointIn, directionIn, include, ignore, visibleOnly, collidableOnly, precisionPicking,
+        EntityItemID entityID = entityTree->evalRayIntersection(startPointIn, directionIn, include, ignore,
+            PickFilter(PickFilter::getBitMask(PickFilter::FlagBit::COLLIDABLE) | PickFilter::getBitMask(PickFilter::FlagBit::PRECISE)),
             element, distance, face, normalOut, extraInfo, lockType, accurateResult);
         if (entityID.isNull()) {
             return false;
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 4359318833..a8e234d791 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -138,7 +138,7 @@ void LoginDialog::login(const QString& username, const QString& password) const
 void LoginDialog::loginThroughOculus() {
    qDebug() << "Attempting to login through Oculus";
     if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
-       oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString oculusID) {
+       oculusPlatformPlugin->requestNonceAndUserID([] (QString nonce, QString oculusID) {
             DependencyManager::get<AccountManager>()->requestAccessTokenWithOculus(nonce, oculusID);
         });
     }

From f146c9fe7704529df0f4ac1a8b24b5038c80443c Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 10:17:57 -0800
Subject: [PATCH 06/58] Quest frame player work

---
 android/apps/questFramePlayer/CMakeLists.txt         |  2 +-
 android/apps/questFramePlayer/build.gradle           |  4 ++--
 .../questFramePlayer/src/main/AndroidManifest.xml    |  2 +-
 .../questFramePlayer/src/main/cpp/RenderThread.cpp   |  6 +++++-
 android/settings.gradle                              | 12 ++++++------
 libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp     |  4 ++++
 libraries/gpu/src/gpu/FrameReader.cpp                |  4 ++++
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/android/apps/questFramePlayer/CMakeLists.txt b/android/apps/questFramePlayer/CMakeLists.txt
index a22524222a..5889585a6c 100644
--- a/android/apps/questFramePlayer/CMakeLists.txt
+++ b/android/apps/questFramePlayer/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(TARGET_NAME framePlayer)
+set(TARGET_NAME questFramePlayer)
 setup_hifi_library(AndroidExtras)
 link_hifi_libraries(shared ktx shaders gpu gl oculusMobile ${PLATFORM_GL_BACKEND})
 target_include_directories(${TARGET_NAME} PRIVATE ${HIFI_ANDROID_PRECOMPILED}/ovr/VrApi/Include)
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
index 6b77eb72de..13d806c3a4 100644
--- a/android/apps/questFramePlayer/build.gradle
+++ b/android/apps/questFramePlayer/build.gradle
@@ -19,12 +19,12 @@ android {
         externalNativeBuild {
             cmake {
                 arguments '-DHIFI_ANDROID=1',
-                    '-DHIFI_ANDROID_APP=framePlayer',
+                    '-DHIFI_ANDROID_APP=questFramePlayer',
                     '-DANDROID_TOOLCHAIN=clang',
                     '-DANDROID_STL=c++_shared',
 
                     '-DCMAKE_VERBOSE_MAKEFILE=ON'
-                targets = ['framePlayer']
+                targets = ['questFramePlayer']
             }
         }
     }
diff --git a/android/apps/questFramePlayer/src/main/AndroidManifest.xml b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
index a4c4ec1f2f..721e8cee89 100644
--- a/android/apps/questFramePlayer/src/main/AndroidManifest.xml
+++ b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
             android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
             >
             <!-- JNI nonsense -->
-            <meta-data android:name="android.app.lib_name" android:value="framePlayer"/>
+            <meta-data android:name="android.app.lib_name" android:value="questFramePlayer"/>
             <!-- Qt nonsense -->
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
             <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
index 507bfd08b9..c07394cbe9 100644
--- a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
@@ -22,6 +22,7 @@
 #include <gpu/Texture.h>
 
 #include <VrApi_Types.h>
+#include <VrApi_Helpers.h>
 #include <ovr/VrHandler.h>
 #include <ovr/Helpers.h>
 
@@ -62,7 +63,7 @@ JNIEXPORT void JNICALL Java_io_highfidelity_frameplayer_QuestQtActivity_nativeOn
 }
 }
 
-static const char* FRAME_FILE = "assets:/frames/20190115_0948.json";
+static const char* FRAME_FILE = "assets:/frames/20190121_1220.json";
 
 static void textureLoader(const std::string& filename, const gpu::TexturePointer& texture, uint16_t layer) {
     QImage image;
@@ -193,9 +194,12 @@ void RenderThread::renderFrame() {
         // Quest
         auto frameCorrection = _correction * ovr::toGlm(tracking.HeadPose.Pose);
         _backend->setCameraCorrection(glm::inverse(frameCorrection), frame->view);
+        vec4 fovs[2];
         ovr::for_each_eye([&](ovrEye eye){
             const auto& eyeInfo = tracking.Eye[eye];
             eyeProjections[eye] = ovr::toGlm(eyeInfo.ProjectionMatrix);
+            auto& fov = fovs[eye];
+            ovrMatrix4f_ExtractFov(&eyeInfo.ProjectionMatrix, &fov.x, &fov.y, &fov.z, &fov.w);
             eyeOffsets[eye] = ovr::toGlm(eyeInfo.ViewMatrix);
         });
         _backend->recycle();
diff --git a/android/settings.gradle b/android/settings.gradle
index 23e54b0457..64eb246719 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -12,8 +12,8 @@ project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
 // Applications
 //
 
-//include ':interface'
-//project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+include ':interface'
+project(':interface').projectDir = new File(settingsDir, 'apps/interface')
 
 include ':questInterface'
 project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
@@ -22,8 +22,8 @@ project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterfa
 // Test projects
 //
 
-//include ':framePlayer'
-//project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+include ':framePlayer'
+project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
 
-//include ':questFramePlayer'
-//project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
+include ':questFramePlayer'
+project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
index 138710ebe6..a407ab8e80 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
@@ -418,6 +418,10 @@ public:
 #endif
 };
 
+#ifndef GL_CLIP_DISTANCE0
+#define GL_CLIP_DISTANCE0 GL_CLIP_DISTANCE0_EXT
+#endif
+
 #define GL_PROFILE_RANGE(category, name) \
     PROFILE_RANGE(category, name); \
     GlDuration glProfileRangeThis(name);
diff --git a/libraries/gpu/src/gpu/FrameReader.cpp b/libraries/gpu/src/gpu/FrameReader.cpp
index 00591ce78b..622263c2ee 100644
--- a/libraries/gpu/src/gpu/FrameReader.cpp
+++ b/libraries/gpu/src/gpu/FrameReader.cpp
@@ -380,6 +380,7 @@ ShaderPointer Deserializer::readShader(const json& node) {
 
     // FIXME support procedural shaders
     Shader::Type type = node[keys::type];
+    std::string name = node[keys::name];
     uint32_t id = node[keys::id];
     ShaderPointer result;
     switch (type) {
@@ -395,6 +396,9 @@ ShaderPointer Deserializer::readShader(const json& node) {
         default:
             throw std::runtime_error("not implemented");
     }
+    if (result->getSource().name != name) {
+        throw std::runtime_error("Bad name match");
+    }
     return result;
 }
 

From 20eec33b8b422992a97bc588c7bdeb865805ef65 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 10:37:56 -0800
Subject: [PATCH 07/58] CMake cleanup and modernization

---
 cmake/macros/IncludeHifiLibraryHeaders.cmake | 2 +-
 cmake/macros/LinkHifiLibraries.cmake         | 4 ++--
 interface/CMakeLists.txt                     | 2 +-
 libraries/entities/CMakeLists.txt            | 1 -
 libraries/gl/CMakeLists.txt                  | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cmake/macros/IncludeHifiLibraryHeaders.cmake b/cmake/macros/IncludeHifiLibraryHeaders.cmake
index 913d1e1181..008d76a8dc 100644
--- a/cmake/macros/IncludeHifiLibraryHeaders.cmake
+++ b/cmake/macros/IncludeHifiLibraryHeaders.cmake
@@ -10,5 +10,5 @@
 # 
 
 macro(include_hifi_library_headers LIBRARY)
-  include_directories("${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
+  target_include_directories(${TARGET_NAME} PRIVATE "${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
 endmacro(include_hifi_library_headers _library _root_dir)
\ No newline at end of file
diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake
index 7a6a136799..6a430f5b13 100644
--- a/cmake/macros/LinkHifiLibraries.cmake
+++ b/cmake/macros/LinkHifiLibraries.cmake
@@ -19,8 +19,8 @@ function(LINK_HIFI_LIBRARIES)
   endforeach()
 
   foreach(HIFI_LIBRARY ${LIBRARIES_TO_LINK})
-    include_directories("${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
-    include_directories("${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}")
+    target_include_directories(${TARGET_NAME} PRIVATE "${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
+    target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}")
     # link the actual library - it is static so don't bubble it up
     target_link_libraries(${TARGET_NAME} ${HIFI_LIBRARY})
   endforeach()
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index c013cfacd3..81b9935aa5 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -265,7 +265,7 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
 endforeach()
 
 # include headers for interface and InterfaceConfig.
-include_directories("${PROJECT_SOURCE_DIR}/src")
+target_include_directories(${TARGET_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/src")
 
 if (ANDROID)
   find_library(ANDROID_LOG_LIB log)
diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index fcbe563f88..2ae0a8784d 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(gpu)
diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt
index 925cf9b288..855452e8f0 100644
--- a/libraries/gl/CMakeLists.txt
+++ b/libraries/gl/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(TARGET_NAME gl)
-setup_hifi_library(Gui Widgets Qml Quick)
+setup_hifi_library(Gui Widgets)
 link_hifi_libraries(shared)
 target_opengl()
 

From 1526387933bbcb273b5b6886b63f39a49471fddd Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 10:37:24 -0800
Subject: [PATCH 08/58] EGL and Oculus depedency macros

---
 cmake/macros/TargetEGL.cmake          |  4 ++++
 cmake/macros/TargetOculusMobile.cmake | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 cmake/macros/TargetEGL.cmake
 create mode 100644 cmake/macros/TargetOculusMobile.cmake

diff --git a/cmake/macros/TargetEGL.cmake b/cmake/macros/TargetEGL.cmake
new file mode 100644
index 0000000000..1d8ce26d83
--- /dev/null
+++ b/cmake/macros/TargetEGL.cmake
@@ -0,0 +1,4 @@
+macro(target_egl)
+    find_library(EGL EGL)
+    target_link_libraries(${TARGET_NAME} ${EGL})
+endmacro()
diff --git a/cmake/macros/TargetOculusMobile.cmake b/cmake/macros/TargetOculusMobile.cmake
new file mode 100644
index 0000000000..3eaa008b14
--- /dev/null
+++ b/cmake/macros/TargetOculusMobile.cmake
@@ -0,0 +1,20 @@
+
+macro(target_oculus_mobile)
+    set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculus/VrApi)
+
+    # Mobile SDK
+    set(OVR_MOBILE_INCLUDE_DIRS ${INSTALL_DIR}/Include)
+    target_include_directories(${TARGET_NAME} PRIVATE ${OVR_MOBILE_INCLUDE_DIRS})
+    set(OVR_MOBILE_LIBRARY_DIR  ${INSTALL_DIR}/Libs/Android/arm64-v8a)
+    set(OVR_MOBILE_LIBRARY_RELEASE ${OVR_MOBILE_LIBRARY_DIR}/Release/libvrapi.so)
+    set(OVR_MOBILE_LIBRARY_DEBUG ${OVR_MOBILE_LIBRARY_DIR}/Debug/libvrapi.so)
+    select_library_configurations(OVR_MOBILE)
+    target_link_libraries(${TARGET_NAME} ${OVR_MOBILE_LIBRARIES})
+
+    # Platform SDK
+    set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculusPlatform)
+    set(OVR_PLATFORM_INCLUDE_DIRS ${INSTALL_DIR}/Include)
+    target_include_directories(${TARGET_NAME} PRIVATE ${OVR_PLATFORM_INCLUDE_DIRS})
+    set(OVR_PLATFORM_LIBRARIES ${INSTALL_DIR}/Android/libs/arm64-v8a/libovrplatformloader.so)
+    target_link_libraries(${TARGET_NAME} ${OVR_PLATFORM_LIBRARIES})
+endmacro()

From 85d2ae567dc507dd3cc8f571f2036cb836c5b2d5 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 10:38:24 -0800
Subject: [PATCH 09/58] Expose current android app name to source code

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6956fd22c3..4d616e1f3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@ endif()
 if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
+  add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine)
 endif ()

From 1dfdf220c03d6fb247eda0d3c59d3766d64c56e1 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 10:42:33 -0800
Subject: [PATCH 10/58] GL helpers cleanup

---
 libraries/gl/src/gl/Context.cpp               | 21 +++++++++++++-
 libraries/gl/src/gl/ContextQt.cpp             |  7 +++--
 libraries/gl/src/gl/OffscreenGLCanvas.cpp     | 12 --------
 libraries/gl/src/gl/QOpenGLContextWrapper.cpp | 29 ++++++++++---------
 libraries/gl/src/gl/QOpenGLContextWrapper.h   | 22 +++++++++++---
 5 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index 7d27b42909..a0d52ee223 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -195,6 +195,21 @@ GLAPI PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
 
 Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
 
+#if defined(GL_CUSTOM_CONTEXT)
+bool Context::makeCurrent() {	
+    BOOL result = wglMakeCurrent(_hdc, _hglrc);	
+    assert(result);	
+    updateSwapchainMemoryCounter();	
+     return result;	
+}	
+ void Context::swapBuffers() {	
+    SwapBuffers(_hdc);	
+}	
+ void Context::doneCurrent() {	
+    wglMakeCurrent(0, 0);	
+}
+#endif
+
 void Context::create(QOpenGLContext* shareContext) {
     if (!shareContext) {
         shareContext = qt_gl_global_share_context();
@@ -297,7 +312,11 @@ void Context::create(QOpenGLContext* shareContext) {
                 contextAttribs.push_back(0);
             }
             contextAttribs.push_back(0);
-            HGLRC shareHglrc = (HGLRC)QOpenGLContextWrapper::nativeContext(shareContext);
+            HGLRC shareHglrc = nullptr;
+            if (shareContext) {
+                auto nativeContextPointer = QOpenGLContextWrapper(shareContext).getNativeContext();
+                shareHglrc = (HGLRC)nativeContextPointer->context();
+            }
             _hglrc = wglCreateContextAttribsARB(_hdc, shareHglrc, &contextAttribs[0]);
         }
 
diff --git a/libraries/gl/src/gl/ContextQt.cpp b/libraries/gl/src/gl/ContextQt.cpp
index 82724dfd62..24ae29e4ca 100644
--- a/libraries/gl/src/gl/ContextQt.cpp
+++ b/libraries/gl/src/gl/ContextQt.cpp
@@ -61,12 +61,12 @@ void Context::debugMessageHandler(const QOpenGLDebugMessage& debugMessage) {
     switch (severity) {
         case QOpenGLDebugMessage::NotificationSeverity:
         case QOpenGLDebugMessage::LowSeverity:
+            qCDebug(glLogging) << debugMessage;
             return;
         default:
+            qCWarning(glLogging) << debugMessage;
             break;
     }
-    qWarning(glLogging) << debugMessage;
-    return;
 }
 
 void Context::setupDebugLogging(QOpenGLContext *context) {
@@ -82,6 +82,8 @@ void Context::setupDebugLogging(QOpenGLContext *context) {
     }
 }
 
+
+#if !defined(GL_CUSTOM_CONTEXT)
 bool Context::makeCurrent() {
     updateSwapchainMemoryCounter();
     bool result = _qglContext->makeCurrent(_window);
@@ -98,6 +100,7 @@ void Context::doneCurrent() {
         _qglContext->doneCurrent();
     }
 }
+#endif
 
 Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
 const QSurfaceFormat& getDefaultOpenGLSurfaceFormat();
diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
index f05acb50e9..69b41da821 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -65,21 +65,9 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
 
     _offscreenSurface->setFormat(_context->format());
     _offscreenSurface->create();
-
-    // Due to a https://bugreports.qt.io/browse/QTBUG-65125 we can't rely on `isValid`
-    // to determine if the offscreen surface was successfully created, so we use
-    // makeCurrent as a proxy test.  Bug is fixed in Qt 5.9.4
-#if defined(Q_OS_ANDROID)
-    if (!_context->makeCurrent(_offscreenSurface)) {
-        qFatal("Unable to make offscreen surface current");
-    }
-    _context->doneCurrent();
-#else
     if (!_offscreenSurface->isValid()) {
         qFatal("Offscreen surface is invalid");
     }
-#endif
-    
     return true;
 }
 
diff --git a/libraries/gl/src/gl/QOpenGLContextWrapper.cpp b/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
index fbebb1128d..842c7abd08 100644
--- a/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
+++ b/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
@@ -17,6 +17,22 @@
 #include <QtPlatformHeaders/QWGLNativeContext>
 #endif
 
+QOpenGLContextWrapper::Pointer QOpenGLContextWrapper::currentContextWrapper() {
+    return std::make_shared<QOpenGLContextWrapper>(QOpenGLContext::currentContext());
+}
+
+
+QOpenGLContextWrapper::NativeContextPointer QOpenGLContextWrapper::getNativeContext() const {
+    QOpenGLContextWrapper::NativeContextPointer result;
+    auto nativeHandle = _context->nativeHandle();
+    if (nativeHandle.canConvert<QGLNativeContext>()) {
+        result = std::make_shared<QGLNativeContext>();
+        *result = nativeHandle.value<QGLNativeContext>();
+    }
+    return result;
+}
+
+
 uint32_t QOpenGLContextWrapper::currentContextVersion() {
     QOpenGLContext* context = QOpenGLContext::currentContext();
     if (!context) {
@@ -49,19 +65,6 @@ void QOpenGLContextWrapper::setFormat(const QSurfaceFormat& format) {
     _context->setFormat(format);
 }
 
-#ifdef Q_OS_WIN
-void* QOpenGLContextWrapper::nativeContext(QOpenGLContext* context) {
-    HGLRC result = 0;
-    if (context != nullptr) {
-        auto nativeHandle = context->nativeHandle();
-        if (nativeHandle.canConvert<QWGLNativeContext>()) {
-            result = nativeHandle.value<QWGLNativeContext>().context();
-        }
-    }
-    return result;
-}
-#endif
-
 bool QOpenGLContextWrapper::create() {
     return _context->create();
 }
diff --git a/libraries/gl/src/gl/QOpenGLContextWrapper.h b/libraries/gl/src/gl/QOpenGLContextWrapper.h
index 32ba7f22e8..1fade3e7fa 100644
--- a/libraries/gl/src/gl/QOpenGLContextWrapper.h
+++ b/libraries/gl/src/gl/QOpenGLContextWrapper.h
@@ -12,19 +12,31 @@
 #ifndef hifi_QOpenGLContextWrapper_h
 #define hifi_QOpenGLContextWrapper_h
 
-#include <stdint.h>
 #include <QtGlobal>
+#include <memory>
 
 class QOpenGLContext;
 class QSurface;
 class QSurfaceFormat;
 class QThread;
 
+#if defined(Q_OS_ANDROID)
+#include <EGL/egl.h>
+#include <QtPlatformHeaders/QEGLNativeContext>
+using QGLNativeContext = QEGLNativeContext;
+#elif defined(Q_OS_WIN)
+class QWGLNativeContext;
+using QGLNativeContext = QWGLNativeContext;
+#else
+using QGLNativeContext = void*;
+#endif
+
 class QOpenGLContextWrapper {
 public:
-#ifdef Q_OS_WIN
-    static void* nativeContext(QOpenGLContext* context);
-#endif
+    using Pointer = std::shared_ptr<QOpenGLContextWrapper>;
+    using NativeContextPointer = std::shared_ptr<QGLNativeContext>;
+    static Pointer currentContextWrapper();
+
 
     QOpenGLContextWrapper();
     QOpenGLContextWrapper(QOpenGLContext* context);
@@ -37,6 +49,8 @@ public:
     void setShareContext(QOpenGLContext* otherContext);
     void moveToThread(QThread* thread);
 
+    NativeContextPointer getNativeContext() const;
+
     static QOpenGLContext* currentContext();
     static uint32_t currentContextVersion();
 

From f490a6c231c9aeb77afb065acd97cc72140cbf36 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 13:10:52 -0800
Subject: [PATCH 11/58] GPU tweaks

---
 .../gpu-gl-common/src/gpu/gl/GLBackend.cpp    |  3 +
 .../gpu-gl-common/src/gpu/gl/GLBackend.h      |  2 +-
 libraries/gpu-gles/src/gpu/gles/GLESBackend.h |  1 +
 .../src/gpu/gles/GLESBackendOutput.cpp        | 66 ++++++++++++++++++-
 libraries/gpu/src/gpu/Context.h               |  3 +-
 5 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
index 82f4f97e3b..1cf331cd1a 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
@@ -426,6 +426,9 @@ void GLBackend::render(const Batch& batch) {
     GL_PROFILE_RANGE(render_gpu_gl, batch.getName().c_str());
 
     _transform._skybox = _stereo._skybox = batch.isSkyboxEnabled();
+    // FIXME move this to between the transfer and draw passes, so that
+    // framebuffer setup can see the proper stereo state and enable things 
+    // like foveation
     // Allow the batch to override the rendering stereo settings
     // for things like full framebuffer copy operations (deferred lighting passes)
     bool savedStereo = _stereo._enable;
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
index b5a279a54c..671d4e11d7 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
@@ -95,7 +95,7 @@ public:
     // Shutdown rendering and persist any required resources
     void shutdown() override;
 
-    void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false);
+    void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false) override;
     void render(const Batch& batch) final override;
 
     // This call synchronize the Full Backend cache with the current GLState
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackend.h b/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
index aaa1be5892..636518c85a 100644
--- a/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
@@ -48,6 +48,7 @@ public:
     class GLESTexture : public GLTexture {
         using Parent = GLTexture;
         friend class GLESBackend;
+        friend class GLESFramebuffer;
         GLuint allocate(const Texture& texture);
     protected:
         GLESTexture(const std::weak_ptr<GLBackend>& backend, const Texture& buffer);
diff --git a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
index 9c3a83ce13..90ce8c853a 100644
--- a/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp
@@ -17,6 +17,34 @@
 
 namespace gpu { namespace gles { 
 
+
+// returns the FOV from the projection matrix
+static inline vec4 extractFov( const glm::mat4& m) {
+    static const std::array<vec4, 4> CLIPS{ {
+                                                { 1, 0, 0, 1 },
+                                                { -1, 0, 0, 1 },
+                                                { 0, 1, 0, 1 },
+                                                { 0, -1, 0, 1 }
+                                            } };
+
+    glm::mat4 mt = glm::transpose(m);
+    vec4 v, result;
+    // Left
+    v = mt * CLIPS[0];
+    result.x = -atanf(v.z / v.x);
+    // Right
+    v = mt * CLIPS[1];
+    result.y = atanf(v.z / v.x);
+    // Down
+    v = mt * CLIPS[2];
+    result.z = -atanf(v.z / v.y);
+    // Up
+    v = mt * CLIPS[3];
+    result.w = atanf(v.z / v.y);
+    return result;
+}
+
+
 class GLESFramebuffer : public gl::GLFramebuffer {
     using Parent = gl::GLFramebuffer;
     static GLuint allocate() {
@@ -29,6 +57,24 @@ public:
         GLint currentFBO = -1;
         glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &currentFBO);
         glBindFramebuffer(GL_FRAMEBUFFER, _fbo);
+
+        vec2 focalPoint{ -1.0f };
+
+#if 0
+        {
+            auto backend = _backend.lock();
+            if (backend && backend->isStereo()) {
+                glm::mat4 projections[2];
+                backend->getStereoProjections(projections);
+                vec4 fov = extractFov(projections[0]);
+                float fovwidth = fov.x + fov.y;
+                float fovheight = fov.z + fov.w;
+                focalPoint.x = fov.y / fovwidth;
+                focalPoint.y = (fov.z / fovheight) - 0.5f;
+            }
+        }
+#endif
+
         gl::GLTexture* gltexture = nullptr;
         TexturePointer surface;
         if (_gpuObject.getColorStamps() != _colorStamps) {
@@ -58,7 +104,7 @@ public:
                     surface = b._texture;
                     if (surface) {
                         Q_ASSERT(TextureUsageType::RENDERBUFFER == surface->getUsageType());
-                        gltexture = backend->syncGPUObject(surface); 
+                        gltexture = backend->syncGPUObject(surface);
                     } else {
                         gltexture = nullptr;
                     }
@@ -66,6 +112,24 @@ public:
                     if (gltexture) {
                         if (gltexture->_target == GL_TEXTURE_2D) {
                             glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, gltexture->_texture, 0);
+#if 0
+                            if (glTextureFoveationParametersQCOM && focalPoint.x != -1.0f) {
+                                static GLint FOVEATION_QUERY = 0;
+                                static std::once_flag once;
+                                std::call_once(once, [&]{
+                                    glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM, &FOVEATION_QUERY);
+                                });
+                                static const float foveaArea = 4.0f;
+                                static const float gain = 16.0f;
+                                GLESBackend::GLESTexture* glestexture = static_cast<GLESBackend::GLESTexture*>(gltexture);
+                                glestexture->withPreservedTexture([=]{
+                                    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM, GL_FOVEATION_ENABLE_BIT_QCOM | GL_FOVEATION_SCALED_BIN_METHOD_BIT_QCOM);
+                                    glTextureFoveationParametersQCOM(_id, 0, 0, -focalPoint.x, focalPoint.y, gain * 2.0f, gain, foveaArea);
+                                    glTextureFoveationParametersQCOM(_id, 0, 1, focalPoint.x, focalPoint.y, gain * 2.0f, gain, foveaArea);
+                                });
+
+                            }
+#endif
                         } else {
                             glFramebufferTextureLayer(GL_FRAMEBUFFER, colorAttachments[unit], gltexture->_texture, 0,
                                                       b._subresource);
diff --git a/libraries/gpu/src/gpu/Context.h b/libraries/gpu/src/gpu/Context.h
index b080b0ceac..7109b3dfeb 100644
--- a/libraries/gpu/src/gpu/Context.h
+++ b/libraries/gpu/src/gpu/Context.h
@@ -66,6 +66,7 @@ public:
     virtual void syncProgram(const gpu::ShaderPointer& program) = 0;
     virtual void recycle() const = 0;
     virtual void downloadFramebuffer(const FramebufferPointer& srcFramebuffer, const Vec4i& region, QImage& destImage) = 0;
+    virtual void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false) {}
 
     virtual bool supportedTextureFormat(const gpu::Element& format) = 0;
 
@@ -117,7 +118,6 @@ public:
     static ContextMetricSize textureResourcePopulatedGPUMemSize;
     static ContextMetricSize textureResourceIdealGPUMemSize;
 
-protected:
     virtual bool isStereo() const {
         return _stereo.isStereo();
     }
@@ -127,6 +127,7 @@ protected:
             eyeProjections[i] = _stereo._eyeProjections[i];
         }
     }
+protected:
 
     void getStereoViews(mat4* eyeViews) const {
         for (int i = 0; i < 2; ++i) {

From 6cea0d90125b8ef5fb549f976fab466cde966edf Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 10:24:30 -0800
Subject: [PATCH 12/58] Quest frame player

---
 android/apps/questFramePlayer/CMakeLists.txt  |   9 +
 android/apps/questFramePlayer/build.gradle    |  51 ++
 .../apps/questFramePlayer/proguard-rules.pro  |  25 +
 .../src/main/AndroidManifest.xml              |  55 ++
 .../src/main/cpp/PlayerWindow.cpp             |  25 +
 .../src/main/cpp/PlayerWindow.h               |  29 +
 .../src/main/cpp/RenderThread.cpp             | 240 ++++++
 .../src/main/cpp/RenderThread.h               |  44 ++
 .../questFramePlayer/src/main/cpp/main.cpp    |  56 ++
 .../frameplayer/QuestQtActivity.java          |  53 ++
 .../frameplayer/QuestRenderActivity.java      |  14 +
 .../src/main/res/drawable/ic_launcher.xml     |  17 +
 .../src/main/res/values/strings.xml           |   3 +
 android/libraries/oculus/build.gradle         |  17 +
 .../oculus/src/main/AndroidManifest.xml       |   2 +
 .../oculus/OculusMobileActivity.java          | 103 +++
 android/settings.gradle                       |  22 +-
 hifi_android.py                               |   7 +
 libraries/oculusMobile/CMakeLists.txt         |  11 +
 libraries/oculusMobile/src/ovr/Forward.h      |  17 +
 .../oculusMobile/src/ovr/Framebuffer.cpp      |  93 +++
 libraries/oculusMobile/src/ovr/Framebuffer.h  |  34 +
 libraries/oculusMobile/src/ovr/GLContext.cpp  | 182 +++++
 libraries/oculusMobile/src/ovr/GLContext.h    |  37 +
 libraries/oculusMobile/src/ovr/Helpers.cpp    |  38 +
 libraries/oculusMobile/src/ovr/Helpers.h      |  94 +++
 libraries/oculusMobile/src/ovr/TaskQueue.cpp  |  40 +
 libraries/oculusMobile/src/ovr/TaskQueue.h    |  42 ++
 libraries/oculusMobile/src/ovr/VrHandler.cpp  | 337 +++++++++
 libraries/oculusMobile/src/ovr/VrHandler.h    |  47 ++
 libraries/oculusMobilePlugin/CMakeLists.txt   |  29 +
 libraries/oculusMobilePlugin/src/Logging.cpp  |   4 +
 libraries/oculusMobilePlugin/src/Logging.h    |  13 +
 .../src/OculusMobileControllerManager.cpp     | 694 ++++++++++++++++++
 .../src/OculusMobileControllerManager.h       |  43 ++
 .../src/OculusMobileDisplayPlugin.cpp         | 269 +++++++
 .../src/OculusMobileDisplayPlugin.h           |  65 ++
 37 files changed, 2859 insertions(+), 2 deletions(-)
 create mode 100644 android/apps/questFramePlayer/CMakeLists.txt
 create mode 100644 android/apps/questFramePlayer/build.gradle
 create mode 100644 android/apps/questFramePlayer/proguard-rules.pro
 create mode 100644 android/apps/questFramePlayer/src/main/AndroidManifest.xml
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/RenderThread.h
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/main.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
 create mode 100644 android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
 create mode 100644 android/apps/questFramePlayer/src/main/res/drawable/ic_launcher.xml
 create mode 100644 android/apps/questFramePlayer/src/main/res/values/strings.xml
 create mode 100644 android/libraries/oculus/build.gradle
 create mode 100644 android/libraries/oculus/src/main/AndroidManifest.xml
 create mode 100644 android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
 create mode 100644 libraries/oculusMobile/CMakeLists.txt
 create mode 100644 libraries/oculusMobile/src/ovr/Forward.h
 create mode 100644 libraries/oculusMobile/src/ovr/Framebuffer.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/Framebuffer.h
 create mode 100644 libraries/oculusMobile/src/ovr/GLContext.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/GLContext.h
 create mode 100644 libraries/oculusMobile/src/ovr/Helpers.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/Helpers.h
 create mode 100644 libraries/oculusMobile/src/ovr/TaskQueue.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/TaskQueue.h
 create mode 100644 libraries/oculusMobile/src/ovr/VrHandler.cpp
 create mode 100644 libraries/oculusMobile/src/ovr/VrHandler.h
 create mode 100644 libraries/oculusMobilePlugin/CMakeLists.txt
 create mode 100644 libraries/oculusMobilePlugin/src/Logging.cpp
 create mode 100644 libraries/oculusMobilePlugin/src/Logging.h
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
 create mode 100644 libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h

diff --git a/android/apps/questFramePlayer/CMakeLists.txt b/android/apps/questFramePlayer/CMakeLists.txt
new file mode 100644
index 0000000000..5889585a6c
--- /dev/null
+++ b/android/apps/questFramePlayer/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(TARGET_NAME questFramePlayer)
+setup_hifi_library(AndroidExtras)
+link_hifi_libraries(shared ktx shaders gpu gl oculusMobile ${PLATFORM_GL_BACKEND})
+target_include_directories(${TARGET_NAME} PRIVATE ${HIFI_ANDROID_PRECOMPILED}/ovr/VrApi/Include)
+target_link_libraries(${TARGET_NAME} android log m)
+target_opengl()
+target_oculus_mobile()
+
+
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
new file mode 100644
index 0000000000..13d806c3a4
--- /dev/null
+++ b/android/apps/questFramePlayer/build.gradle
@@ -0,0 +1,51 @@
+apply plugin: 'com.android.application'
+
+android {
+    signingConfigs {
+        release {
+            keyAlias 'key0'
+            keyPassword 'password'
+            storeFile file('C:/android/keystore.jks')
+            storePassword 'password'
+        }
+    }
+
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "io.highfidelity.frameplayer"
+        minSdkVersion 25
+        targetSdkVersion 28
+        ndk { abiFilters 'arm64-v8a' }
+        externalNativeBuild {
+            cmake {
+                arguments '-DHIFI_ANDROID=1',
+                    '-DHIFI_ANDROID_APP=questFramePlayer',
+                    '-DANDROID_TOOLCHAIN=clang',
+                    '-DANDROID_STL=c++_shared',
+
+                    '-DCMAKE_VERBOSE_MAKEFILE=ON'
+                targets = ['questFramePlayer']
+            }
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+    }
+
+    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
+    implementation project(':oculus')
+    implementation project(':qt')
+}
diff --git a/android/apps/questFramePlayer/proguard-rules.pro b/android/apps/questFramePlayer/proguard-rules.pro
new file mode 100644
index 0000000000..b3c0078513
--- /dev/null
+++ b/android/apps/questFramePlayer/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/apps/questFramePlayer/src/main/AndroidManifest.xml b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..721e8cee89
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.highfidelity.frameplayer"
+    android:versionCode="1"
+    android:versionName="1.0"
+    android:installLocation="auto">
+    <uses-feature android:glEsVersion="0x00030002" android:required="true" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <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="true"/>
+    <uses-feature android:name="android.hardware.vr.high_performance" android:required="true"/>
+
+
+    <application android:label="Frame Viewer"
+        android:allowBackup="false"
+        android:name="org.qtproject.qt5.android.bindings.QtApplication"
+        tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon">
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
+        <activity
+            android:name=".QuestQtActivity"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape"
+            android:excludeFromRecents="false"
+            android:alwaysRetainTaskState="true"
+            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
+            >
+            <!-- JNI nonsense -->
+            <meta-data android:name="android.app.lib_name" android:value="questFramePlayer"/>
+            <!-- Qt nonsense -->
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+        </activity>
+
+        <activity
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
+            android:name=".QuestRenderActivity"
+            android:label="Frame Player"
+            android:launchMode="singleInstance"
+            android:screenOrientation="landscape"
+            android:excludeFromRecents="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
new file mode 100644
index 0000000000..ec2986298e
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
@@ -0,0 +1,25 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "PlayerWindow.h"
+
+#include <QtWidgets/QFileDialog>
+
+PlayerWindow::PlayerWindow() {
+    installEventFilter(this);
+    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
+    setSurfaceType(QSurface::OpenGLSurface);
+    create();
+    showFullScreen();
+    // Ensure the window is visible and the GL context is valid
+    QCoreApplication::processEvents();
+    _renderThread.initialize(this);
+}
+
+PlayerWindow::~PlayerWindow() {
+}
diff --git a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
new file mode 100644
index 0000000000..e4dd6cef43
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
@@ -0,0 +1,29 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+#include <QtGui/QWindow>
+#include <QtCore/QSettings>
+
+#include <gpu/Forward.h>
+#include "RenderThread.h"
+
+// Create a simple OpenGL window that renders text in various ways
+class PlayerWindow : public QWindow {
+public:
+    PlayerWindow();
+    virtual ~PlayerWindow();
+
+protected:
+    //bool eventFilter(QObject* obj, QEvent* event) override;
+    //void keyPressEvent(QKeyEvent* event) override;
+
+private:
+    QSettings _settings;
+    RenderThread _renderThread;
+};
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
new file mode 100644
index 0000000000..5eabe6b9b1
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
@@ -0,0 +1,240 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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 "RenderThread.h"
+
+#include <mutex>
+
+#include <jni.h>
+#include <android/log.h>
+
+#include <QtCore/QFileInfo>
+#include <QtGui/QWindow>
+#include <QtGui/QImageReader>
+
+#include <gl/QOpenGLContextWrapper.h>
+#include <gpu/FrameIO.h>
+#include <gpu/Texture.h>
+
+#include <VrApi_Types.h>
+#include <VrApi_Helpers.h>
+#include <ovr/VrHandler.h>
+#include <ovr/Helpers.h>
+
+#include <VrApi.h>
+#include <VrApi_Input.h>
+
+static JNIEnv* _env { nullptr };
+static JavaVM* _vm { nullptr };
+static jobject _activity { nullptr };
+
+struct HandController{
+    ovrInputTrackedRemoteCapabilities caps {};
+    ovrInputStateTrackedRemote state {};
+    ovrResult stateResult{ ovrSuccess };
+    ovrTracking tracking {};
+    ovrResult trackingResult{ ovrSuccess };
+
+    void update(ovrMobile* session, double time = 0.0) {
+        const auto& deviceId = caps.Header.DeviceID;
+        stateResult = vrapi_GetCurrentInputState(session, deviceId, &state.Header);
+        trackingResult = vrapi_GetInputTrackingState(session, deviceId, 0.0, &tracking);
+    }
+};
+
+std::vector<HandController> devices;
+
+extern "C" {
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", __FUNCTION__);
+    return JNI_VERSION_1_6;
+}
+
+
+JNIEXPORT void JNICALL Java_io_highfidelity_frameplayer_QuestQtActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
+    env->GetJavaVM(&_vm);
+    _activity = env->NewGlobalRef(obj);
+}
+}
+
+static const char* FRAME_FILE = "assets:/frames/20190121_1220.json";
+
+static void textureLoader(const std::string& filename, const gpu::TexturePointer& texture, uint16_t layer) {
+    QImage image;
+    QImageReader(filename.c_str()).read(&image);
+    if (layer > 0) {
+        return;
+    }
+    texture->assignStoredMip(0, image.byteCount(), image.constBits());
+}
+
+void RenderThread::submitFrame(const gpu::FramePointer& frame) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    _pendingFrames.push(frame);
+}
+
+void RenderThread::move(const glm::vec3& v) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    _correction = glm::inverse(glm::translate(mat4(), v)) * _correction;
+}
+
+void RenderThread::initialize(QWindow* window) {
+    std::unique_lock<std::mutex> lock(_frameLock);
+    setObjectName("RenderThread");
+    Parent::initialize();
+    _window = window;
+    _thread->setObjectName("RenderThread");
+}
+
+void RenderThread::setup() {
+    // Wait until the context has been moved to this thread
+    { std::unique_lock<std::mutex> lock(_frameLock); }
+
+
+    ovr::VrHandler::initVr();
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Launching oculus activity");
+    _vm->AttachCurrentThread(&_env, nullptr);
+    jclass cls = _env->GetObjectClass(_activity);
+    jmethodID mid = _env->GetMethodID(cls, "launchOculusActivity", "()V");
+    _env->CallVoidMethod(_activity, mid);
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Launching oculus activity done");
+    ovr::VrHandler::setHandler(this);
+
+    makeCurrent();
+
+    // GPU library init
+    gpu::Context::init<gpu::gl::GLBackend>();
+    _gpuContext = std::make_shared<gpu::Context>();
+    _backend = _gpuContext->getBackend();
+    _gpuContext->beginFrame();
+    _gpuContext->endFrame();
+
+    makeCurrent();
+    glGenTextures(1, &_externalTexture);
+    glBindTexture(GL_TEXTURE_2D, _externalTexture);
+    static const glm::u8vec4 color{ 0,1,0,0 };
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &color);
+
+    if (QFileInfo(FRAME_FILE).exists()) {
+        auto frame = gpu::readFrame(FRAME_FILE, _externalTexture, &textureLoader);
+        submitFrame(frame);
+    }
+}
+
+void RenderThread::shutdown() {
+    _activeFrame.reset();
+    while (!_pendingFrames.empty()) {
+        _gpuContext->consumeFrameUpdates(_pendingFrames.front());
+        _pendingFrames.pop();
+    }
+    _gpuContext->shutdown();
+    _gpuContext.reset();
+}
+
+void RenderThread::handleInput() {
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        withOvrMobile([&](ovrMobile* session){
+            int deviceIndex = 0;
+            ovrInputCapabilityHeader capsHeader;
+            while (vrapi_EnumerateInputDevices(session, deviceIndex, &capsHeader) >= 0) {
+                if (capsHeader.Type == ovrControllerType_TrackedRemote) {
+                    HandController controller = {};
+                    controller.caps.Header = capsHeader;
+                    controller.state.Header.ControllerType = ovrControllerType_TrackedRemote;
+                    vrapi_GetInputDeviceCapabilities( session, &controller.caps.Header);
+                    devices.push_back(controller);
+                }
+                ++deviceIndex;
+            }
+        });
+    });
+
+    auto readResult = ovr::VrHandler::withOvrMobile([&](ovrMobile *session) {
+        for (auto &controller : devices) {
+            controller.update(session);
+        }
+    });
+
+    if (readResult) {
+        for (auto &controller : devices) {
+            const auto &caps = controller.caps;
+            if (controller.stateResult >= 0) {
+                const auto &remote = controller.state;
+                if (remote.Joystick.x != 0.0f || remote.Joystick.y != 0.0f) {
+                    glm::vec3 translation;
+                    float rotation = 0.0f;
+                    if (caps.ControllerCapabilities & ovrControllerCaps_LeftHand) {
+                        translation = glm::vec3{0.0f, -remote.Joystick.y, 0.0f};
+                    } else {
+                        translation = glm::vec3{remote.Joystick.x, 0.0f, -remote.Joystick.y};
+                    }
+                    float scale = 0.1f + (1.9f * remote.GripTrigger);
+                    _correction = glm::translate(glm::mat4(), translation * scale) * _correction;
+                }
+            }
+        }
+    }
+}
+
+void RenderThread::renderFrame() {
+    GLuint finalTexture = 0;
+    glm::uvec2 finalTextureSize;
+    const auto& tracking = beginFrame();
+    if (_activeFrame) {
+        const auto& frame = _activeFrame;
+        auto& eyeProjections = frame->stereoState._eyeProjections;
+        auto& eyeOffsets = frame->stereoState._eyeViews;
+        // Quest
+        auto frameCorrection = _correction * ovr::toGlm(tracking.HeadPose.Pose);
+        _backend->setCameraCorrection(glm::inverse(frameCorrection), frame->view);
+        ovr::for_each_eye([&](ovrEye eye){
+            const auto& eyeInfo = tracking.Eye[eye];
+            eyeProjections[eye] = ovr::toGlm(eyeInfo.ProjectionMatrix);
+            eyeOffsets[eye] = ovr::toGlm(eyeInfo.ViewMatrix);
+        });
+        _backend->recycle();
+        _backend->syncCache();
+        _gpuContext->enableStereo(true);
+        if (frame && !frame->batches.empty()) {
+            _gpuContext->executeFrame(frame);
+        }
+        auto& glbackend = (gpu::gl::GLBackend&)(*_backend);
+        finalTextureSize = { frame->framebuffer->getWidth(), frame->framebuffer->getHeight() };
+        finalTexture = glbackend.getTextureID(frame->framebuffer->getRenderBuffer(0));
+    }
+    presentFrame(finalTexture, finalTextureSize, tracking);
+}
+
+bool RenderThread::process() {
+    pollTask();
+
+    if (!vrActive()) {
+        QThread::msleep(1);
+        return true;
+    }
+
+    std::queue<gpu::FramePointer> pendingFrames;
+    {
+        std::unique_lock<std::mutex> lock(_frameLock);
+        pendingFrames.swap(_pendingFrames);
+    }
+
+    makeCurrent();
+    while (!pendingFrames.empty()) {
+        _activeFrame = pendingFrames.front();
+        pendingFrames.pop();
+        _gpuContext->consumeFrameUpdates(_activeFrame);
+        _activeFrame->stereoState._enable = true;
+    }
+
+    handleInput();
+    renderFrame();
+    return true;
+}
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.h b/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
new file mode 100644
index 0000000000..701cd25f5b
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
@@ -0,0 +1,44 @@
+//
+//  Created by Bradley Austin Davis on 2018/10/21
+//  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
+//
+
+#pragma once
+
+#include <QtCore/QElapsedTimer>
+
+#include <GenericThread.h>
+#include <shared/RateCounter.h>
+#include <gl/Config.h>
+#include <gl/Context.h>
+#include <gpu/gl/GLBackend.h>
+#include <ovr/VrHandler.h>
+
+class RenderThread : public GenericThread, ovr::VrHandler {
+    using Parent = GenericThread;
+public:
+    QWindow* _window{ nullptr };
+    std::mutex _mutex;
+    gpu::ContextPointer _gpuContext;  // initialized during window creation
+    std::shared_ptr<gpu::Backend> _backend;
+    std::atomic<size_t> _presentCount{ 0 };
+    std::mutex _frameLock;
+    std::queue<gpu::FramePointer> _pendingFrames;
+    gpu::FramePointer _activeFrame;
+    uint32_t _externalTexture{ 0 };
+    glm::mat4 _correction;
+
+    void move(const glm::vec3& v);
+    void setup() override;
+    bool process() override;
+    void shutdown() override;
+
+    void handleInput();
+
+    void submitFrame(const gpu::FramePointer& frame);
+    void initialize(QWindow* window);
+    void renderFrame();
+};
diff --git a/android/apps/questFramePlayer/src/main/cpp/main.cpp b/android/apps/questFramePlayer/src/main/cpp/main.cpp
new file mode 100644
index 0000000000..4730d3fa15
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/main.cpp
@@ -0,0 +1,56 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/22
+//  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 <android/log.h>
+
+#include <QtGui/QGuiApplication>
+#include <QtCore/QTimer>
+#include <QtCore/QFileInfo>
+
+#include <Trace.h>
+
+#include "PlayerWindow.h"
+
+void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
+    if (!message.isEmpty()) {
+        const char * local=message.toStdString().c_str();
+        switch (type) {
+            case QtDebugMsg:
+                __android_log_write(ANDROID_LOG_DEBUG,"Interface",local);
+                break;
+            case QtInfoMsg:
+                __android_log_write(ANDROID_LOG_INFO,"Interface",local);
+                break;
+            case QtWarningMsg:
+                __android_log_write(ANDROID_LOG_WARN,"Interface",local);
+                break;
+            case QtCriticalMsg:
+                __android_log_write(ANDROID_LOG_ERROR,"Interface",local);
+                break;
+            case QtFatalMsg:
+            default:
+                __android_log_write(ANDROID_LOG_FATAL,"Interface",local);
+                abort();
+        }
+    }
+}
+
+int main(int argc, char** argv) {
+    setupHifiApplication("gpuFramePlayer");
+    QGuiApplication app(argc, argv);
+    auto oldMessageHandler = qInstallMessageHandler(messageHandler);
+    DependencyManager::set<tracing::Tracer>();
+    PlayerWindow window;
+    __android_log_write(ANDROID_LOG_FATAL,"QQQ","Exec");
+    app.exec();
+    __android_log_write(ANDROID_LOG_FATAL,"QQQ","Exec done");
+    qInstallMessageHandler(oldMessageHandler);
+    return 0;
+}
+
+
diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
new file mode 100644
index 0000000000..d498e27547
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
@@ -0,0 +1,53 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+package io.highfidelity.frameplayer;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+
+import io.highfidelity.oculus.OculusMobileActivity;
+
+
+public class QuestQtActivity extends QtActivity {
+    private native void nativeOnCreate();
+    private boolean launchedQuestMode = false;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Log.w("QQQ_Qt", "QuestQtActivity::onCreate");
+        super.onCreate(savedInstanceState);
+        nativeOnCreate();
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.w("QQQ_Qt", "QuestQtActivity::onDestroy");
+        super.onDestroy();
+    }
+
+    public void launchOculusActivity() {
+        Log.w("QQQ_Qt", "QuestQtActivity::launchOculusActivity");
+        runOnUiThread(()->{
+            keepInterfaceRunning = true;
+            launchedQuestMode = true;
+            moveTaskToBack(true);
+            startActivity(new Intent(this, QuestRenderActivity.class));
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (launchedQuestMode) {
+            moveTaskToBack(true);
+        }
+    }
+}
diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
new file mode 100644
index 0000000000..a395a32b68
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
@@ -0,0 +1,14 @@
+package io.highfidelity.frameplayer;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import io.highfidelity.oculus.OculusMobileActivity;
+
+public class QuestRenderActivity extends OculusMobileActivity {
+    @Override
+    public void onCreate(Bundle savedState) {
+        super.onCreate(savedState);
+        startActivity(new Intent(this, QuestQtActivity.class));
+    }
+}
diff --git a/android/apps/questFramePlayer/src/main/res/drawable/ic_launcher.xml b/android/apps/questFramePlayer/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000000..03b1edc4e9
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--suppress AndroidUnknownAttribute -->
+<vector xmlns:api24="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="192"
+    android:viewportHeight="192"
+    android:width="192dp"
+    android:height="192dp">
+    <path
+        android:pathData="M189.5 96.5A93.5 93.5 0 0 1 96 190 93.5 93.5 0 0 1 2.5 96.5 93.5 93.5 0 0 1 96 3 93.5 93.5 0 0 1 189.5 96.5Z"
+        android:fillColor="#333333" />
+    <path
+        android:pathData="M96.2 173.1c-10.3 0 -20.4 -2.1 -29.8 -6 -9.2 -3.8 -17.3 -9.4 -24.3 -16.4 -7 -7 -12.6 -15.2 -16.4 -24.3 -4.1 -9.6 -6.2 -19.6 -6.2 -30 0 -10.3 2.1 -20.4 6 -29.8 3.8 -9.2 9.4 -17.3 16.4 -24.3 7 -7 15.2 -12.6 24.3 -16.4 9.5 -4 19.5 -6 29.8 -6 10.3 0 20.4 2.1 29.8 6 9.2 3.8 17.3 9.4 24.3 16.4 7 7 12.6 15.2 16.4 24.3 4 9.5 6 19.5 6 29.8 0 10.3 -2.1 20.4 -6 29.8 -3.8 9.2 -9.4 17.3 -16.4 24.3 -7 7 -15.2 12.6 -24.3 16.4 -9.2 4.1 -19.3 6.2 -29.6 6.2zm0 -145.3c-37.8 0 -68.6 30.8 -68.6 68.6 0 37.8 30.8 68.6 68.6 68.6 37.8 0 68.6 -30.8 68.6 -68.6 0 -37.8 -30.8 -68.6 -68.6 -68.6z"
+        android:fillColor="#00b4f0" />
+    <path
+        android:pathData="M119.6 129l0 -53.8c3.4 -1.1 5.8 -4.3 5.8 -8 0 -4.6 -3.8 -8.4 -8.4 -8.4 -4.6 0 -8.4 3.8 -8.4 8.4 0 3.6 2.2 6.6 5.4 7.9l0 25L79 83.8 79 64c3.4 -1.1 5.8 -4.3 5.8 -8 0 -4.6 -3.8 -8.4 -8.4 -8.4 -4.6 0 -8.4 3.8 -8.4 8.4 0 3.6 2.2 6.6 5.4 7.9l0 54.1c-3.1 1.2 -5.4 4.3 -5.4 7.9 0 4.6 3.8 8.4 8.4 8.4 4.6 0 8.4 -3.8 8.4 -8.4 0 -3.7 -2.4 -6.9 -5.8 -8l0 -27.3 35 16.3 0 22.2c-3.1 1.2 -5.4 4.3 -5.4 7.9 0 4.6 3.8 8.4 8.4 8.4 4.6 0 8.4 -3.8 8.4 -8.4 0 -3.8 -2.4 -6.9 -5.8 -8z"
+        android:fillColor="#00b4f0" />
+</vector>
\ No newline at end of file
diff --git a/android/apps/questFramePlayer/src/main/res/values/strings.xml b/android/apps/questFramePlayer/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..8bf550f74e
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name" translatable="false">GPU Frame Player</string>
+</resources>
diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle
new file mode 100644
index 0000000000..b072f99eb7
--- /dev/null
+++ b/android/libraries/oculus/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
diff --git a/android/libraries/oculus/src/main/AndroidManifest.xml b/android/libraries/oculus/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..57df1a4226
--- /dev/null
+++ b/android/libraries/oculus/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.highfidelity.shared.oculus"/>
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
new file mode 100644
index 0000000000..01d74ea94d
--- /dev/null
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -0,0 +1,103 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+package io.highfidelity.oculus;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.WindowManager;
+
+/**
+ * Contains a native surface and forwards the activity lifecycle and surface lifecycle
+ * events to the OculusMobileDisplayPlugin
+ */
+public class OculusMobileActivity extends Activity implements SurfaceHolder.Callback {
+    private static final String TAG = OculusMobileActivity.class.getSimpleName();
+    static { System.loadLibrary("oculusMobile"); }
+    private native void nativeOnCreate();
+    private native static void nativeOnResume();
+    private native static void nativeOnPause();
+    private native static void nativeOnDestroy();
+    private native static void nativeOnSurfaceChanged(Surface s);
+
+    private SurfaceView mView;
+    private SurfaceHolder mSurfaceHolder;
+
+
+    public static void launch(Activity activity) {
+        if (activity != null) {
+            activity.runOnUiThread(()->{
+                activity.startActivity(new Intent(activity, OculusMobileActivity.class));
+            });
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Log.w(TAG, "QQQ onCreate");
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        // Create a native surface for VR rendering (Qt GL surfaces are not suitable
+        // because of the lack of fine control over the surface callbacks)
+        mView = new SurfaceView(this);
+        setContentView(mView);
+        mView.getHolder().addCallback(this);
+
+        // Forward the create message to the JNI code
+        nativeOnCreate();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.w(TAG, "QQQ onDestroy");
+        if (mSurfaceHolder != null) {
+            nativeOnSurfaceChanged(null);
+        }
+        nativeOnDestroy();
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.w(TAG, "QQQ onResume");
+        super.onResume();
+        nativeOnResume();
+    }
+
+    @Override
+    protected void onPause() {
+        Log.w(TAG, "QQQ onPause");
+        nativeOnPause();
+        super.onPause();
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        Log.w(TAG, "QQQ surfaceCreated");
+        nativeOnSurfaceChanged(holder.getSurface());
+        mSurfaceHolder = holder;
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+        Log.w(TAG, "QQQ surfaceChanged");
+        nativeOnSurfaceChanged(holder.getSurface());
+        mSurfaceHolder = holder;
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        Log.w(TAG, "QQQ surfaceDestroyed");
+        nativeOnSurfaceChanged(null);
+        mSurfaceHolder = null;
+    }
+}
\ No newline at end of file
diff --git a/android/settings.gradle b/android/settings.gradle
index 1e7b3c768a..699f617cce 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,8 +1,26 @@
+//
+// Libraries
+//
+
+include ':oculus'
+project(':oculus').projectDir = new File(settingsDir, 'libraries/oculus')
+
 include ':qt'
 project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
 
+//
+// Applications
+//
+
 include ':interface'
 project(':interface').projectDir = new File(settingsDir, 'apps/interface')
 
-//include ':framePlayer'
-//project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+//
+// Test projects
+//
+
+include ':framePlayer'
+project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+
+include ':questFramePlayer'
+project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
diff --git a/hifi_android.py b/hifi_android.py
index 13c9cdccf2..2e6a42d127 100644
--- a/hifi_android.py
+++ b/hifi_android.py
@@ -52,6 +52,13 @@ ANDROID_PACKAGES = {
         'sharedLibFolder': 'VrApi/Libs/Android/arm64-v8a/Release',
         'includeLibs': ['libvrapi.so']
     },
+    'oculusPlatform': {
+        'file': 'OVRPlatformSDK_v1.32.0.zip',
+        'versionId': 'jG9DB16zOGxSrmtZy4jcQnwO0TJUuaeL',
+        'checksum': 'ab5b203b3a39a56ab148d68fff769e05',
+        'sharedLibFolder': 'Android/libs/arm64-v8a',
+        'includeLibs': ['libovrplatformloader.so']
+    },
     'openssl': {
         'file': 'openssl-1.1.0g_armv8.tgz',
         'versionId': 'AiiPjmgUZTgNj7YV1EEx2lL47aDvvvAW',
diff --git a/libraries/oculusMobile/CMakeLists.txt b/libraries/oculusMobile/CMakeLists.txt
new file mode 100644
index 0000000000..213721722c
--- /dev/null
+++ b/libraries/oculusMobile/CMakeLists.txt
@@ -0,0 +1,11 @@
+if (ANDROID)
+    set(TARGET_NAME oculusMobile)
+    # don't use the setup_hifi_library macro, we don't want ANY qt dependencies
+    file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp" "src/*.c" "src/*.qrc")
+    add_library(${TARGET_NAME} SHARED ${LIB_SRCS})
+    target_glm()
+    target_egl()
+    target_glad()
+    target_oculus_mobile()
+    target_link_libraries(${TARGET_NAME} android log)
+endif()
diff --git a/libraries/oculusMobile/src/ovr/Forward.h b/libraries/oculusMobile/src/ovr/Forward.h
new file mode 100644
index 0000000000..5881dde9a7
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Forward.h
@@ -0,0 +1,17 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/23
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+#include <mutex>
+#include <functional>
+
+namespace ovr {
+    using Mutex = std::mutex;
+    using Condition = std::condition_variable;
+    using Lock = std::unique_lock<Mutex>;
+    using Task = std::function<void()>;
+}
\ No newline at end of file
diff --git a/libraries/oculusMobile/src/ovr/Framebuffer.cpp b/libraries/oculusMobile/src/ovr/Framebuffer.cpp
new file mode 100644
index 0000000000..4c4fd2a983
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Framebuffer.cpp
@@ -0,0 +1,93 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "Framebuffer.h"
+
+#include <EGL/egl.h>
+#include <glad/glad.h>
+#include <android/log.h>
+
+#include <VrApi.h>
+#include <VrApi_Helpers.h>
+
+using namespace ovr;
+
+void Framebuffer::updateLayer(int eye, ovrLayerProjection2& layer, const ovrMatrix4f* projectionMatrix ) const {
+    auto& layerTexture = layer.Textures[eye];
+    layerTexture.ColorSwapChain = _swapChain;
+    layerTexture.SwapChainIndex = _index;
+    if (projectionMatrix) {
+        layerTexture.TexCoordsFromTanAngles = ovrMatrix4f_TanAngleMatrixFromProjection( projectionMatrix );
+    }
+    layerTexture.TextureRect = { 0, 0, 1, 1 };
+}
+
+void Framebuffer::create(const glm::uvec2& size) {
+    _size = size;
+    _index = 0;
+    _validTexture = false;
+
+    // Depth renderbuffer
+    glGenRenderbuffers(1, &_depth);
+    glBindRenderbuffer(GL_RENDERBUFFER, _depth);
+    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, _size.x, _size.y);
+    glBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+    // Framebuffer
+    glGenFramebuffers(1, &_fbo);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
+    glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, _depth);
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+    _swapChain = vrapi_CreateTextureSwapChain3(VRAPI_TEXTURE_TYPE_2D, GL_RGBA8, _size.x, _size.y, 1, 3);
+    _length = vrapi_GetTextureSwapChainLength(_swapChain);
+    if (!_length) {
+        __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "Unable to count swap chain textures");
+        return;
+    }
+
+    for (int i = 0; i < _length; ++i) {
+        GLuint chainTexId = vrapi_GetTextureSwapChainHandle(_swapChain, i);
+        glBindTexture(GL_TEXTURE_2D, chainTexId);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    }
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+void Framebuffer::destroy() {
+    if (0 != _fbo) {
+        glDeleteFramebuffers(1, &_fbo);
+        _fbo = 0;
+    }
+    if (0 != _depth) {
+        glDeleteRenderbuffers(1, &_depth);
+        _depth = 0;
+    }
+    if (_swapChain != nullptr) {
+        vrapi_DestroyTextureSwapChain(_swapChain);
+        _swapChain = nullptr;
+    }
+    _index = -1;
+    _length = -1;
+}
+
+void Framebuffer::advance() {
+    _index = (_index + 1) % _length;
+    _validTexture = false;
+}
+
+void Framebuffer::bind() {
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _fbo);
+    if (!_validTexture) {
+        GLuint chainTexId = vrapi_GetTextureSwapChainHandle(_swapChain, _index);
+        glFramebufferTexture(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, chainTexId, 0);
+        _validTexture = true;
+    }
+}
diff --git a/libraries/oculusMobile/src/ovr/Framebuffer.h b/libraries/oculusMobile/src/ovr/Framebuffer.h
new file mode 100644
index 0000000000..5127574462
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Framebuffer.h
@@ -0,0 +1,34 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <cstdint>
+#include <glm/glm.hpp>
+
+#include <VrApi_Types.h>
+
+namespace ovr {
+
+struct Framebuffer {
+public:
+    void updateLayer(int eye, ovrLayerProjection2& layer, const ovrMatrix4f* projectionMatrix = nullptr) const;
+    void create(const glm::uvec2& size);
+    void advance();
+    void destroy();
+    void bind();
+
+    uint32_t _depth { 0 };
+    uint32_t _fbo{ 0 };
+    int _length{ -1 };
+    int _index{ -1 };
+    bool _validTexture{ false };
+    glm::uvec2 _size;
+    ovrTextureSwapChain* _swapChain{ nullptr };
+};
+
+}  // namespace ovr
\ No newline at end of file
diff --git a/libraries/oculusMobile/src/ovr/GLContext.cpp b/libraries/oculusMobile/src/ovr/GLContext.cpp
new file mode 100644
index 0000000000..449ba67084
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/GLContext.cpp
@@ -0,0 +1,182 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "GLContext.h"
+
+#include <array>
+#include <vector>
+#include <mutex>
+
+#include <android/log.h>
+
+#if !defined(EGL_OPENGL_ES3_BIT_KHR)
+#define EGL_OPENGL_ES3_BIT_KHR 0x0040
+#endif
+
+using namespace ovr;
+
+static void* getGlProcessAddress(const char *namez) {
+    auto result = eglGetProcAddress(namez);
+    return (void*)result;
+}
+
+
+void GLContext::initModule() {
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        gladLoadGLES2Loader(getGlProcessAddress);
+    });
+}
+
+void APIENTRY debugMessageCallback(GLenum source,
+                                   GLenum type,
+                                   GLuint id,
+                                   GLenum severity,
+                                   GLsizei length,
+                                   const GLchar* message,
+                                   const void* userParam) {
+    if (type == GL_DEBUG_TYPE_PERFORMANCE_KHR) {
+        return;
+    }
+    switch (severity) {
+        case GL_DEBUG_SEVERITY_HIGH:
+        case GL_DEBUG_SEVERITY_MEDIUM:
+            break;
+        default:
+            return;
+    }
+
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_GL", message);
+}
+
+GLContext::~GLContext() {
+    destroy();
+}
+
+EGLConfig GLContext::findConfig(EGLDisplay display) {
+    // Do NOT use eglChooseConfig, because the Android EGL code pushes in multisample
+    // flags in eglChooseConfig if the user has selected the "force 4x MSAA" option in
+    // settings, and that is completely wasted for our warp target.
+    std::vector<EGLConfig> configs;
+    {
+        const int MAX_CONFIGS = 1024;
+        EGLConfig configsBuffer[MAX_CONFIGS];
+        EGLint numConfigs = 0;
+        if (eglGetConfigs(display, configsBuffer, MAX_CONFIGS, &numConfigs) == EGL_FALSE) {
+            __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed to fetch configs");
+            return 0;
+        }
+        configs.resize(numConfigs);
+        memcpy(configs.data(), configsBuffer, sizeof(EGLConfig) * numConfigs);
+    }
+
+    std::vector<std::pair<EGLint, EGLint>> configAttribs{
+        { EGL_RED_SIZE, 8 },   { EGL_GREEN_SIZE, 8 },   { EGL_BLUE_SIZE, 8 }, { EGL_ALPHA_SIZE, 8 },
+        { EGL_DEPTH_SIZE, 0 }, { EGL_STENCIL_SIZE, 0 }, { EGL_SAMPLES, 0 },
+    };
+
+    auto matchAttrib = [&](EGLConfig config, const std::pair<EGLint, EGLint>& attribAndValue) {
+        EGLint value = 0;
+        eglGetConfigAttrib(display, config, attribAndValue.first, &value);
+        return (attribAndValue.second == value);
+    };
+
+    auto matchAttribFlags = [&](EGLConfig config, const std::pair<EGLint, EGLint>& attribAndValue) {
+        EGLint value = 0;
+        eglGetConfigAttrib(display, config, attribAndValue.first, &value);
+        return (value & attribAndValue.second) == attribAndValue.second;
+    };
+
+    auto matchConfig = [&](EGLConfig config) {
+        if (!matchAttribFlags(config, { EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT_KHR})) {
+            return false;
+        }
+        // The pbuffer config also needs to be compatible with normal window rendering
+        // so it can share textures with the window context.
+        if (!matchAttribFlags(config, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT})) {
+            return false;
+        }
+
+        for (const auto& attrib : configAttribs) {
+            if (!matchAttrib(config, attrib)) {
+                return false;
+            }
+        }
+
+        return true;
+    };
+
+
+    for (const auto& config : configs) {
+        if (matchConfig(config)) {
+            return config;
+        }
+    }
+
+    return 0;
+}
+
+bool GLContext::makeCurrent() {
+    return eglMakeCurrent(display, surface, surface, context) != EGL_FALSE;
+}
+
+void GLContext::doneCurrent() {
+    eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+}
+
+bool GLContext::create(EGLDisplay display, EGLContext shareContext) {
+    this->display = display;
+
+    auto config = findConfig(display);
+
+    if (config == 0) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglChooseConfig");
+        return false;
+    }
+
+    EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE };
+
+    context = eglCreateContext(display, config, shareContext, contextAttribs);
+    if (context == EGL_NO_CONTEXT) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglCreateContext");
+        return false;
+    }
+
+    const EGLint surfaceAttribs[] = { EGL_WIDTH, 16, EGL_HEIGHT, 16, EGL_NONE };
+    surface = eglCreatePbufferSurface(display, config, surfaceAttribs);
+    if (surface == EGL_NO_SURFACE) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglCreatePbufferSurface");
+        return false;
+    }
+
+    if (!makeCurrent()) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_GL", "Failed eglMakeCurrent");
+        return false;
+    }
+
+    ovr::GLContext::initModule();
+
+#ifndef NDEBUG
+    glDebugMessageCallback(debugMessageCallback, this);
+    glEnable(GL_DEBUG_OUTPUT);
+    glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+#endif
+    return true;
+}
+
+void GLContext::destroy() {
+    if (context != EGL_NO_CONTEXT) {
+        eglDestroyContext(display, context);
+        context = EGL_NO_CONTEXT;
+    }
+
+    if (surface != EGL_NO_SURFACE) {
+        eglDestroySurface(display, surface);
+        surface = EGL_NO_SURFACE;
+    }
+}
diff --git a/libraries/oculusMobile/src/ovr/GLContext.h b/libraries/oculusMobile/src/ovr/GLContext.h
new file mode 100644
index 0000000000..04f96e8d47
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/GLContext.h
@@ -0,0 +1,37 @@
+//
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <memory>
+
+#include <EGL/egl.h>
+#include <glad/glad.h>
+
+namespace ovr {
+
+struct GLContext {
+    using Pointer = std::shared_ptr<GLContext>;
+    EGLSurface surface{ EGL_NO_SURFACE };
+    EGLContext context{ EGL_NO_CONTEXT };
+    EGLDisplay display{ EGL_NO_DISPLAY };
+
+    ~GLContext();
+    static EGLConfig findConfig(EGLDisplay display);
+    bool makeCurrent();
+    void doneCurrent();
+    bool create(EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY), EGLContext shareContext = EGL_NO_CONTEXT);
+    void destroy();
+    operator bool() const { return context != EGL_NO_CONTEXT; }
+    static void initModule();
+};
+
+}
+
+
+#define CHECK_GL_ERROR() if(false) {}
\ No newline at end of file
diff --git a/libraries/oculusMobile/src/ovr/Helpers.cpp b/libraries/oculusMobile/src/ovr/Helpers.cpp
new file mode 100644
index 0000000000..a48d37311e
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Helpers.cpp
@@ -0,0 +1,38 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "Helpers.h"
+
+#include <atomic>
+#include <algorithm>
+#include <android/log.h>
+#include <VrApi_Helpers.h>
+
+using namespace ovr;
+
+void Fov::extend(const Fov& other) {
+    for (size_t i = 0; i < 4; ++i) {
+        leftRightUpDown[i] = std::max(leftRightUpDown[i], other.leftRightUpDown[i]);
+    }
+}
+
+void Fov::extract(const ovrMatrix4f& mat) {
+    auto& fs = leftRightUpDown;
+    ovrMatrix4f_ExtractFov( &mat, fs, fs + 1, fs + 2, fs + 3);
+}
+
+glm::mat4 Fov::withZ(float nearZ, float farZ) const {
+    const auto& fs = leftRightUpDown;
+    return ovr::toGlm(ovrMatrix4f_CreateProjectionAsymmetricFov(fs[0], fs[1], fs[2], fs[3], nearZ, farZ));
+}
+
+glm::mat4 Fov::withZ(const glm::mat4& other) const {
+    // FIXME
+    return withZ(0.01f, 1000.0f);
+}
+
diff --git a/libraries/oculusMobile/src/ovr/Helpers.h b/libraries/oculusMobile/src/ovr/Helpers.h
new file mode 100644
index 0000000000..2bd0b7f603
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/Helpers.h
@@ -0,0 +1,94 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <functional>
+#include <glm/glm.hpp>
+#include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include <VrApi_Types.h>
+
+namespace ovr {
+
+struct Fov {
+    float leftRightUpDown[4];
+    Fov() {}
+    Fov(const ovrMatrix4f& mat) { extract(mat); }
+    void extract(const ovrMatrix4f& mat);
+    void extend(const Fov& other);
+    glm::mat4 withZ(const glm::mat4& other) const;
+    glm::mat4 withZ(float nearZ, float farZ) const;
+};
+
+// Convenience method for looping over each eye with a lambda
+static inline void for_each_eye(const std::function<void(ovrEye)>& f) {
+    f(VRAPI_EYE_LEFT);
+    f(VRAPI_EYE_RIGHT);
+}
+
+static inline void for_each_hand(const std::function<void(ovrHandedness)>& f) {
+    f(VRAPI_HAND_LEFT);
+    f(VRAPI_HAND_RIGHT);
+}
+
+static inline glm::mat4 toGlm(const ovrMatrix4f& om) {
+    return glm::transpose(glm::make_mat4(&om.M[0][0]));
+}
+
+static inline glm::vec3 toGlm(const ovrVector3f& ov) {
+    return glm::make_vec3(&ov.x);
+}
+
+static inline glm::vec2 toGlm(const ovrVector2f& ov) {
+    return glm::make_vec2(&ov.x);
+}
+
+static inline glm::quat toGlm(const ovrQuatf& oq) {
+    return glm::make_quat(&oq.x);
+}
+
+static inline glm::mat4 toGlm(const ovrPosef& op) {
+    glm::mat4 orientation = glm::mat4_cast(toGlm(op.Orientation));
+    glm::mat4 translation = glm::translate(glm::mat4(), toGlm(op.Position));
+    return translation * orientation;
+}
+
+static inline ovrMatrix4f fromGlm(const glm::mat4& m) {
+    ovrMatrix4f result;
+    glm::mat4 transposed(glm::transpose(m));
+    memcpy(result.M, &(transposed[0][0]), sizeof(float) * 16);
+    return result;
+}
+
+static inline ovrVector3f fromGlm(const glm::vec3& v) {
+    return { v.x, v.y, v.z };
+}
+
+static inline ovrVector2f fromGlm(const glm::vec2& v) {
+    return { v.x, v.y };
+}
+
+static inline ovrQuatf fromGlm(const glm::quat& q) {
+    return { q.x, q.y, q.z, q.w };
+}
+
+static inline ovrPosef poseFromGlm(const glm::mat4& m) {
+    glm::vec3 translation = glm::vec3(m[3]) / m[3].w;
+    glm::quat orientation = glm::quat_cast(m);
+    ovrPosef result;
+    result.Orientation = fromGlm(orientation);
+    result.Position = fromGlm(translation);
+    return result;
+}
+
+}
+
+
+
+
+
diff --git a/libraries/oculusMobile/src/ovr/TaskQueue.cpp b/libraries/oculusMobile/src/ovr/TaskQueue.cpp
new file mode 100644
index 0000000000..5506a35acd
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/TaskQueue.cpp
@@ -0,0 +1,40 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/23
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "TaskQueue.h"
+
+using namespace ovr;
+
+void TaskQueue::submitTaskBlocking(Lock& lock, const Task& newTask) {
+    _task = newTask;
+    _taskPending = true;
+    _taskCondition.wait(lock, [=]() -> bool { return !_taskPending; });
+}
+
+void TaskQueue::submitTaskBlocking(const Task& task) {
+    Lock lock(_mutex);
+    submitTaskBlocking(lock, task);
+}
+
+void TaskQueue::pollTask() {
+    Lock lock(_mutex);
+    if (_taskPending) {
+        _task();
+        _taskPending = false;
+        _taskCondition.notify_one();
+    }
+}
+
+void TaskQueue::withLock(const Task& task) {
+    Lock lock(_mutex);
+    task();
+}
+
+void TaskQueue::withLockConditional(const LockTask& task) {
+    Lock lock(_mutex);
+    task(lock);
+}
diff --git a/libraries/oculusMobile/src/ovr/TaskQueue.h b/libraries/oculusMobile/src/ovr/TaskQueue.h
new file mode 100644
index 0000000000..4ec055ece9
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/TaskQueue.h
@@ -0,0 +1,42 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <mutex>
+#include <functional>
+
+namespace ovr {
+
+using Mutex = std::mutex;
+using Condition = std::condition_variable;
+using Lock = std::unique_lock<Mutex>;
+using Task = std::function<void()>;
+using LockTask = std::function<void(Lock& lock)>;
+
+class TaskQueue {
+public:
+    // Execute a task on another thread
+    void submitTaskBlocking(const Task& task);
+    void submitTaskBlocking(Lock& lock, const Task& task);
+    void pollTask();
+
+    void withLock(const Task& task);
+    void withLockConditional(const LockTask& task);
+private:
+    Mutex _mutex;
+    Task _task;
+    bool _taskPending{ false };
+    Condition _taskCondition;
+};
+
+}
+
+
+
+
+
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp
new file mode 100644
index 0000000000..de2b4e1ff6
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp
@@ -0,0 +1,337 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "VrHandler.h"
+
+#include <android/native_window_jni.h>
+#include <android/log.h>
+
+#include <unistd.h>
+
+#include <VrApi.h>
+#include <VrApi_Helpers.h>
+#include <VrApi_Types.h>
+//#include <OVR_Platform.h>
+
+#include "GLContext.h"
+#include "Helpers.h"
+#include "Framebuffer.h"
+
+
+
+using namespace ovr;
+
+static thread_local bool isRenderThread { false };
+
+struct VrSurface : public TaskQueue {
+    using HandlerTask = VrHandler::HandlerTask;
+
+    JavaVM* vm{nullptr};
+    jobject oculusActivity{ nullptr };
+    ANativeWindow* nativeWindow{ nullptr };
+
+    VrHandler* handler{nullptr};
+    ovrMobile* session{nullptr};
+    bool resumed { false };
+    GLContext vrglContext;
+    Framebuffer eyeFbos[2];
+    uint32_t readFbo{0};
+    std::atomic<uint32_t> presentIndex{1};
+    double displayTime{0};
+
+    static constexpr float EYE_BUFFER_SCALE = 1.0f;
+
+    void onCreate(JNIEnv* env, jobject activity) {
+        env->GetJavaVM(&vm);
+        oculusActivity = env->NewGlobalRef(activity);
+    }
+
+    void setResumed(bool newResumed) {
+        this->resumed = newResumed;
+        submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
+    }
+
+    void setNativeWindow(ANativeWindow* newNativeWindow) {
+        auto oldNativeWindow = nativeWindow;
+        nativeWindow = newNativeWindow;
+        if (oldNativeWindow) {
+            ANativeWindow_release(oldNativeWindow);
+        }
+        submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
+    }
+
+    void init() {
+        if (!handler) {
+            return;
+        }
+
+        EGLContext currentContext = eglGetCurrentContext();
+        EGLDisplay currentDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+        vrglContext.create(currentDisplay, currentContext);
+        vrglContext.makeCurrent();
+
+        glm::uvec2 eyeTargetSize;
+        withEnv([&](JNIEnv* env){
+            ovrJava java{ vm, env, oculusActivity };
+            eyeTargetSize = glm::uvec2 {
+                vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH) * EYE_BUFFER_SCALE,
+                vrapi_GetSystemPropertyInt(&java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_HEIGHT) * EYE_BUFFER_SCALE,
+            };
+        });
+        __android_log_print(ANDROID_LOG_WARN, "QQQ_OVR", "QQQ Eye Size %d, %d", eyeTargetSize.x, eyeTargetSize.y);
+        ovr::for_each_eye([&](ovrEye eye) {
+            eyeFbos[eye].create(eyeTargetSize);
+        });
+        glGenFramebuffers(1, &readFbo);
+        vrglContext.doneCurrent();
+    }
+
+    void shutdown() {
+    }
+
+    void setHandler(VrHandler *newHandler) {
+        withLock([&] {
+            isRenderThread = newHandler != nullptr;
+            if (handler != newHandler) {
+                shutdown();
+                handler = newHandler;
+                init();
+                if (handler) {
+                    updateVrMode();
+                }
+            }
+        });
+    }
+
+    void submitRenderThreadTask(const HandlerTask &task) {
+        withLockConditional([&](Lock &lock) {
+            if (handler != nullptr) {
+                submitTaskBlocking(lock, [&] {
+                    task(handler);
+                });
+            }
+        });
+    }
+
+    void withEnv(const std::function<void(JNIEnv*)>& f) {
+        JNIEnv* env = nullptr;
+        bool attached = false;
+        vm->GetEnv((void**)&env, JNI_VERSION_1_6);
+        if (!env) {
+            attached = true;
+            vm->AttachCurrentThread(&env, nullptr);
+        }
+        f(env);
+        if (attached) {
+            vm->DetachCurrentThread();
+        }
+    }
+
+    void updateVrMode() {
+        // For VR mode to be valid, the activity must be between an onResume and
+        // an onPause call and must additionally have a valid native window handle
+        bool vrReady = resumed && nullptr != nativeWindow;
+        // If we're IN VR mode, we'll have a non-null ovrMobile pointer in session
+        bool vrRunning = session != nullptr;
+        if (vrReady != vrRunning) {
+            if (vrRunning) {
+                __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "vrapi_LeaveVrMode");
+                vrapi_LeaveVrMode(session);
+                session = nullptr;
+                oculusActivity = nullptr;
+            } else {
+                __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "vrapi_EnterVrMode");
+                withEnv([&](JNIEnv* env){
+                    ovrJava java{ vm, env, oculusActivity };
+                    ovrModeParms modeParms = vrapi_DefaultModeParms(&java);
+                    modeParms.Flags |= VRAPI_MODE_FLAG_NATIVE_WINDOW;
+                    modeParms.Display = (unsigned long long) vrglContext.display;
+                    modeParms.ShareContext = (unsigned long long) vrglContext.context;
+                    modeParms.WindowSurface = (unsigned long long) nativeWindow;
+                    session = vrapi_EnterVrMode(&modeParms);
+                    ovrPosef trackingTransform = vrapi_GetTrackingTransform( session, VRAPI_TRACKING_TRANSFORM_SYSTEM_CENTER_EYE_LEVEL);
+                    vrapi_SetTrackingTransform( session, trackingTransform );
+                    vrapi_SetPerfThread(session, VRAPI_PERF_THREAD_TYPE_RENDERER, pthread_self());
+                    vrapi_SetClockLevels(session, 2, 4);
+                    vrapi_SetExtraLatencyMode(session, VRAPI_EXTRA_LATENCY_MODE_DYNAMIC);
+                    vrapi_SetDisplayRefreshRate(session, 72);
+                });
+            }
+        }
+    }
+
+    void presentFrame(uint32_t sourceTexture, const glm::uvec2 &sourceSize, const ovrTracking2& tracking) {
+        ovrLayerProjection2 layer = vrapi_DefaultLayerProjection2();
+        layer.HeadPose = tracking.HeadPose;
+        if (sourceTexture) {
+            glBindFramebuffer(GL_READ_FRAMEBUFFER, readFbo);
+            glFramebufferTexture(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, sourceTexture, 0);
+            GLenum framebufferStatus = glCheckFramebufferStatus(GL_READ_FRAMEBUFFER);
+            if (GL_FRAMEBUFFER_COMPLETE != framebufferStatus) {
+                __android_log_print(ANDROID_LOG_WARN, "QQQ_OVR", "incomplete framebuffer");
+            }
+        }
+        GLenum invalidateAttachment = GL_COLOR_ATTACHMENT0;
+
+        ovr::for_each_eye([&](ovrEye eye) {
+            const auto &eyeTracking = tracking.Eye[eye];
+            auto &eyeFbo = eyeFbos[eye];
+            const auto &destSize = eyeFbo._size;
+            eyeFbo.bind();
+            glInvalidateFramebuffer(GL_DRAW_FRAMEBUFFER, 1, &invalidateAttachment);
+            if (sourceTexture) {
+                auto sourceWidth = sourceSize.x / 2;
+                auto sourceX = (eye == VRAPI_EYE_LEFT) ? 0 : sourceWidth;
+                glBlitFramebuffer(
+                    sourceX, 0, sourceX + sourceWidth, sourceSize.y,
+                    0, 0, destSize.x, destSize.y,
+                    GL_COLOR_BUFFER_BIT, GL_NEAREST);
+            }
+            eyeFbo.updateLayer(eye, layer, &eyeTracking.ProjectionMatrix);
+            eyeFbo.advance();
+        });
+        if (sourceTexture) {
+            glInvalidateFramebuffer(GL_READ_FRAMEBUFFER, 1, &invalidateAttachment);
+            glFramebufferTexture(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 0, 0);
+        }
+        glFlush();
+
+        ovrLayerHeader2 *layerHeader = &layer.Header;
+        ovrSubmitFrameDescription2 frameDesc = {};
+        frameDesc.SwapInterval = 2;
+        frameDesc.FrameIndex = presentIndex;
+        frameDesc.DisplayTime = displayTime;
+        frameDesc.LayerCount = 1;
+        frameDesc.Layers = &layerHeader;
+        vrapi_SubmitFrame2(session, &frameDesc);
+        ++presentIndex;
+    }
+
+    ovrTracking2 beginFrame() {
+        displayTime = vrapi_GetPredictedDisplayTime(session, presentIndex);
+        return vrapi_GetPredictedTracking2(session, displayTime);
+    }
+};
+
+static VrSurface SURFACE;
+
+bool VrHandler::vrActive() const {
+    return SURFACE.session != nullptr;
+}
+
+void VrHandler::setHandler(VrHandler* handler) {
+    SURFACE.setHandler(handler);
+}
+
+void VrHandler::pollTask() {
+    SURFACE.pollTask();
+}
+
+void VrHandler::makeCurrent() {
+    if (!SURFACE.vrglContext.makeCurrent()) {
+        __android_log_write(ANDROID_LOG_WARN, "QQQ", "Failed to make GL current");
+    }
+}
+
+void VrHandler::doneCurrent() {
+    SURFACE.vrglContext.doneCurrent();
+}
+
+uint32_t VrHandler::currentPresentIndex() const {
+    return SURFACE.presentIndex;
+}
+
+ovrTracking2 VrHandler::beginFrame() {
+    return SURFACE.beginFrame();
+}
+
+void VrHandler::presentFrame(uint32_t sourceTexture, const glm::uvec2 &sourceSize, const ovrTracking2& tracking) const {
+    SURFACE.presentFrame(sourceTexture, sourceSize, tracking);
+}
+
+bool VrHandler::withOvrJava(const OvrJavaTask& task) {
+    SURFACE.withEnv([&](JNIEnv* env){
+        ovrJava java{ SURFACE.vm, env, SURFACE.oculusActivity };
+        task(&java);
+    });
+    return true;
+}
+
+bool VrHandler::withOvrMobile(const OvrMobileTask &task) {
+    auto sessionTask = [&]()->bool{
+        if (!SURFACE.session) {
+            return false;
+        }
+        task(SURFACE.session);
+        return true;
+    };
+
+    if (isRenderThread) {
+        return sessionTask();
+    }
+
+    bool result = false;
+    SURFACE.withLock([&]{
+        result = sessionTask();
+    });
+    return result;
+}
+
+
+void VrHandler::initVr(const char* appId) {
+    withOvrJava([&](const ovrJava* java){
+        ovrInitParms initParms = vrapi_DefaultInitParms(java);
+        initParms.GraphicsAPI = VRAPI_GRAPHICS_API_OPENGL_ES_3;
+        if (vrapi_Initialize(&initParms) != VRAPI_INITIALIZE_SUCCESS) {
+            __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "Failed vrapi init");
+        }
+    });
+
+  //  if (appId) {
+  //      auto platformInitResult = ovr_PlatformInitializeAndroid(appId, activity.object(), env);
+  //      if (ovrPlatformInitialize_Success != platformInitResult) {
+  //          __android_log_write(ANDROID_LOG_WARN, "QQQ_OVR", "Failed ovr platform init");
+  //      }
+  //  }
+}
+
+void VrHandler::shutdownVr() {
+    vrapi_Shutdown();
+}
+
+extern "C" {
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "oculusMobile::JNI_OnLoad");
+    return JNI_VERSION_1_6;
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.onCreate(env, obj);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnDestroy(JNIEnv*, jclass) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnResume(JNIEnv*, jclass) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.setResumed(true);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnPause(JNIEnv*, jclass) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.setResumed(false);
+}
+
+JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnSurfaceChanged(JNIEnv* env, jclass, jobject surface) {
+    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
+    SURFACE.setNativeWindow(surface ? ANativeWindow_fromSurface( env, surface ) : nullptr);
+}
+
+} // extern "C"
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.h b/libraries/oculusMobile/src/ovr/VrHandler.h
new file mode 100644
index 0000000000..3c36ee8626
--- /dev/null
+++ b/libraries/oculusMobile/src/ovr/VrHandler.h
@@ -0,0 +1,47 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <glm/glm.hpp>
+#include <jni.h>
+#include <VrApi_Types.h>
+
+#include "TaskQueue.h"
+
+typedef struct ovrMobile ovrMobile;
+namespace ovr {
+
+class VrHandler {
+public:
+    using HandlerTask = std::function<void(VrHandler*)>;
+    using OvrMobileTask = std::function<void(ovrMobile*)>;
+    using OvrJavaTask = std::function<void(const ovrJava*)>;
+    static void setHandler(VrHandler* handler);
+    static bool withOvrMobile(const OvrMobileTask& task);
+
+protected:
+    static void initVr(const char* appId = nullptr);
+    static void shutdownVr();
+    static bool withOvrJava(const OvrJavaTask& task);
+
+    uint32_t currentPresentIndex() const;
+    ovrTracking2 beginFrame();
+    void presentFrame(uint32_t textureId, const glm::uvec2& size, const ovrTracking2& tracking) const;
+
+    bool vrActive() const;
+    void pollTask();
+    void makeCurrent();
+    void doneCurrent();
+};
+
+}
+
+
+
+
+
diff --git a/libraries/oculusMobilePlugin/CMakeLists.txt b/libraries/oculusMobilePlugin/CMakeLists.txt
new file mode 100644
index 0000000000..b404c51f02
--- /dev/null
+++ b/libraries/oculusMobilePlugin/CMakeLists.txt
@@ -0,0 +1,29 @@
+#
+#  Created by Bradley Austin Davis on 2018/11/15
+#  Copyright 2013-2018 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
+#
+
+if (ANDROID)
+  set(TARGET_NAME oculusMobilePlugin)
+  setup_hifi_library(AndroidExtras Multimedia)
+
+  # if we were passed an Oculus App ID for entitlement checks, send that along
+  if (DEFINED ENV{OCULUS_APP_ID})
+    target_compile_definitions(${TARGET_NAME} -DOCULUS_APP_ID="$ENV{OCULUS_APP_ID}")
+  endif ()
+
+  link_hifi_libraries(
+    shared task gl shaders gpu controllers ui qml
+    plugins ui-plugins display-plugins input-plugins
+    audio-client networking render-utils
+    render graphics
+    oculusMobile 
+    ${PLATFORM_GL_BACKEND}
+  )
+  
+  include_hifi_library_headers(octree)
+  target_oculus_mobile()
+endif()
diff --git a/libraries/oculusMobilePlugin/src/Logging.cpp b/libraries/oculusMobilePlugin/src/Logging.cpp
new file mode 100644
index 0000000000..3d8628b0cb
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/Logging.cpp
@@ -0,0 +1,4 @@
+#include "Logging.h"
+
+Q_LOGGING_CATEGORY(displayplugins, "hifi.plugins.display")
+Q_LOGGING_CATEGORY(oculusLog, "hifi.plugins.display.oculus")
diff --git a/libraries/oculusMobilePlugin/src/Logging.h b/libraries/oculusMobilePlugin/src/Logging.h
new file mode 100644
index 0000000000..066712ef6a
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/Logging.h
@@ -0,0 +1,13 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/20
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <QtCore/QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(displayplugins)
+Q_DECLARE_LOGGING_CATEGORY(oculusLog)
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
new file mode 100644
index 0000000000..8de563ee4c
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
@@ -0,0 +1,694 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "OculusMobileControllerManager.h"
+
+#include <array>
+
+#include <ui-plugins/PluginContainer.h>
+#include <controllers/UserInputMapper.h>
+#include <controllers/StandardControls.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+
+#include <PerfStat.h>
+#include <PathUtils.h>
+#include <NumericalConstants.h>
+#include <StreamUtils.h>
+#include <VrApi.h>
+#include <VrApi_Input.h>
+#include <ovr/Helpers.h>
+
+#include "Logging.h"
+#include <ovr/VrHandler.h>
+
+const char* OculusMobileControllerManager::NAME = "Oculus";
+const quint64 LOST_TRACKING_DELAY = 3000000;
+
+namespace ovr {
+
+    controller::Pose toControllerPose(ovrHandedness hand, const ovrRigidBodyPosef& handPose) {
+        // When the sensor-to-world rotation is identity the coordinate axes look like this:
+        //
+        //                       user
+        //                      forward
+        //                        -z
+        //                         |
+        //                        y|      user
+        //      y                  o----x right
+        //       o-----x         user
+        //       |                up
+        //       |
+        //       z
+        //
+        //     Rift
+
+        // From ABOVE the hand canonical axes looks like this:
+        //
+        //      | | | |          y        | | | |
+        //      | | | |          |        | | | |
+        //      |     |          |        |     |
+        //      |left | /  x---- +      \ |right|
+        //      |     _/          z      \_     |
+        //       |   |                     |   |
+        //       |   |                     |   |
+        //
+
+        // So when the user is in Rift space facing the -zAxis with hands outstretched and palms down
+        // the rotation to align the Touch axes with those of the hands is:
+        //
+        //    touchToHand = halfTurnAboutY * quaterTurnAboutX
+
+        // Due to how the Touch controllers fit into the palm there is an offset that is different for each hand.
+        // You can think of this offset as the inverse of the measured rotation when the hands are posed, such that
+        // the combination (measurement * offset) is identity at this orientation.
+        //
+        //    Qoffset = glm::inverse(deltaRotation when hand is posed fingers forward, palm down)
+        //
+        // An approximate offset for the Touch can be obtained by inspection:
+        //
+        //    Qoffset = glm::inverse(glm::angleAxis(sign * PI/2.0f, zAxis) * glm::angleAxis(PI/4.0f, xAxis))
+        //
+        // So the full equation is:
+        //
+        //    Q = combinedMeasurement * touchToHand
+        //
+        //    Q = (deltaQ * QOffset) * (yFlip * quarterTurnAboutX)
+        //
+        //    Q = (deltaQ * inverse(deltaQForAlignedHand)) * (yFlip * quarterTurnAboutX)
+        static const glm::quat yFlip = glm::angleAxis(PI, Vectors::UNIT_Y);
+        static const glm::quat quarterX = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_X);
+        static const glm::quat touchToHand = yFlip * quarterX;
+
+        static const glm::quat leftQuarterZ = glm::angleAxis(-PI_OVER_TWO, Vectors::UNIT_Z);
+        static const glm::quat rightQuarterZ = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_Z);
+
+        static const glm::quat leftRotationOffset = glm::inverse(leftQuarterZ) * touchToHand;
+        static const glm::quat rightRotationOffset = glm::inverse(rightQuarterZ) * touchToHand;
+
+        static const float CONTROLLER_LENGTH_OFFSET = 0.0762f;  // three inches
+        static const glm::vec3 CONTROLLER_OFFSET =
+            glm::vec3(CONTROLLER_LENGTH_OFFSET / 2.0f, -CONTROLLER_LENGTH_OFFSET / 2.0f, CONTROLLER_LENGTH_OFFSET * 1.5f);
+        static const glm::vec3 leftTranslationOffset = glm::vec3(-1.0f, 1.0f, 1.0f) * CONTROLLER_OFFSET;
+        static const glm::vec3 rightTranslationOffset = CONTROLLER_OFFSET;
+
+        auto translationOffset = (hand == VRAPI_HAND_LEFT ? leftTranslationOffset : rightTranslationOffset);
+        auto rotationOffset = (hand == VRAPI_HAND_LEFT ? leftRotationOffset : rightRotationOffset);
+
+        glm::quat rotation = toGlm(handPose.Pose.Orientation);
+
+        controller::Pose pose;
+        pose.translation = toGlm(handPose.Pose.Position);
+        pose.translation += rotation * translationOffset;
+        pose.rotation = rotation * rotationOffset;
+        pose.angularVelocity = rotation * toGlm(handPose.AngularVelocity);
+        pose.velocity = toGlm(handPose.LinearVelocity);
+        pose.valid = true;
+        return pose;
+    }
+
+    controller::Pose toControllerPose(ovrHandedness hand,
+                                      const ovrRigidBodyPosef& handPose,
+                                      const ovrRigidBodyPosef& lastHandPose) {
+        static const glm::quat yFlip = glm::angleAxis(PI, Vectors::UNIT_Y);
+        static const glm::quat quarterX = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_X);
+        static const glm::quat touchToHand = yFlip * quarterX;
+
+        static const glm::quat leftQuarterZ = glm::angleAxis(-PI_OVER_TWO, Vectors::UNIT_Z);
+        static const glm::quat rightQuarterZ = glm::angleAxis(PI_OVER_TWO, Vectors::UNIT_Z);
+
+        static const glm::quat leftRotationOffset = glm::inverse(leftQuarterZ) * touchToHand;
+        static const glm::quat rightRotationOffset = glm::inverse(rightQuarterZ) * touchToHand;
+
+        static const float CONTROLLER_LENGTH_OFFSET = 0.0762f;  // three inches
+        static const glm::vec3 CONTROLLER_OFFSET =
+            glm::vec3(CONTROLLER_LENGTH_OFFSET / 2.0f, -CONTROLLER_LENGTH_OFFSET / 2.0f, CONTROLLER_LENGTH_OFFSET * 1.5f);
+        static const glm::vec3 leftTranslationOffset = glm::vec3(-1.0f, 1.0f, 1.0f) * CONTROLLER_OFFSET;
+        static const glm::vec3 rightTranslationOffset = CONTROLLER_OFFSET;
+
+        auto translationOffset = (hand == VRAPI_HAND_LEFT ? leftTranslationOffset : rightTranslationOffset);
+        auto rotationOffset = (hand == VRAPI_HAND_LEFT ? leftRotationOffset : rightRotationOffset);
+
+        glm::quat rotation = toGlm(handPose.Pose.Orientation);
+
+        controller::Pose pose;
+        pose.translation = toGlm(lastHandPose.Pose.Position);
+        pose.translation += rotation * translationOffset;
+        pose.rotation = rotation * rotationOffset;
+        pose.angularVelocity = toGlm(lastHandPose.AngularVelocity);
+        pose.velocity = toGlm(lastHandPose.LinearVelocity);
+        pose.valid = true;
+        return pose;
+    }
+
+}
+
+
+class OculusMobileInputDevice : public controller::InputDevice {
+    friend class OculusMobileControllerManager;
+public:
+    using Pointer = std::shared_ptr<OculusMobileInputDevice>;
+    static Pointer check(ovrMobile* session);
+
+    OculusMobileInputDevice(ovrMobile* session, const std::vector<ovrInputTrackedRemoteCapabilities>& devicesCaps);
+    void updateHands(ovrMobile* session);
+
+    controller::Input::NamedVector getAvailableInputs() const override;
+    QString getDefaultMappingConfig() const override;
+    void update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
+    void focusOutEvent() override;
+    bool triggerHapticPulse(float strength, float duration, controller::Hand hand) override;
+
+private:
+    void handlePose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
+                    ovrHandedness hand, const ovrRigidBodyPosef& handPose);
+    void handleRotationForUntrackedHand(const controller::InputCalibrationData& inputCalibrationData,
+                                        ovrHandedness hand, const ovrRigidBodyPosef& handPose);
+    void handleHeadPose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
+                        const ovrRigidBodyPosef& headPose);
+
+    // perform an action when the TouchDevice mutex is acquired.
+    using Locker = std::unique_lock<std::recursive_mutex>;
+
+    template <typename F>
+    void withLock(F&& f) { Locker locker(_lock); f(); }
+
+    mutable std::recursive_mutex _lock;
+    ovrTracking2 _headTracking;
+    struct HandData {
+        HandData() {
+            state.Header.ControllerType =ovrControllerType_TrackedRemote;
+        }
+
+        float hapticDuration { 0.0f };
+        float hapticStrength { 0.0f };
+        bool valid{ false };
+        bool lostTracking{ false };
+        quint64 regainTrackingDeadline;
+        ovrRigidBodyPosef lastPose;
+        ovrInputTrackedRemoteCapabilities caps;
+        ovrInputStateTrackedRemote state;
+        ovrResult stateResult{ ovrError_NotInitialized };
+        ovrTracking tracking;
+        ovrResult trackingResult{ ovrError_NotInitialized };
+        bool setHapticFeedback(float strength, float duration) {
+#if 0
+            bool success = true;
+            bool sessionSuccess = ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+                if (strength == 0.0f) {
+                    hapticStrength = 0.0f;
+                    hapticDuration = 0.0f;
+                } else {
+                    hapticStrength = (duration > hapticDuration) ? strength : hapticStrength;
+                    if (vrapi_SetHapticVibrationSimple(session, caps.Header.DeviceID, hapticStrength) != ovrSuccess) {
+                        success = false;
+                    }
+                    hapticDuration = std::max(duration, hapticDuration);
+                }
+            });
+            return success && sessionSuccess;
+#else
+            return true;
+#endif
+        }
+
+        void stopHapticPulse() {
+            ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+                vrapi_SetHapticVibrationSimple(session, caps.Header.DeviceID, 0.0f);
+            });
+        }
+
+        bool isValid() const {
+            return (stateResult == ovrSuccess) && (trackingResult == ovrSuccess);
+        }
+
+        void update(ovrMobile* session, double time = 0.0) {
+            const auto& deviceId = caps.Header.DeviceID;
+            stateResult = vrapi_GetCurrentInputState(session, deviceId, &state.Header);
+            trackingResult = vrapi_GetInputTrackingState(session, deviceId, 0.0, &tracking);
+        }
+    };
+    std::array<HandData, 2> _hands;
+};
+
+OculusMobileInputDevice::Pointer OculusMobileInputDevice::check(ovrMobile *session) {
+    Pointer result;
+
+    std::vector<ovrInputTrackedRemoteCapabilities> devicesCaps;
+    {
+        uint32_t deviceIndex { 0 };
+        ovrInputCapabilityHeader capsHeader;
+        while (vrapi_EnumerateInputDevices(session, deviceIndex, &capsHeader) >= 0) {
+            if (capsHeader.Type == ovrControllerType_TrackedRemote) {
+                ovrInputTrackedRemoteCapabilities caps;
+                caps.Header = capsHeader;
+                vrapi_GetInputDeviceCapabilities(session, &caps.Header);
+                devicesCaps.push_back(caps);
+            }
+            ++deviceIndex;
+        }
+    }
+    if (!devicesCaps.empty()) {
+        result.reset(new OculusMobileInputDevice(session, devicesCaps));
+    }
+    return result;
+}
+
+static OculusMobileInputDevice::Pointer oculusMobileControllers;
+
+bool OculusMobileControllerManager::isHandController() const {
+    return oculusMobileControllers.operator bool();
+}
+
+bool OculusMobileControllerManager::isSupported() const {
+    return true;
+}
+
+bool OculusMobileControllerManager::activate() {
+    InputPlugin::activate();
+    checkForConnectedDevices();
+    return true;
+}
+
+void OculusMobileControllerManager::checkForConnectedDevices() {
+    if (oculusMobileControllers) {
+        return;
+    }
+
+    ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+        oculusMobileControllers = OculusMobileInputDevice::check(session);
+        if (oculusMobileControllers) {
+            auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+            userInputMapper->registerDevice(oculusMobileControllers);
+        }
+    });
+}
+
+void OculusMobileControllerManager::deactivate() {
+    InputPlugin::deactivate();
+
+    // unregister with UserInputMapper
+    auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
+    if (oculusMobileControllers) {
+        userInputMapper->removeDevice(oculusMobileControllers->getDeviceID());
+        oculusMobileControllers.reset();
+    }
+}
+
+void OculusMobileControllerManager::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    PerformanceTimer perfTimer("OculusMobileInputDevice::update");
+
+    checkForConnectedDevices();
+
+    if (!oculusMobileControllers) {
+        return;
+    }
+
+    bool updated = ovr::VrHandler::withOvrMobile([&](ovrMobile* session){
+        oculusMobileControllers->updateHands(session);
+    });
+
+    if (updated) {
+        oculusMobileControllers->update(deltaTime, inputCalibrationData);
+    }
+}
+
+void OculusMobileControllerManager::pluginFocusOutEvent() {
+    if (oculusMobileControllers) {
+        oculusMobileControllers->focusOutEvent();
+    }
+}
+
+QStringList OculusMobileControllerManager::getSubdeviceNames() {
+    QStringList devices;
+    if (oculusMobileControllers) {
+        devices << oculusMobileControllers->getName();
+    }
+    return devices;
+}
+
+using namespace controller;
+
+static const std::vector<std::pair<ovrButton, StandardButtonChannel>> BUTTON_MAP { {
+    { ovrButton_Up, DU },
+    { ovrButton_Down, DD },
+    { ovrButton_Left, DL },
+    { ovrButton_Right, DR },
+    { ovrButton_Enter, START },
+    { ovrButton_Back, BACK },
+    { ovrButton_X, X },
+    { ovrButton_Y, Y },
+    { ovrButton_A, A },
+    { ovrButton_B, B },
+    { ovrButton_LThumb, LS },
+    { ovrButton_RThumb, RS },
+    //{ ovrButton_LShoulder, LB },
+    //{ ovrButton_RShoulder, RB },
+} };
+
+static const std::vector<std::pair<ovrTouch, StandardButtonChannel>> LEFT_TOUCH_MAP { {
+    { ovrTouch_X, LEFT_PRIMARY_THUMB_TOUCH },
+    { ovrTouch_Y, LEFT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_LThumb, LS_TOUCH },
+    { ovrTouch_ThumbUp, LEFT_THUMB_UP },
+    { ovrTouch_IndexTrigger, LEFT_PRIMARY_INDEX_TOUCH },
+    { ovrTouch_IndexPointing, LEFT_INDEX_POINT },
+} };
+
+
+static const std::vector<std::pair<ovrTouch, StandardButtonChannel>> RIGHT_TOUCH_MAP { {
+    { ovrTouch_A, RIGHT_PRIMARY_THUMB_TOUCH },
+    { ovrTouch_B, RIGHT_SECONDARY_THUMB_TOUCH },
+    { ovrTouch_RThumb, RS_TOUCH },
+    { ovrTouch_ThumbUp, RIGHT_THUMB_UP },
+    { ovrTouch_IndexTrigger, RIGHT_PRIMARY_INDEX_TOUCH },
+    { ovrTouch_IndexPointing, RIGHT_INDEX_POINT },
+} };
+
+void OculusMobileInputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
+    _buttonPressedMap.clear();
+
+    int numTrackedControllers = 0;
+    quint64 currentTime = usecTimestampNow();
+    handleHeadPose(deltaTime, inputCalibrationData, _headTracking.HeadPose);
+
+    static const auto REQUIRED_HAND_STATUS = VRAPI_TRACKING_STATUS_ORIENTATION_TRACKED | VRAPI_TRACKING_STATUS_POSITION_TRACKED;
+    ovr::for_each_hand([&](ovrHandedness hand) {
+        size_t handIndex = (hand == VRAPI_HAND_LEFT) ? 0 : 1;
+        int controller = (hand == VRAPI_HAND_LEFT) ? controller::LEFT_HAND : controller::RIGHT_HAND;
+        auto& handData = _hands[handIndex];
+        const auto& tracking = handData.tracking;
+        ++numTrackedControllers;
+
+        // Disable hand tracking while in Oculus Dash (Dash renders it's own hands)
+//        if (!hasInputFocus) {
+//            _poseStateMap.erase(controller);
+//            _poseStateMap[controller].valid = false;
+//            return;
+//        }
+
+        if (REQUIRED_HAND_STATUS == (tracking.Status & REQUIRED_HAND_STATUS)) {
+            _poseStateMap.erase(controller);
+            handlePose(deltaTime, inputCalibrationData, hand, tracking.HeadPose);
+            handData.lostTracking = false;
+            handData.lastPose = tracking.HeadPose;
+            return;
+        }
+
+        if (handData.lostTracking) {
+            if (currentTime > handData.regainTrackingDeadline) {
+                _poseStateMap.erase(controller);
+                _poseStateMap[controller].valid = false;
+                return;
+            }
+        } else {
+            quint64 deadlineToRegainTracking = currentTime + LOST_TRACKING_DELAY;
+            handData.regainTrackingDeadline = deadlineToRegainTracking;
+            handData.lostTracking = true;
+        }
+        handleRotationForUntrackedHand(inputCalibrationData, hand, tracking.HeadPose);
+    });
+
+
+    using namespace controller;
+    // Axes
+    {
+        const auto& inputState = _hands[0].state;
+        _axisStateMap[LX].value = inputState.JoystickNoDeadZone.x;
+        _axisStateMap[LY].value = inputState.JoystickNoDeadZone.y;
+        _axisStateMap[LT].value = inputState.IndexTrigger;
+        _axisStateMap[LEFT_GRIP].value = inputState.GripTrigger;
+        for (const auto& pair : BUTTON_MAP) {
+            if (inputState.Buttons & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+                qDebug()<<"AAAA:BUTTON PRESSED "<<pair.second;
+            }
+        }
+        for (const auto& pair : LEFT_TOUCH_MAP) {
+            if (inputState.Touches & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+            }
+        }
+    }
+
+    {
+        const auto& inputState = _hands[1].state;
+        _axisStateMap[RX].value = inputState.JoystickNoDeadZone.x;
+        _axisStateMap[RY].value = inputState.JoystickNoDeadZone.y;
+        _axisStateMap[RT].value = inputState.IndexTrigger;
+        _axisStateMap[RIGHT_GRIP].value = inputState.GripTrigger;
+
+        for (const auto& pair : BUTTON_MAP) {
+            if (inputState.Buttons & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+            }
+        }
+        for (const auto& pair : RIGHT_TOUCH_MAP) {
+            if (inputState.Touches & pair.first) {
+                _buttonPressedMap.insert(pair.second);
+            }
+        }
+    }
+
+    // Haptics
+    {
+        Locker locker(_lock);
+        for (auto& hand : _hands) {
+            if (hand.hapticDuration) {
+                hand.hapticDuration -= deltaTime * 1000.0f; // milliseconds
+            } else {
+                hand.stopHapticPulse();
+            }
+        }
+    }
+}
+
+void OculusMobileInputDevice::focusOutEvent() {
+    _axisStateMap.clear();
+    _buttonPressedMap.clear();
+};
+
+void OculusMobileInputDevice::handlePose(float deltaTime,
+                                                      const controller::InputCalibrationData& inputCalibrationData,
+                                                      ovrHandedness hand, const ovrRigidBodyPosef& handPose) {
+    auto poseId = (hand == VRAPI_HAND_LEFT) ? controller::LEFT_HAND : controller::RIGHT_HAND;
+    auto& pose = _poseStateMap[poseId];
+    pose = ovr::toControllerPose(hand, handPose);
+    // transform into avatar frame
+    glm::mat4 controllerToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    pose = pose.transform(controllerToAvatar);
+}
+
+void OculusMobileInputDevice::handleHeadPose(float deltaTime,
+                                                          const controller::InputCalibrationData& inputCalibrationData,
+                                                          const ovrRigidBodyPosef& headPose) {
+    glm::mat4 mat = createMatFromQuatAndPos(ovr::toGlm(headPose.Pose.Orientation),
+                                            ovr::toGlm(headPose.Pose.Position));
+
+    //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),
+                          ovr::toGlm(headPose.LinearVelocity), // XXX * matYFlip ?
+                          ovr::toGlm(headPose.AngularVelocity));
+
+    glm::mat4 sensorToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    glm::mat4 defaultHeadOffset = glm::inverse(inputCalibrationData.defaultCenterEyeMat) *
+        inputCalibrationData.defaultHeadMat;
+
+    pose.valid = true;
+    _poseStateMap[controller::HEAD] = pose.postTransform(defaultHeadOffset).transform(sensorToAvatar);
+}
+
+void OculusMobileInputDevice::handleRotationForUntrackedHand(const controller::InputCalibrationData& inputCalibrationData,
+                                                                          ovrHandedness hand, const ovrRigidBodyPosef& handPose) {
+    auto poseId = (hand == VRAPI_HAND_LEFT ? controller::LEFT_HAND : controller::RIGHT_HAND);
+    auto& pose = _poseStateMap[poseId];
+    const auto& lastHandPose = (hand == VRAPI_HAND_LEFT) ? _hands[0].lastPose : _hands[1].lastPose;
+    pose = ovr::toControllerPose(hand, handPose, lastHandPose);
+    glm::mat4 controllerToAvatar = glm::inverse(inputCalibrationData.avatarMat) * inputCalibrationData.sensorToWorldMat;
+    pose = pose.transform(controllerToAvatar);
+}
+
+bool OculusMobileInputDevice::triggerHapticPulse(float strength, float duration, controller::Hand hand) {
+    Locker locker(_lock);
+    bool success = true;
+
+    qDebug()<<"AAAA: Haptic duration %f " << duration;
+
+    if (hand == controller::BOTH || hand == controller::LEFT) {
+        success &= _hands[0].setHapticFeedback(strength, duration);
+    }
+    if (hand == controller::BOTH || hand == controller::RIGHT) {
+        success &= _hands[0].setHapticFeedback(strength, duration);
+    }
+    return success;
+}
+
+/**jsdoc
+ * <p>The <code>Controller.Hardware.OculusTouch</code> object has properties representing Oculus Rift. The property values are 
+ * integer IDs, uniquely identifying each output. <em>Read-only.</em> These can be mapped to actions or functions or 
+ * <code>Controller.Standard</code> items in a {@link RouteObject} mapping.</p>
+ * <table>
+ *   <thead>
+ *     <tr><th>Property</th><th>Type</th><th>Data</th><th>Description</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td colspan="4"><strong>Buttons</strong></td></tr>
+ *     <tr><td><code>A</code></td><td>number</td><td>number</td><td>"A" button pressed.</td></tr>
+ *     <tr><td><code>B</code></td><td>number</td><td>number</td><td>"B" button pressed.</td></tr>
+ *     <tr><td><code>X</code></td><td>number</td><td>number</td><td>"X" button pressed.</td></tr>
+ *     <tr><td><code>Y</code></td><td>number</td><td>number</td><td>"Y" button pressed.</td></tr>
+ *     <tr><td><code>LeftApplicationMenu</code></td><td>number</td><td>number</td><td>Left application menu button pressed.
+ *       </td></tr>
+ *     <tr><td><code>RightApplicationMenu</code></td><td>number</td><td>number</td><td>Right application menu button pressed.
+ *       </td></tr>
+ *     <tr><td colspan="4"><strong>Sticks</strong></td></tr>
+ *     <tr><td><code>LX</code></td><td>number</td><td>number</td><td>Left stick x-axis scale.</td></tr>
+ *     <tr><td><code>LY</code></td><td>number</td><td>number</td><td>Left stick y-axis scale.</td></tr>
+ *     <tr><td><code>RX</code></td><td>number</td><td>number</td><td>Right stick x-axis scale.</td></tr>
+ *     <tr><td><code>RY</code></td><td>number</td><td>number</td><td>Right stick y-axis scale.</td></tr>
+ *     <tr><td><code>LS</code></td><td>number</td><td>number</td><td>Left stick button pressed.</td></tr>
+ *     <tr><td><code>RS</code></td><td>number</td><td>number</td><td>Right stick button pressed.</td></tr>
+ *     <tr><td><code>LSTouch</code></td><td>number</td><td>number</td><td>Left stick is touched.</td></tr>
+ *     <tr><td><code>RSTouch</code></td><td>number</td><td>number</td><td>Right stick is touched.</td></tr>
+ *     <tr><td colspan="4"><strong>Triggers</strong></td></tr>
+ *     <tr><td><code>LT</code></td><td>number</td><td>number</td><td>Left trigger scale.</td></tr>
+ *     <tr><td><code>RT</code></td><td>number</td><td>number</td><td>Right trigger scale.</td></tr>
+ *     <tr><td><code>LeftGrip</code></td><td>number</td><td>number</td><td>Left grip scale.</td></tr>
+ *     <tr><td><code>RightGrip</code></td><td>number</td><td>number</td><td>Right grip scale.</td></tr>
+ *     <tr><td colspan="4"><strong>Finger Abstractions</strong></td></tr>
+ *     <tr><td><code>LeftPrimaryThumbTouch</code></td><td>number</td><td>number</td><td>Left thumb touching primary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>LeftSecondaryThumbTouch</code></td><td>number</td><td>number</td><td>Left thumb touching secondary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>LeftThumbUp</code></td><td>number</td><td>number</td><td>Left thumb not touching primary or secondary 
+ *       thumb buttons.</td></tr>
+ *     <tr><td><code>RightPrimaryThumbTouch</code></td><td>number</td><td>number</td><td>Right thumb touching primary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>RightSecondaryThumbTouch</code></td><td>number</td><td>number</td><td>Right thumb touching secondary thumb 
+ *       button.</td></tr>
+ *     <tr><td><code>RightThumbUp</code></td><td>number</td><td>number</td><td>Right thumb not touching primary or secondary 
+ *       thumb buttons.</td></tr>
+ *     <tr><td><code>LeftPrimaryIndexTouch</code></td><td>number</td><td>number</td><td>Left index finger is touching primary 
+ *       index finger control.</td></tr>
+ *     <tr><td><code>LeftIndexPoint</code></td><td>number</td><td>number</td><td>Left index finger is pointing, not touching 
+ *       primary or secondary index finger controls.</td></tr>
+ *     <tr><td><code>RightPrimaryIndexTouch</code></td><td>number</td><td>number</td><td>Right index finger is touching primary 
+ *       index finger control.</td></tr>
+ *     <tr><td><code>RightIndexPoint</code></td><td>number</td><td>number</td><td>Right index finger is pointing, not touching 
+ *       primary or secondary index finger controls.</td></tr>
+ *     <tr><td colspan="4"><strong>Avatar Skeleton</strong></td></tr>
+ *     <tr><td><code>Head</code></td><td>number</td><td>{@link Pose}</td><td>Head pose.</td></tr>
+ *     <tr><td><code>LeftHand</code></td><td>number</td><td>{@link Pose}</td><td>Left hand pose.</td></tr>
+ *     <tr><td><code>RightHand</code></td><td>number</td><td>{@link Pose}</td><td>right hand pose.</td></tr>
+ *   </tbody>
+ * </table>
+ * @typedef {object} Controller.Hardware-OculusTouch
+ */
+controller::Input::NamedVector OculusMobileInputDevice::getAvailableInputs() const {
+    using namespace controller;
+    QVector<Input::NamedPair> availableInputs{
+        // buttons
+        makePair(A, "A"),
+        makePair(B, "B"),
+        makePair(X, "X"),
+        makePair(Y, "Y"),
+
+        // trackpad analogs
+        makePair(LX, "LX"),
+        makePair(LY, "LY"),
+        makePair(RX, "RX"),
+        makePair(RY, "RY"),
+
+        // triggers
+        makePair(LT, "LT"),
+        makePair(RT, "RT"),
+
+        // trigger buttons
+        //makePair(LB, "LB"),
+        //makePair(RB, "RB"),
+
+        // side grip triggers
+        makePair(LEFT_GRIP, "LeftGrip"),
+        makePair(RIGHT_GRIP, "RightGrip"),
+
+        // joystick buttons
+        makePair(LS, "LS"),
+        makePair(RS, "RS"),
+
+        makePair(LEFT_HAND, "LeftHand"),
+        makePair(RIGHT_HAND, "RightHand"),
+        makePair(HEAD, "Head"),
+
+        makePair(LEFT_PRIMARY_THUMB_TOUCH, "LeftPrimaryThumbTouch"),
+        makePair(LEFT_SECONDARY_THUMB_TOUCH, "LeftSecondaryThumbTouch"),
+        makePair(RIGHT_PRIMARY_THUMB_TOUCH, "RightPrimaryThumbTouch"),
+        makePair(RIGHT_SECONDARY_THUMB_TOUCH, "RightSecondaryThumbTouch"),
+        makePair(LEFT_PRIMARY_INDEX_TOUCH, "LeftPrimaryIndexTouch"),
+        makePair(RIGHT_PRIMARY_INDEX_TOUCH, "RightPrimaryIndexTouch"),
+        makePair(LS_TOUCH, "LSTouch"),
+        makePair(RS_TOUCH, "RSTouch"),
+        makePair(LEFT_THUMB_UP, "LeftThumbUp"),
+        makePair(RIGHT_THUMB_UP, "RightThumbUp"),
+        makePair(LEFT_INDEX_POINT, "LeftIndexPoint"),
+        makePair(RIGHT_INDEX_POINT, "RightIndexPoint"),
+
+        makePair(BACK, "LeftApplicationMenu"),
+        makePair(START, "RightApplicationMenu"),
+    };
+    return availableInputs;
+}
+
+OculusMobileInputDevice::OculusMobileInputDevice(ovrMobile* session, const std::vector<ovrInputTrackedRemoteCapabilities>& devicesCaps) : controller::InputDevice("OculusTouch") {
+    qWarning() << "QQQ" << __FUNCTION__ << "Found " << devicesCaps.size() << "devices";
+    for (const auto& deviceCaps : devicesCaps) {
+        size_t handIndex = -1;
+        if (deviceCaps.ControllerCapabilities & ovrControllerCaps_LeftHand) {
+            handIndex = 0;
+        } else if (deviceCaps.ControllerCapabilities & ovrControllerCaps_RightHand) {
+            handIndex = 1;
+        } else {
+            continue;
+        }
+        HandData& handData = _hands[handIndex];
+        handData.state.Header.ControllerType = ovrControllerType_TrackedRemote;
+        handData.valid = true;
+        handData.caps = deviceCaps;
+        handData.update(session);
+    }
+}
+
+void OculusMobileInputDevice::updateHands(ovrMobile* session) {
+    _headTracking = vrapi_GetPredictedTracking2(session, 0.0);
+    for (auto& hand : _hands) {
+        hand.update(session);
+    }
+}
+
+QString OculusMobileInputDevice::getDefaultMappingConfig() const {
+    static const QString MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/oculus_touch.json";
+    return MAPPING_JSON;
+}
+
+// TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
+InputPluginList getInputPlugins() {
+    InputPlugin* PLUGIN_POOL[] = {
+        new KeyboardMouseDevice(),
+        new OculusMobileControllerManager(),
+        nullptr
+    };
+
+    InputPluginList result;
+    for (int i = 0; PLUGIN_POOL[i]; ++i) {
+        InputPlugin* plugin = PLUGIN_POOL[i];
+        if (plugin->isSupported()) {
+            result.push_back(InputPluginPointer(plugin));
+        }
+    }
+    return result;
+}
\ No newline at end of file
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h
new file mode 100644
index 0000000000..43ead8d6a2
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.h
@@ -0,0 +1,43 @@
+//
+//  Created by Bradley Austin Davis on 2016/03/04
+//  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__OculusMobileControllerManager
+#define hifi__OculusMobileControllerManager
+
+#include <QObject>
+#include <unordered_set>
+#include <map>
+
+#include <GLMHelpers.h>
+
+#include <controllers/InputDevice.h>
+#include <plugins/InputPlugin.h>
+
+class OculusMobileControllerManager : public InputPlugin {
+Q_OBJECT
+public:
+    // Plugin functions
+    bool isSupported() const override;
+    const QString getName() const override { return NAME; }
+    bool isHandController() const override;
+    bool isHeadController() const override { return true; }
+    QStringList getSubdeviceNames() override;
+
+    bool activate() override;
+    void deactivate() override;
+
+    void pluginFocusOutEvent() override;
+    void pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) override;
+
+private:
+    static const char* NAME;
+
+    void checkForConnectedDevices();
+};
+
+#endif // hifi__OculusMobileControllerManager
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
new file mode 100644
index 0000000000..34ba130c71
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
@@ -0,0 +1,269 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "OculusMobileDisplayPlugin.h"
+
+#include <QtAndroidExtras/QAndroidJniEnvironment>
+#include <glm/gtc/matrix_transform.hpp>
+#include <VrApi_Types.h>
+#include <VrApi_Helpers.h>
+
+#include <AbstractViewStateInterface.h>
+#include <gpu/Frame.h>
+#include <gpu/Context.h>
+#include <gpu/gl/GLBackend.h>
+#include <ViewFrustum.h>
+#include <plugins/PluginManager.h>
+#include <ui-plugins/PluginContainer.h>
+#include <controllers/Pose.h>
+#include <display-plugins/CompositorHelper.h>
+#include <gpu/Frame.h>
+#include <gl/Config.h>
+#include <gl/GLWidget.h>
+#include <gl/Context.h>
+#include <MainWindow.h>
+#include <AddressManager.h>
+
+#include <ovr/Helpers.h>
+#include <VrApi.h>
+
+using namespace ovr;
+
+const char* OculusMobileDisplayPlugin::NAME { "Oculus Rift" };
+//thread_local bool renderThread = false;
+#define OCULUS_APP_ID 2331695256865113
+
+OculusMobileDisplayPlugin::OculusMobileDisplayPlugin() {
+
+}
+
+OculusMobileDisplayPlugin::~OculusMobileDisplayPlugin() {
+}
+
+void OculusMobileDisplayPlugin::init() {
+    Parent::init();
+    initVr();
+
+    emit deviceConnected(getName());
+}
+
+void OculusMobileDisplayPlugin::deinit() {
+    shutdownVr();
+    Parent::deinit();
+}
+
+bool OculusMobileDisplayPlugin::internalActivate() {
+    _renderTargetSize = { 1024, 512 };
+    _cullingProjection = ovr::toGlm(ovrMatrix4f_CreateProjectionFov(90.0f, 90.0f, 0.0f, 0.0f, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP));
+
+
+    withOvrJava([&](const ovrJava* java){
+        _renderTargetSize = glm::uvec2{
+            vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH),
+            vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_HEIGHT),
+        };
+    });
+
+    ovr::for_each_eye([&](ovrEye eye){
+        _eyeProjections[eye] = _cullingProjection;
+    });
+
+    // This must come after the initialization, so that the values calculated
+    // above are available during the customizeContext call (when not running
+    // in threaded present mode)
+    return Parent::internalActivate();
+}
+
+void OculusMobileDisplayPlugin::internalDeactivate() {
+    Parent::internalDeactivate();
+    // ovr::releaseRenderSession(_session);
+}
+
+void OculusMobileDisplayPlugin::customizeContext() {
+    qWarning() << "QQQ" << __FUNCTION__ << "done";
+    gl::initModuleGl();
+    _mainContext = _container->getPrimaryWidget()->context();
+    _mainContext->makeCurrent();
+    ovr::VrHandler::setHandler(this);
+    _mainContext->doneCurrent();
+    _mainContext->makeCurrent();
+    Parent::customizeContext();
+    qWarning() << "QQQ" << __FUNCTION__ << "done";
+}
+
+void OculusMobileDisplayPlugin::uncustomizeContext() {
+    ovr::VrHandler::setHandler(nullptr);
+    _mainContext->doneCurrent();
+    _mainContext->makeCurrent();
+    Parent::uncustomizeContext();
+}
+
+QRectF OculusMobileDisplayPlugin::getPlayAreaRect() {
+    QRectF result;
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        ovrPosef pose;
+        ovrVector3f scale;
+        if (ovrSuccess != vrapi_GetBoundaryOrientedBoundingBox(session, &pose, &scale)) {
+            return;
+        }
+        // FIXME extract the center from the pose
+        glm::vec2 center { 0 };
+        glm::vec2 dimensions = glm::vec2(scale.x, scale.z);
+        dimensions *= 2.0f;
+        result = QRectF(center.x, center.y, dimensions.x, dimensions.y);
+    });
+    return result;
+}
+
+glm::mat4 OculusMobileDisplayPlugin::getEyeProjection(Eye eye, const glm::mat4& baseProjection) const {
+    glm::mat4 result = baseProjection;
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        auto trackingState = vrapi_GetPredictedTracking2(session, 0.0);
+        result = ovr::Fov{ trackingState.Eye[eye].ProjectionMatrix }.withZ(baseProjection);
+    });
+    return result;
+}
+
+glm::mat4 OculusMobileDisplayPlugin::getCullingProjection(const glm::mat4& baseProjection) const {
+    glm::mat4 result = baseProjection;
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        auto trackingState = vrapi_GetPredictedTracking2(session, 0.0);
+        ovr::Fov fovs[2];
+        for (size_t i = 0; i < 2; ++i) {
+            fovs[i].extract(trackingState.Eye[i].ProjectionMatrix);
+        }
+        fovs[0].extend(fovs[1]);
+        return fovs[0].withZ(baseProjection);
+    });
+    return result;
+}
+
+void OculusMobileDisplayPlugin::resetSensors() {
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        vrapi_RecenterPose(session);
+    });
+    _currentRenderFrameInfo.renderPose = glm::mat4(); // identity
+}
+
+float OculusMobileDisplayPlugin::getTargetFrameRate() const {
+    float result = 0.0f;
+    VrHandler::withOvrJava([&](const ovrJava* java){
+        result = vrapi_GetSystemPropertyFloat(java, VRAPI_SYS_PROP_DISPLAY_REFRESH_RATE);
+    });
+    return result;
+}
+
+bool OculusMobileDisplayPlugin::isHmdMounted() const {
+    bool result = false;
+    VrHandler::withOvrJava([&](const ovrJava* java){
+        result = VRAPI_FALSE != vrapi_GetSystemStatusInt(java, VRAPI_SYS_STATUS_MOUNTED);
+    });
+    return result;
+}
+
+static void goToDevMobile() {
+    auto addressManager = DependencyManager::get<AddressManager>();
+    auto currentAddress = addressManager->currentAddress().toString().toStdString();
+    if (std::string::npos == currentAddress.find("dev-mobile")) {
+        addressManager->handleLookupString("hifi://dev-mobile/495.236,501.017,482.434/0,0.97452,0,-0.224301");
+        //addressManager->handleLookupString("hifi://dev-mobile/504,498,491/0,0,0,0");
+        //addressManager->handleLookupString("hifi://dev-mobile/0,-1,1");
+    }
+}
+
+// Called on the render thread, establishes the rough tracking for the upcoming
+bool OculusMobileDisplayPlugin::beginFrameRender(uint32_t frameIndex) {
+    static QAndroidJniEnvironment* jniEnv = nullptr;
+    if (nullptr == jniEnv) {
+        jniEnv = new QAndroidJniEnvironment();
+    }
+    bool result = false;
+    _currentRenderFrameInfo = FrameInfo();
+    ovrTracking2 trackingState = {};
+    static bool resetTrackingTransform = true;
+    static glm::mat4 transformOffset;
+
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        if (resetTrackingTransform) {
+            auto pose = vrapi_GetTrackingTransform( session, VRAPI_TRACKING_TRANSFORM_SYSTEM_CENTER_FLOOR_LEVEL);
+            transformOffset = glm::inverse(ovr::toGlm(pose));
+            vrapi_SetTrackingTransform( session, pose);
+            resetTrackingTransform = false;
+        }
+        // Find a better way of
+        _currentRenderFrameInfo.predictedDisplayTime = vrapi_GetPredictedDisplayTime(session, currentPresentIndex() + 2);
+        trackingState = vrapi_GetPredictedTracking2(session, _currentRenderFrameInfo.predictedDisplayTime);
+        result = true;
+    });
+
+
+
+    if (result) {
+        _currentRenderFrameInfo.renderPose = transformOffset;
+        withNonPresentThreadLock([&] {
+            _currentRenderFrameInfo.sensorSampleTime = trackingState.HeadPose.TimeInSeconds;
+            _currentRenderFrameInfo.renderPose = transformOffset * ovr::toGlm(trackingState.HeadPose.Pose);
+            _currentRenderFrameInfo.presentPose = _currentRenderFrameInfo.renderPose;
+            _frameInfos[frameIndex] = _currentRenderFrameInfo;
+            _ipd = vrapi_GetInterpupillaryDistance(&trackingState);
+            ovr::for_each_eye([&](ovrEye eye){
+                _eyeProjections[eye] = ovr::toGlm(trackingState.Eye[eye].ProjectionMatrix);
+                _eyeOffsets[eye] = glm::translate(mat4(), vec3{ _ipd * (eye == VRAPI_EYE_LEFT ? -0.5f : 0.5f), 0.0f, 0.0f });
+            });
+       });
+    }
+
+    //  static uint32_t count = 0;
+    //  if ((++count % 1000) == 0) {
+    //      AbstractViewStateInterface::instance()->postLambdaEvent([] {
+    //          goToDevMobile();
+    //      });
+    //  }
+
+    return result && Parent::beginFrameRender(frameIndex);
+}
+
+ovrTracking2 presentTracking;
+
+void OculusMobileDisplayPlugin::updatePresentPose() {
+    static QAndroidJniEnvironment* jniEnv = nullptr;
+    if (nullptr == jniEnv) {
+        jniEnv = new QAndroidJniEnvironment();
+    }
+    VrHandler::withOvrMobile([&](ovrMobile* session){
+        presentTracking = beginFrame();
+        _currentPresentFrameInfo.sensorSampleTime = vrapi_GetTimeInSeconds();
+        _currentPresentFrameInfo.predictedDisplayTime = presentTracking.HeadPose.TimeInSeconds;
+        _currentPresentFrameInfo.presentPose = ovr::toGlm(presentTracking.HeadPose.Pose);
+    });
+}
+
+void OculusMobileDisplayPlugin::internalPresent() {
+    VrHandler::pollTask();
+
+    if (!vrActive()) {
+        QThread::msleep(1);
+        return;
+    }
+
+    auto sourceTexture = getGLBackend()->getTextureID(_compositeFramebuffer->getRenderBuffer(0));
+    glm::uvec2 sourceSize{ _compositeFramebuffer->getWidth(), _compositeFramebuffer->getHeight() };
+    VrHandler::presentFrame(sourceTexture, sourceSize, presentTracking);
+    _presentRate.increment();
+}
+
+DisplayPluginList getDisplayPlugins() {
+    static DisplayPluginList result;
+    static std::once_flag once;
+    std::call_once(once, [&]{
+        auto plugin = std::make_shared<OculusMobileDisplayPlugin>();
+        plugin->isSupported();
+        result.push_back(plugin);
+    });
+    return result;
+}
+
diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
new file mode 100644
index 0000000000..4a0a21e995
--- /dev/null
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.h
@@ -0,0 +1,65 @@
+//
+//  Created by Bradley Austin Davis on 2018/11/15
+//  Copyright 2013-2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#pragma once
+
+#include <display-plugins/hmd/HmdDisplayPlugin.h>
+
+#include <EGL/egl.h>
+
+#include <QTimer>
+#include <QtPlatformHeaders/QEGLNativeContext>
+#include <QtAndroidExtras/QAndroidJniObject>
+
+#include <gl/Context.h>
+#include <ovr/VrHandler.h>
+
+typedef struct ovrTextureSwapChain ovrTextureSwapChain;
+typedef struct ovrMobile ovrMobile;
+typedef struct ANativeWindow ANativeWindow;
+
+class OculusMobileDisplayPlugin : public HmdDisplayPlugin, public ovr::VrHandler {
+    using Parent = HmdDisplayPlugin;
+public:
+    OculusMobileDisplayPlugin();
+    virtual ~OculusMobileDisplayPlugin();
+    bool isSupported() const override { return true; };
+    bool hasAsyncReprojection() const override { return true; }
+    bool getSupportsAutoSwitch() override final { return false; }
+    QThread::Priority getPresentPriority() override { return QThread::TimeCriticalPriority; }
+
+    glm::mat4 getEyeProjection(Eye eye, const glm::mat4& baseProjection) const override;
+    glm::mat4 getCullingProjection(const glm::mat4& baseProjection) const override;
+
+    // Stereo specific methods
+    void resetSensors() override final;
+    bool beginFrameRender(uint32_t frameIndex) override;
+
+    QRectF getPlayAreaRect() override;
+    float getTargetFrameRate() const override;
+    void init() override;
+    void deinit() override;
+
+protected:
+    const QString getName() const override { return NAME; }
+
+    bool internalActivate() override;
+    void internalDeactivate() override;
+
+    void customizeContext() override;
+    void uncustomizeContext() override;
+
+    void updatePresentPose() override;
+    void internalPresent() override;
+    void hmdPresent() override { throw std::runtime_error("Unused"); }
+    bool isHmdMounted() const override;
+
+    static const char* NAME;
+    mutable gl::Context* _mainContext{ nullptr };
+    uint32_t _readFbo;
+};
+

From 07d6e0a1162f71ae2d2156c5c531e78c64f84b97 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 13:21:38 -0800
Subject: [PATCH 13/58] Fix signing configs

---
 android/apps/framePlayer/build.gradle      | 8 ++++----
 android/apps/questFramePlayer/build.gradle | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/apps/framePlayer/build.gradle b/android/apps/framePlayer/build.gradle
index fc8651fce1..a210c8300e 100644
--- a/android/apps/framePlayer/build.gradle
+++ b/android/apps/framePlayer/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         release {
-            keyAlias 'key0'
-            keyPassword 'password'
-            storeFile file('C:/android/keystore.jks')
-            storePassword 'password'
+            storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+            storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+            keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+            keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
         }
     }
 
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
index 13d806c3a4..899f9cb955 100644
--- a/android/apps/questFramePlayer/build.gradle
+++ b/android/apps/questFramePlayer/build.gradle
@@ -3,10 +3,10 @@ apply plugin: 'com.android.application'
 android {
     signingConfigs {
         release {
-            keyAlias 'key0'
-            keyPassword 'password'
-            storeFile file('C:/android/keystore.jks')
-            storePassword 'password'
+            storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+            storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+            keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+            keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
         }
     }
 

From c34106e771f2d207e4b1fe2d6da37180bf2d80ba Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 13:27:52 -0800
Subject: [PATCH 14/58] Update dockerfile

---
 android/docker/Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index c37f73cb2a..fe3a83950a 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -73,13 +73,10 @@ RUN mkdir "$HIFI_BASE" && \
 
 RUN git clone https://github.com/jherico/hifi.git && \
     cd ~/hifi && \
-    git checkout feature/quest_move_interface
+    git checkout feature/quest_frame_player
 
 WORKDIR /home/jenkins/hifi
 
-RUN touch .test6 && \ 
-    git fetch && git reset origin/feature/quest_move_interface --hard
-
 RUN mkdir build
 
 # Pre-cache the vcpkg managed dependencies

From c2dca9d0e838f4305297555c3b9d26c5c0703d6a Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 14:45:06 -0800
Subject: [PATCH 15/58] Fix entities cmakelists.txt

---
 libraries/entities/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt
index 2ae0a8784d..e359c7132f 100644
--- a/libraries/entities/CMakeLists.txt
+++ b/libraries/entities/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
+target_include_directories(${TARGET_NAME} PRIVATE "${OPENSSL_INCLUDE_DIR}")	
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(gpu)

From f45166f508c3f2bd8f8125d5705aaca17f1eb642 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 14:45:31 -0800
Subject: [PATCH 16/58] Fix mac frame player

---
 tools/gpu-frame-player/src/RenderThread.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/gpu-frame-player/src/RenderThread.cpp b/tools/gpu-frame-player/src/RenderThread.cpp
index a9dcf8900f..ff0d7630e5 100644
--- a/tools/gpu-frame-player/src/RenderThread.cpp
+++ b/tools/gpu-frame-player/src/RenderThread.cpp
@@ -32,9 +32,12 @@ void RenderThread::initialize(QWindow* window) {
 
     _window = window;
 #ifdef USE_GL
+    _window->setFormat(getDefaultOpenGLSurfaceFormat());
     _context.setWindow(window);
     _context.create();
-    _context.makeCurrent();
+    if (!_context.makeCurrent()) {
+        qFatal("Unable to make context current");
+    }
     QOpenGLContextWrapper(_context.qglContext()).makeCurrent(_window);
     glGenTextures(1, &_externalTexture);
     glBindTexture(GL_TEXTURE_2D, _externalTexture);

From 04b164fd2459af2f8ae46f7d5f826f2c1adffbc9 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 30 Jan 2019 15:22:13 -0800
Subject: [PATCH 17/58] Migrate shutdown hack applied to QtActivity to
 InterfaceActivity

---
 .../hifiinterface/InterfaceActivity.java      | 21 ++++++++++++++++++-
 .../qt5/android/bindings/QtActivity.java      | 20 +-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index b7d2157737..fce5c2553e 100644
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -166,8 +166,27 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         nativeOnDestroy();
+        /*
+        cduarte https://highfidelity.manuscript.com/f/cases/16712/App-freezes-on-opening-randomly
+        After Qt upgrade to 5.11 we had a black screen crash after closing the application with
+        the hardware button "Back" and trying to start the app again. It could only be fixed after
+        totally closing the app swiping it in the list of running apps.
+        This problem did not happen with the previous Qt version.
+        After analysing changes we came up with this case and change:
+            https://codereview.qt-project.org/#/c/218882/
+        In summary they've moved libs loading to the same thread as main() and as a matter of correctness
+        in the onDestroy method in QtActivityDelegate, they exit that thread with `QtNative.m_qtThread.exit();`
+        That exit call is the main reason of this problem.
+
+        In this fix we just replace the `QtApplication.invokeDelegate();` call that may end using the
+        entire onDestroy method including that thread exit line for other three lines that purposely
+        terminate qt (borrowed from QtActivityDelegate::onDestroy as well).
+         */
+        QtNative.terminateQt();
+        QtNative.setActivity(null, null);
+        System.exit(0);
+        super.onDestroy();
     }
 
     @Override
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 93ae2bc227..40e1863d69 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -364,25 +364,7 @@ public class QtActivity extends Activity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        /*
-        cduarte https://highfidelity.manuscript.com/f/cases/16712/App-freezes-on-opening-randomly
-        After Qt upgrade to 5.11 we had a black screen crash after closing the application with
-        the hardware button "Back" and trying to start the app again. It could only be fixed after
-        totally closing the app swiping it in the list of running apps.
-        This problem did not happen with the previous Qt version.
-        After analysing changes we came up with this case and change:
-            https://codereview.qt-project.org/#/c/218882/
-        In summary they've moved libs loading to the same thread as main() and as a matter of correctness
-        in the onDestroy method in QtActivityDelegate, they exit that thread with `QtNative.m_qtThread.exit();`
-        That exit call is the main reason of this problem.
-
-        In this fix we just replace the `QtApplication.invokeDelegate();` call that may end using the
-        entire onDestroy method including that thread exit line for other three lines that purposely
-        terminate qt (borrowed from QtActivityDelegate::onDestroy as well).
-         */
-        QtNative.terminateQt();
-        QtNative.setActivity(null, null);
-        System.exit(0);
+        QtApplication.invokeDelegate();
     }
     //---------------------------------------------------------------------------
 

From 7a4401276cba066df3ca0bb0bc7b3fc11a574c2d Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Fri, 1 Feb 2019 11:38:34 -0800
Subject: [PATCH 18/58] moving qt shutdown and resetting qtactivity to onstop

---
 .../java/org/qtproject/qt5/android/bindings/QtActivity.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 40e1863d69..6a6688ac41 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -650,6 +650,8 @@ public class QtActivity extends Activity {
         if (!keepInterfaceRunning) {
             QtApplication.invokeDelegate();
         }
+        QtNative.terminateQt();
+        QtNative.setActivity(null,null);
     }
 
     //---------------------------------------------------------------------------

From 944f4c96ae9451d1fbec8ffc438559d39ff54b7f Mon Sep 17 00:00:00 2001
From: amerhifi <43353902+amerhifi@users.noreply.github.com>
Date: Tue, 5 Feb 2019 11:14:52 -0800
Subject: [PATCH 19/58] New build file for Quest

new build file specific to the quest device
---
 build_quest.md | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 build_quest.md

diff --git a/build_quest.md b/build_quest.md
new file mode 100644
index 0000000000..e093969f83
--- /dev/null
+++ b/build_quest.md
@@ -0,0 +1,65 @@
+Please read the [general build guide](BUILD.md) for information on building other platform. Only Quest specific instructions are found in this file.
+
+# Dependencies
+
+Building is currently supported on OSX, Windows and Linux platforms, but developers intending to do work on the library dependencies are strongly urged to use 64 bit Linux as a build platform
+
+You will need the following tools to build Android targets.
+
+* [Android Studio](https://developer.android.com/studio/index.html)
+
+### 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 levels 24 and 26.  
+
+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
+* NDK (even if you have the NDK installed separately)
+
+Make sure the NDK installed version is 18 (or higher)
+
+# Environment 
+
+Setting up the environment for android builds requires some additional steps
+
+#### Set up machine specific Gradle properties
+
+Create a `gradle.properties` file in $HOME/.gradle.   Edit the file to contain the following
+
+    HIFI_ANDROID_PRECOMPILED=<your_home_directory>/Android/hifi_externals
+    HIFI_ANDROID_KEYSTORE=<key_store_directory>/<keystore_name>.jks
+    HIFI_ANDROID_KEYSTORE_PASSWORD=<password>
+    HIFI_ANDROID_KEY_ALIAS=<key_alias>
+    HIFI_ANDROID_KEY_PASSWORD=<key_password>
+
+Note, do not use `$HOME` for the path.  It must be a fully qualified path name.
+
+### Setup the repository
+
+Clone the repository
+
+`git clone https://github.com/highfidelity/hifi.git`
+
+Enter the repository `android` directory
+
+`cd hifi/android`
+
+# Building & Running
+
+* Open Android Studio
+* Choose _Open Existing Android Studio Project_
+* Navigate to the `hifi` repository and choose the `android` folder and select _OK_
+* Open Gradle.settings and comment out any projects not necessary
+* From _File_ menu select _Sync with File System_ to resync Gradle settings
+* From the _Build_ menu select _Make Project_
+* From 
+* Once the build completes, from the _Run_ menu select _Run App_ 
+

From 1daf2bbed4f594ed73796eacf6cfd62fa945ce03 Mon Sep 17 00:00:00 2001
From: amerhifi <43353902+amerhifi@users.noreply.github.com>
Date: Tue, 5 Feb 2019 11:15:57 -0800
Subject: [PATCH 20/58] renamed to match others

---
 build_quest.md => BUILD_QUEST.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename build_quest.md => BUILD_QUEST.md (100%)

diff --git a/build_quest.md b/BUILD_QUEST.md
similarity index 100%
rename from build_quest.md
rename to BUILD_QUEST.md

From aa645af744719a665f523f2bd810c7053e2c0785 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 6 Feb 2019 09:19:36 -0800
Subject: [PATCH 21/58] fix quest controllers

---
 .../src/OculusMobileControllerManager.cpp     | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
index 8de563ee4c..b995ef1fb3 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
@@ -171,6 +171,8 @@ private:
     void handleHeadPose(float deltaTime, const controller::InputCalibrationData& inputCalibrationData,
                         const ovrRigidBodyPosef& headPose);
 
+    void reconnectTouchControllers(ovrMobile* session);
+
     // perform an action when the TouchDevice mutex is acquired.
     using Locker = std::unique_lock<std::recursive_mutex>;
 
@@ -637,7 +639,6 @@ controller::Input::NamedVector OculusMobileInputDevice::getAvailableInputs() con
         makePair(RIGHT_THUMB_UP, "RightThumbUp"),
         makePair(LEFT_INDEX_POINT, "LeftIndexPoint"),
         makePair(RIGHT_INDEX_POINT, "RightIndexPoint"),
-
         makePair(BACK, "LeftApplicationMenu"),
         makePair(START, "RightApplicationMenu"),
     };
@@ -665,8 +666,41 @@ OculusMobileInputDevice::OculusMobileInputDevice(ovrMobile* session, const std::
 
 void OculusMobileInputDevice::updateHands(ovrMobile* session) {
     _headTracking = vrapi_GetPredictedTracking2(session, 0.0);
+
+    bool touchControllerNotConnected = false;
     for (auto& hand : _hands) {
         hand.update(session);
+
+        if (hand.stateResult < 0 || hand.trackingResult < 0) {
+            touchControllerNotConnected = true;
+        }
+    }
+
+    if (touchControllerNotConnected) {
+        reconnectTouchControllers(session);
+    }
+}
+
+void OculusMobileInputDevice::reconnectTouchControllers(ovrMobile* session) {
+    uint32_t deviceIndex { 0 };
+    ovrInputCapabilityHeader capsHeader;
+    while (vrapi_EnumerateInputDevices(session, deviceIndex, &capsHeader) >= 0) {
+        if (capsHeader.Type == ovrControllerType_TrackedRemote) {
+            ovrInputTrackedRemoteCapabilities caps;
+            caps.Header = capsHeader;
+            vrapi_GetInputDeviceCapabilities(session, &caps.Header);
+
+            if (caps.ControllerCapabilities & ovrControllerCaps_LeftHand || caps.ControllerCapabilities & ovrControllerCaps_RightHand) {
+                size_t handIndex = caps.ControllerCapabilities & ovrControllerCaps_LeftHand ? 0 : 1;
+                HandData& handData = _hands[handIndex];
+                handData.state.Header.ControllerType = ovrControllerType_TrackedRemote;
+                handData.valid = true;
+                handData.caps = caps;
+                handData.initialized = true;
+                handData.update(session);
+            }
+        }
+        ++deviceIndex;
     }
 }
 
@@ -691,4 +725,4 @@ InputPluginList getInputPlugins() {
         }
     }
     return result;
-}
\ No newline at end of file
+}

From 6c9d15d9a94d57619592f825846d879b3fd9d164 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Wed, 6 Feb 2019 09:58:02 -0800
Subject: [PATCH 22/58] remove used variable

---
 .../oculusMobilePlugin/src/OculusMobileControllerManager.cpp     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
index b995ef1fb3..705045b517 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
+++ b/libraries/oculusMobilePlugin/src/OculusMobileControllerManager.cpp
@@ -696,7 +696,6 @@ void OculusMobileInputDevice::reconnectTouchControllers(ovrMobile* session) {
                 handData.state.Header.ControllerType = ovrControllerType_TrackedRemote;
                 handData.valid = true;
                 handData.caps = caps;
-                handData.initialized = true;
                 handData.update(session);
             }
         }

From 3331a8ad43c3f147606256c4c243629271ce692a Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 6 Feb 2019 13:00:49 -0800
Subject: [PATCH 23/58] Removing signing configs for frame player apps

---
 android/apps/framePlayer/build.gradle      | 25 +++++++---------------
 android/apps/questFramePlayer/build.gradle | 25 +++++++---------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/android/apps/framePlayer/build.gradle b/android/apps/framePlayer/build.gradle
index a210c8300e..5bf8176863 100644
--- a/android/apps/framePlayer/build.gradle
+++ b/android/apps/framePlayer/build.gradle
@@ -1,15 +1,8 @@
+import com.android.builder.core.BuilderConstants
+
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-        release {
-            storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
-            storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
-            keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
-            keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
-        }
-    }
-
     compileSdkVersion 28
     defaultConfig {
         applicationId "io.highfidelity.frameplayer"
@@ -32,19 +25,17 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
+
+    variantFilter { variant ->
+        def build = variant.buildType.name
+        if (build == BuilderConstants.RELEASE) {
+            variant.setIgnore(true)
         }
     }
-
-    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
-    //implementation project(':oculus')
     implementation project(':qt')
 }
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
index 899f9cb955..f72b4c126e 100644
--- a/android/apps/questFramePlayer/build.gradle
+++ b/android/apps/questFramePlayer/build.gradle
@@ -1,15 +1,8 @@
+import com.android.builder.core.BuilderConstants
+
 apply plugin: 'com.android.application'
 
 android {
-    signingConfigs {
-        release {
-            storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
-            storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
-            keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
-            keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
-        }
-    }
-
     compileSdkVersion 28
     defaultConfig {
         applicationId "io.highfidelity.frameplayer"
@@ -22,7 +15,6 @@ android {
                     '-DHIFI_ANDROID_APP=questFramePlayer',
                     '-DANDROID_TOOLCHAIN=clang',
                     '-DANDROID_STL=c++_shared',
-
                     '-DCMAKE_VERBOSE_MAKEFILE=ON'
                 targets = ['questFramePlayer']
             }
@@ -33,15 +25,14 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
+
+    variantFilter { variant ->
+        def build = variant.buildType.name
+        if (build == BuilderConstants.RELEASE) {
+            variant.setIgnore(true)
         }
     }
-
-    externalNativeBuild.cmake.path '../../../CMakeLists.txt'
 }
 
 dependencies {

From b40595b14fb7d44456bb4136e9f5f4a25ba0f379 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 6 Feb 2019 13:06:04 -0800
Subject: [PATCH 24/58] Fix merge issue

---
 libraries/ui/src/ui/OffscreenQmlSurface.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 62e7a9df0e..71bb65509f 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -248,16 +248,6 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
         qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
     });
 
-#ifdef Q_OS_ANDROID
-    auto fileSelector = QQmlFileSelector::get(engine);
-    if (fileSelector) {
-        auto selectors = fileSelector->selector()->extraSelectors();
-        if (!selectors.contains(HIFI_ANDROID_APP)) {
-            fileSelector->setExtraSelectors(QStringList() << HIFI_ANDROID_APP);
-        }
-    }
-#endif
-
     // Register the pixmap Security Image Provider
     engine->addImageProvider(SecurityImageProvider::PROVIDER_NAME, new SecurityImageProvider());
 

From 29573aaa833517a86c118335f545c0038db9a669 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Wed, 6 Feb 2019 16:41:23 -0800
Subject: [PATCH 25/58] fix the half resoolution problem

---
 libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
index 34ba130c71..78d80443d8 100644
--- a/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
+++ b/libraries/oculusMobilePlugin/src/OculusMobileDisplayPlugin.cpp
@@ -63,7 +63,7 @@ bool OculusMobileDisplayPlugin::internalActivate() {
 
     withOvrJava([&](const ovrJava* java){
         _renderTargetSize = glm::uvec2{
-            vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH),
+            2 * vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_WIDTH),
             vrapi_GetSystemPropertyInt(java, VRAPI_SYS_PROP_SUGGESTED_EYE_TEXTURE_HEIGHT),
         };
     });

From 070fb25b80669919a3557982190b8ee37dae6e86 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 7 Feb 2019 13:33:11 -0800
Subject: [PATCH 26/58] Cleaning up differnces from master

---
 CMakeLists.txt                                |  9 ++++
 cmake/ports/hifi-client-deps/CONTROL          |  2 +-
 interface/src/LODManager.cpp                  |  1 -
 interface/src/ui/LoginDialog.cpp              |  2 +-
 .../animation/src/AnimInverseKinematics.cpp   |  2 +-
 .../display-plugins/OpenGLDisplayPlugin.cpp   |  1 -
 .../src/display-plugins/OpenGLDisplayPlugin.h |  3 --
 .../display-plugins/hmd/HmdDisplayPlugin.h    |  1 -
 libraries/gl/src/gl/Context.cpp               |  3 --
 libraries/gl/src/gl/ContextQt.cpp             |  1 -
 libraries/gl/src/gl/OffscreenGLCanvas.cpp     |  2 -
 libraries/gl/src/gl/QOpenGLContextWrapper.cpp |  1 +
 .../gpu-gl-common/src/gpu/gl/GLBackend.cpp    |  6 +--
 .../gpu-gl-common/src/gpu/gl/GLBackend.h      |  2 +-
 .../src/gpu/gl45/GL45BackendTexture.cpp       |  3 --
 scripts/system/goto.js                        | 51 +++++++++++++++----
 scripts/system/html/js/miniTablet.js          | 24 ++++-----
 scripts/system/miniTablet.js                  |  5 +-
 tools/CMakeLists.txt                          |  1 -
 tools/gpu-frame-player/CMakeLists.txt         |  3 +-
 .../DomainContent/Toybox/pistol/pistol.js     |  2 +-
 21 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d616e1f3a..bb26afad75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,15 @@ if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
   add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
+  if (${HIFI_ANDROID_APP} STREQUAL "questInterface")
+    # We know the quest hardware has this extension, so we can force the use of instanced stereo
+    add_definitions(-DHAVE_EXT_clip_cull_distance)
+    # We can also use multiview stereo techniques
+    add_definitions(-DHAVE_OVR_multiview2)
+    add_definitions(-DHAVE_OVR_multiview)
+    # We can also use our own foveated textures
+    add_definitions(-DHAVE_QCOM_texture_foveated)
+  endif()
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine)
 endif ()
diff --git a/cmake/ports/hifi-client-deps/CONTROL b/cmake/ports/hifi-client-deps/CONTROL
index 7887930b6b..7d4727b364 100644
--- a/cmake/ports/hifi-client-deps/CONTROL
+++ b/cmake/ports/hifi-client-deps/CONTROL
@@ -1,4 +1,4 @@
 Source: hifi-client-deps
 Version: 0
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2, shaderc, spirv-cross, spirv-tools, vulkanmemoryallocator
+Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), vulkanmemoryallocator
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index 282fe3e2eb..b6fffbb4bd 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -240,7 +240,6 @@ void LODManager::setAutomaticLODAdjust(bool value) {
 }
 
 bool LODManager::shouldRender(const RenderArgs* args, const AABox& bounds) {
-    return true;
     // To decide if the bound should be rendered or not at the specified Args->lodAngle,
     // we need to compute the apparent angle of the bound from the frustum origin,
     // and compare it against the lodAngle, if it is greater or equal we should render the content of that bound.
diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index a8e234d791..4359318833 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -138,7 +138,7 @@ void LoginDialog::login(const QString& username, const QString& password) const
 void LoginDialog::loginThroughOculus() {
    qDebug() << "Attempting to login through Oculus";
     if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
-       oculusPlatformPlugin->requestNonceAndUserID([] (QString nonce, QString oculusID) {
+       oculusPlatformPlugin->requestNonceAndUserID([this] (QString nonce, QString oculusID) {
             DependencyManager::get<AccountManager>()->requestAccessTokenWithOculus(nonce, oculusID);
         });
     }
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index f24ae73855..a1809f3438 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -867,7 +867,7 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
 #ifdef Q_OS_ANDROID
     // disable IK on android
-   // return underPoses;
+    return underPoses;
 #endif
 
     // allows solutionSource to be overridden by an animVar
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 60b9e2fd32..5b202429ab 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -269,7 +269,6 @@ bool OpenGLDisplayPlugin::activate() {
         if (!widget->context()->makeCurrent()) {
             throw std::runtime_error("Failed to make context current");
         }
-        //_nativeContext = QOpenGLContextWrapper::currentContextWrapper()->getNativeContext();
         CHECK_GL_ERROR();
         widget->context()->doneCurrent();
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
index a14957d1b4..5c653f8a0a 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.h
@@ -22,7 +22,6 @@
 #include <shared/RateCounter.h>
 
 #include <gpu/Batch.h>
-#include <gl/QOpenGLContextWrapper.h>
 
 namespace gpu {
     namespace gl {
@@ -34,7 +33,6 @@ class OpenGLDisplayPlugin : public DisplayPlugin {
     Q_OBJECT
     Q_PROPERTY(float hudAlpha MEMBER _hudAlpha)
     using Parent = DisplayPlugin;
-    using NativeContextPointer = QOpenGLContextWrapper::NativeContextPointer;
 protected:
     using Mutex = std::mutex;
     using Lock = std::unique_lock<Mutex>;
@@ -177,7 +175,6 @@ protected:
     }
 
     gpu::gl::GLBackend* getGLBackend();
-    //NativeContextPointer _nativeContext;
 
     // Any resource shared by the main thread and the presentation thread must
     // be serialized through this mutex
diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
index e608621b86..d8c0ce8e1d 100644
--- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
+++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
@@ -77,7 +77,6 @@ protected:
     float _ipd { 0.064f };
 
     struct FrameInfo {
-        uint32_t frameId{ 0 };
         mat4 renderPose;
         mat4 presentPose;
         double sensorSampleTime { 0 };
diff --git a/libraries/gl/src/gl/Context.cpp b/libraries/gl/src/gl/Context.cpp
index bd31e9463c..a0d52ee223 100644
--- a/libraries/gl/src/gl/Context.cpp
+++ b/libraries/gl/src/gl/Context.cpp
@@ -26,9 +26,6 @@
 #include "Config.h"
 #include "GLHelpers.h"
 #include "QOpenGLContextWrapper.h"
-#if defined(GL_CUSTOM_CONTEXT)
-#include <QtPlatformHeaders/QWGLNativeContext>
-#endif
 
 using namespace gl;
 
diff --git a/libraries/gl/src/gl/ContextQt.cpp b/libraries/gl/src/gl/ContextQt.cpp
index af2e7df6a6..24ae29e4ca 100644
--- a/libraries/gl/src/gl/ContextQt.cpp
+++ b/libraries/gl/src/gl/ContextQt.cpp
@@ -63,7 +63,6 @@ void Context::debugMessageHandler(const QOpenGLDebugMessage& debugMessage) {
         case QOpenGLDebugMessage::LowSeverity:
             qCDebug(glLogging) << debugMessage;
             return;
-
         default:
             qCWarning(glLogging) << debugMessage;
             break;
diff --git a/libraries/gl/src/gl/OffscreenGLCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
index 533ed1a5f4..69b41da821 100644
--- a/libraries/gl/src/gl/OffscreenGLCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -19,7 +19,6 @@
 #include <QtCore/QThread>
 #include <QtCore/QThreadStorage>
 #include <QtCore/QPointer>
-#include <QtCore/QCoreApplication>
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLDebugLogger>
@@ -60,7 +59,6 @@ bool OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
         sharedContext->doneCurrent();
         _context->setShareContext(sharedContext);
     }
-
     if (!_context->create()) {
         qFatal("Failed to create OffscreenGLCanvas context");
     }
diff --git a/libraries/gl/src/gl/QOpenGLContextWrapper.cpp b/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
index eecdb14c7a..842c7abd08 100644
--- a/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
+++ b/libraries/gl/src/gl/QOpenGLContextWrapper.cpp
@@ -12,6 +12,7 @@
 #include "QOpenGLContextWrapper.h"
 
 #include <QOpenGLContext>
+
 #ifdef Q_OS_WIN
 #include <QtPlatformHeaders/QWGLNativeContext>
 #endif
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
index 8693cf7c61..fef458f536 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
@@ -418,7 +418,7 @@ public:
 #endif
 };
 
-#ifndef GL_CLIP_DISTANCE0
+#if defined(GPU_STEREO_DRAWCALL_INSTANCED) && !defined(GL_CLIP_DISTANCE0)
 #define GL_CLIP_DISTANCE0 GL_CLIP_DISTANCE0_EXT
 #endif
 
@@ -426,10 +426,6 @@ public:
     PROFILE_RANGE(category, name); \
     GlDuration glProfileRangeThis(name);
 
-#ifndef GL_CLIP_DISTANCE0
-#define  GL_CLIP_DISTANCE0 GL_CLIP_DISTANCE0_EXT
-#endif
-
 void GLBackend::render(const Batch& batch) {
     GL_PROFILE_RANGE(render_gpu_gl, batch.getName().c_str());
 
diff --git a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
index 18d5243fc3..ffd0466b79 100644
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
@@ -32,7 +32,7 @@
 
 // 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
-#if defined(USE_GLES) && 0
+#if defined(USE_GLES) && !defined(HAVE_EXT_clip_cull_distance)
 #define GPU_STEREO_TECHNIQUE_DOUBLED_SIMPLE
 #else
 //#define GPU_STEREO_TECHNIQUE_DOUBLED_SMARTER
diff --git a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
index 8f0d5f0632..a8b5ec85e8 100644
--- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
@@ -36,9 +36,6 @@ using namespace gpu::gl45;
 #define ENABLE_SPARSE_TEXTURE 0
 
 bool GL45Backend::supportedTextureFormat(const gpu::Element& format) {
-    if (FORCE_MOBILE_TEXTURES) {
-    } else {
-    }
     switch (format.getSemantic()) {
         // ETC textures are actually required by the OpenGL spec as of 4.3, but aren't always supported by hardware
         // They'll be recompressed by OpenGL, which will be slow or have poor quality, so disable them for now
diff --git a/scripts/system/goto.js b/scripts/system/goto.js
index 04562bab8d..5cc5bad844 100644
--- a/scripts/system/goto.js
+++ b/scripts/system/goto.js
@@ -14,23 +14,52 @@
 
 (function() { // BEGIN LOCAL_SCOPE
 
-function addGotoButton(destination) {
+var button;
+var buttonName = "GOTO";
+var toolBar = null;
+var tablet = null;
+var onGotoScreen = false;
+function onAddressBarShown(visible) {
+    button.editProperties({isActive: visible});
+}
+
+function onClicked(){
+    DialogsManager.toggleAddressBar();
+    onGotoScreen = !onGotoScreen;
+}
+
+if (Settings.getValue("HUDUIEnabled")) {
+    toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system");
+    button = toolBar.addButton({
+        objectName: buttonName,
+        imageURL: Script.resolvePath("assets/images/tools/directory.svg"),
+        visible: true,
+        alpha: 0.9
+    });
+} else {
     tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
     button = tablet.addButton({
         icon: "icons/tablet-icons/goto-i.svg",
         activeIcon: "icons/tablet-icons/goto-a.svg",
-        text: destination
-    });
-    var buttonDestination = destination;
-    button.clicked.connect(function() {
-        Window.location = "hifi://" + buttonDestination;
-    });
-    Script.scriptEnding.connect(function () {
-        tablet.removeButton(button);
+        text: buttonName
     });
 }
 
-addGotoButton("hell")
-addGotoButton("dev-mobile")
+button.clicked.connect(onClicked);
+DialogsManager.addressBarShown.connect(onAddressBarShown);
+
+Script.scriptEnding.connect(function () {
+    if (onGotoScreen) {
+        DialogsManager.toggleAddressBar();
+    }
+    button.clicked.disconnect(onClicked);
+    if (tablet) {
+        tablet.removeButton(button);
+    }
+    if (toolBar) {
+        toolBar.removeButton(buttonName);
+    }
+    DialogsManager.addressBarShown.disconnect(onAddressBarShown);
+});
 
 }()); // END LOCAL_SCOPE
diff --git a/scripts/system/html/js/miniTablet.js b/scripts/system/html/js/miniTablet.js
index 21ad3138cd..c48201cef5 100644
--- a/scripts/system/html/js/miniTablet.js
+++ b/scripts/system/html/js/miniTablet.js
@@ -135,18 +135,18 @@
         gotoImage = document.getElementById("goto-img");
         expandButton = document.getElementById("expand");
 
-       connectEventBridge();
-     
-       document.body.addEventListener("mouseenter", onBodyHover, false);
-       document.body.addEventListener("mouseleave", onBodyUnhover, false);
-     
-       muteButton.addEventListener("mouseenter", onButtonHover, false);
-       gotoButton.addEventListener("mouseenter", onButtonHover, false);
-       expandButton.addEventListener("mouseenter", onButtonHover, false);
-       muteButton.addEventListener("click", onMuteButtonClick, true);
-       gotoButton.addEventListener("click", onGotoButtonClick, true);
-       expandButton.addEventListener("click", onExpandButtonClick, true);
-    
+        connectEventBridge();
+
+        document.body.addEventListener("mouseenter", onBodyHover, false);
+        document.body.addEventListener("mouseleave", onBodyUnhover, false);
+
+        muteButton.addEventListener("mouseenter", onButtonHover, false);
+        gotoButton.addEventListener("mouseenter", onButtonHover, false);
+        expandButton.addEventListener("mouseenter", onButtonHover, false);
+        muteButton.addEventListener("click", onMuteButtonClick, true);
+        gotoButton.addEventListener("click", onGotoButtonClick, true);
+        expandButton.addEventListener("click", onExpandButtonClick, true);
+
         document.body.onunload = function () {
             onUnload();
         };
diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js
index 708b3c0c8d..780dacf85e 100644
--- a/scripts/system/miniTablet.js
+++ b/scripts/system/miniTablet.js
@@ -44,12 +44,11 @@
             return;
         }
         print("DEBUG: " + message);
-
     }
 
     function error(message) {
         print("ERROR: " + message);
-	}
+    }
 
     function handJointName(hand) {
         var jointName;
@@ -127,7 +126,7 @@
             miniOverlayObject = null,
 
             // Button icons.
-            MUTE_ON_ICON =Script.resourcesPath() + "icons/tablet-icons/mic-mute-a.svg",
+            MUTE_ON_ICON = Script.resourcesPath() + "icons/tablet-icons/mic-mute-a.svg",
             MUTE_OFF_ICON = Script.resourcesPath() + "icons/tablet-icons/mic-unmute-i.svg",
             GOTO_ICON = Script.resourcesPath() + "icons/tablet-icons/goto-i.svg",
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 3b5c7c2b38..886f15ded4 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -31,7 +31,6 @@ if (BUILD_TOOLS)
         atp-client
         oven
         nitpick
-        webview
     )
 
     foreach(TOOL ${ALL_TOOLS})
diff --git a/tools/gpu-frame-player/CMakeLists.txt b/tools/gpu-frame-player/CMakeLists.txt
index 5914999757..bd50839f9c 100644
--- a/tools/gpu-frame-player/CMakeLists.txt
+++ b/tools/gpu-frame-player/CMakeLists.txt
@@ -4,9 +4,10 @@ set(TARGET_NAME gpu-frame-player)
 setup_memory_debugger()
 setup_hifi_project(Gui Widgets)
 
+
 # link in the shared libraries
 link_hifi_libraries(
-    shared ktx shaders gpu
+    shared ktx shaders gpu 
 #    vk gpu-vk 
     gl ${PLATFORM_GL_BACKEND}
 )
diff --git a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
index b408e4f464..038c53054c 100644
--- a/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
+++ b/unpublishedScripts/DomainContent/Toybox/pistol/pistol.js
@@ -137,7 +137,7 @@
                 direction: this.firingDirection
             };
             this.createGunFireEffect(this.barrelPoint)
-            var intersection = Entities.findRayIntersectionBlocking(pickRay, true);
+            var intersection = Entities.findRayIntersection(pickRay, true);
             if (intersection.intersects) {
                 this.createEntityHitEffect(intersection.intersection);
                 if (Math.random() < this.playRichochetSoundChance) {

From dade8e9e7a439c3f4a7efb1acbc08aa68c18bba8 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Thu, 7 Feb 2019 23:22:15 -0800
Subject: [PATCH 27/58] moving all the qtactivity code to OculusActivity due to
 lost reference when switching from MAin to Quest

---
 android/apps/interface/build.gradle           |   2 +-
 .../src/main/AndroidManifest.xml              |   9 +-
 .../questInterface/src/main/cpp/native.cpp    | 124 ++++++++++++------
 .../questInterface/MainActivity.java          |  10 +-
 .../questInterface/PermissionsChecker.java    |   2 +-
 .../questInterface/QuestActivity.java         |  33 ++++-
 android/build.gradle                          |   2 +-
 android/libraries/oculus/build.gradle         |   4 +
 .../oculus/OculusMobileActivity.java          |   9 +-
 .../qt5/android/bindings/QtActivity.java      |  16 +--
 .../android/bindings/QtActivityLoader.java    |   3 +
 android/settings.gradle                       |  12 +-
 12 files changed, 150 insertions(+), 76 deletions(-)

diff --git a/android/apps/interface/build.gradle b/android/apps/interface/build.gradle
index 4163df03b7..4093f0ff0d 100644
--- a/android/apps/interface/build.gradle
+++ b/android/apps/interface/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml
index c23f14ee15..24bd643744 100644
--- a/android/apps/questInterface/src/main/AndroidManifest.xml
+++ b/android/apps/questInterface/src/main/AndroidManifest.xml
@@ -28,17 +28,12 @@
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.INFO" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
-            android:name=".QuestActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="landscape"/>
         <activity
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-            android:name=".MainActivity"
+            android:name=".QuestActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <meta-data android:name="android.app.lib_name" android:value="questInterface"/>
diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index b7422b3b66..02b585203d 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -22,8 +22,8 @@
 #include <AndroidHelper.h>
 #include <udt/PacketHeaders.h>
 
-#include <OVR_Platform.h>
-#include <OVR_Functions_Voip.h>
+//#include <OVR_Platform.h>
+//#include <OVR_Functions_Voip.h>
 
 void initOculusPlatform(JNIEnv* env, jobject obj) {
     static std::once_flag once;
@@ -38,49 +38,89 @@ void initOculusPlatform(JNIEnv* env, jobject obj) {
 }
 
 extern "C" {
+    JNIEXPORT void JNICALL
+    Java_io_highfidelity_questInterface_QuestActivity_nativeInitOculusPlatform(JNIEnv *env, jobject obj){
+        initOculusPlatform(env, obj);
+    }
 
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_MainActivity_nativeInitOculusPlatform(JNIEnv* env, jobject obj) {
-    initOculusPlatform(env, obj);
-}
+QAndroidJniObject __interfaceActivity;
 
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_MainActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
-    initOculusPlatform(env, obj);
-    qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject");
-    QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
-        qWarning() << "QQQ" << __FUNCTION__ << "scheduling onAppLoadedComplete";
-        AndroidHelper::instance().moveToThread(qApp->thread());
-        QtAndroid::androidActivity().callMethod<void>("onAppLoadedComplete", "()V");
-        QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, nullptr, nullptr);
-    });
-}
+    JNIEXPORT void JNICALL
+    Java_io_highfidelity_questInterface_QuestActivity_nativeOnCreate(JNIEnv *env, jobject obj) {
+        initOculusPlatform(env, obj);
+        __interfaceActivity = QAndroidJniObject(obj);
 
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_MainActivity_nativeOnDestroy(JNIEnv* env, jobject obj) {
-}
+        if(qApp) {
+            QThread *thr = qApp->thread();
+        }
 
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_SplashActivity_registerLoadCompleteListener(JNIEnv *env,
-                                                                               jobject instance) {
-
-}
-
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_MainActivity_nativeOnPause(JNIEnv *env, jobject obj) {
-    AndroidHelper::instance().notifyEnterBackground();
-}
-
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_MainActivity_nativeOnResume(JNIEnv *env, jobject obj) {
-    AndroidHelper::instance().notifyEnterForeground();
-}
-
-JNIEXPORT void JNICALL
-Java_io_highfidelity_questInterface_receiver_HeadsetStateReceiver_notifyHeadsetOn(JNIEnv *env,
-                                                                                 jobject instance,
-                                                                                 jboolean pluggedIn) {
-    AndroidHelper::instance().notifyHeadsetOn(pluggedIn);
-}
+        AndroidHelper::instance().moveToThread(thr);
+
+
+         qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject");
+
+        JavaVM* jvm;
+        env->GetJavaVM(&jvm);
+
+        QObject::connect(&AndroidHelper::instance(), &AndroidHelper::androidActivityRequested, [jvm](const QString& a, const bool backToScene, QMap<QString, QString> args) {
+            JNIEnv* myNewEnv;
+            JavaVMAttachArgs jvmArgs;
+            jvmArgs.version = JNI_VERSION_1_6; // choose your JNI version
+            jvmArgs.name = NULL; // you might want to give the java thread a name
+            jvmArgs.group = NULL; // you might want to assign the java thread to a ThreadGroup
+
+            int attachedHere = 0; // know if detaching at the end is necessary
+            jint res = jvm->GetEnv((void**)&myNewEnv, JNI_VERSION_1_6); // checks if current env needs attaching or it is already attached
+            if (JNI_OK != res) {
+                qDebug() << "[JCRASH] GetEnv env not attached yet, attaching now..";
+                res = jvm->AttachCurrentThread(reinterpret_cast<JNIEnv **>(&myNewEnv), &jvmArgs);
+                if (JNI_OK != res) {
+                    qDebug() << "[JCRASH] Failed to AttachCurrentThread, ErrorCode = " << res;
+                    return;
+                } else {
+                    attachedHere = 1;
+                }
+            }
+
+            QAndroidJniObject string = QAndroidJniObject::fromString(a);
+            jboolean jBackToScene = (jboolean) backToScene;
+            jclass hashMapClass = myNewEnv->FindClass("java/util/HashMap");
+            jmethodID mapClassConstructor =  myNewEnv->GetMethodID(hashMapClass, "<init>", "()V");
+            jobject hashmap = myNewEnv->NewObject(hashMapClass, mapClassConstructor);
+            jmethodID mapClassPut = myNewEnv->GetMethodID(hashMapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+            QMap<QString, QString>::iterator i;
+            for (i = args.begin(); i != args.end(); ++i) {
+                QAndroidJniObject jKey = QAndroidJniObject::fromString(i.key());
+                QAndroidJniObject jValue = QAndroidJniObject::fromString(i.value());
+                myNewEnv->CallObjectMethod(hashmap, mapClassPut, jKey.object<jstring>(), jValue.object<jstring>());
+            }
+            __interfaceActivity.callMethod<void>("openAndroidActivity", "(Ljava/lang/String;ZLjava/util/HashMap;)V", string.object<jstring>(), jBackToScene, hashmap);
+            if (attachedHere) {
+                jvm->DetachCurrentThread();
+            }
+        });
+
+    }
+
+    JNIEXPORT void JNICALL
+    Java_io_highfidelity_questInterface_QuestActivity_nativeOnDestroy(JNIEnv *env, jobject obj) {
+    }
+
+    JNIEXPORT void JNICALL
+    Java_io_highfidelity_questInterface_QuestActivity_nativeOnPause(JNIEnv *env, jobject obj) {
+        AndroidHelper::instance().notifyEnterBackground();
+    }
+
+    JNIEXPORT void JNICALL
+    Java_io_highfidelity_questInterface_QuestActivity_nativeOnResume(JNIEnv *env, jobject obj) {
+        AndroidHelper::instance().notifyEnterForeground();
+    }
+
+    JNIEXPORT void JNICALL
+    Java_io_highfidelity_questInterface_receiver_HeadsetStateReceiver_notifyHeadsetOn(JNIEnv *env,
+                                                                                      jobject instance,
+                                                                                      jboolean pluggedIn) {
+        AndroidHelper::instance().notifyHeadsetOn(pluggedIn);
+    }
 
 }
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
index ce75c54f12..93aafa042b 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
@@ -11,6 +11,8 @@
 
 package io.highfidelity.questInterface;
 
+import android.app.Activity;
+import android.app.Application;
 import android.content.Intent;
 import  android.os.Bundle;
 import android.util.Log;
@@ -29,10 +31,9 @@ public class MainActivity extends QtActivity {
     private native void nativeOnPause();
     private native void nativeOnResume();
 
+    private boolean isLoading;
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.isLoading = true;
-        super.keepInterfaceRunning = true;
         super.onCreate(savedInstanceState);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
@@ -41,6 +42,7 @@ public class MainActivity extends QtActivity {
 
 
     public void onAppLoadedComplete() {
+
         Log.w("QQQ", "Returning to quest activity");
         runOnUiThread(()->{
             startActivity(new Intent(MainActivity.this, QuestActivity.class));
@@ -51,9 +53,9 @@ public class MainActivity extends QtActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        if (!super.isLoading) {
+
             nativeOnPause();
-        }
+
     }
 
     @Override
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
index 91b5bdcdae..7d8ce383dc 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
@@ -45,7 +45,7 @@ public class PermissionsChecker extends Activity {
 
     private void launchActivityWithPermissions() {
         startActivity(new Intent(this, QuestActivity.class));
-        finish();
+
     }
 
     @Override
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
index 6887140de5..a7aa93dbb9 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
@@ -13,13 +13,44 @@ package io.highfidelity.questInterface;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.WindowManager;
 
 import io.highfidelity.oculus.OculusMobileActivity;
+import io.highfidelity.utils.HifiUtils;
 
 public class QuestActivity extends OculusMobileActivity {
+    private native void nativeOnCreate();
+    private native void nativeOnDestroy();
+    private native void nativeOnPause();
+    private native void nativeOnResume();
+
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        startActivity(new Intent(this, MainActivity.class));
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
+        nativeOnCreate();
     }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        nativeOnPause();
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        nativeOnResume();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        nativeOnDestroy();
+    }
+
 }
diff --git a/android/build.gradle b/android/build.gradle
index 4affdf65cd..eebe7bdc27 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle
index b072f99eb7..776c0c1e48 100644
--- a/android/libraries/oculus/build.gradle
+++ b/android/libraries/oculus/build.gradle
@@ -15,3 +15,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
+
+dependencies {
+    compile project(path: ':qt')
+}
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index 01d74ea94d..b06f850afc 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -16,11 +16,15 @@ import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.WindowManager;
 
+
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+
 /**
  * Contains a native surface and forwards the activity lifecycle and surface lifecycle
  * events to the OculusMobileDisplayPlugin
  */
-public class OculusMobileActivity extends Activity implements SurfaceHolder.Callback {
+public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Callback {
     private static final String TAG = OculusMobileActivity.class.getSimpleName();
     static { System.loadLibrary("oculusMobile"); }
     private native void nativeOnCreate();
@@ -32,7 +36,6 @@ public class OculusMobileActivity extends Activity implements SurfaceHolder.Call
     private SurfaceView mView;
     private SurfaceHolder mSurfaceHolder;
 
-
     public static void launch(Activity activity) {
         if (activity != null) {
             activity.runOnUiThread(()->{
@@ -45,7 +48,9 @@ public class OculusMobileActivity extends Activity implements SurfaceHolder.Call
     public void onCreate(Bundle savedInstanceState) {
         Log.w(TAG, "QQQ onCreate");
         super.onCreate(savedInstanceState);
+
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
         // Create a native surface for VR rendering (Qt GL surfaces are not suitable
         // because of the lack of fine control over the surface callbacks)
         mView = new SurfaceView(this);
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 6a6688ac41..02597956e4 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -70,9 +70,6 @@ public class QtActivity extends Activity {
     public final String QT_ANDROID_DEFAULT_THEME = QT_ANDROID_THEMES[0]; // sets the default theme.
     private QtActivityLoader m_loader = new QtActivityLoader(this);
 
-    public boolean isLoading;
-    public boolean keepInterfaceRunning;
-
     public QtActivity() {
     }
 
@@ -229,10 +226,13 @@ public class QtActivity extends Activity {
     //---------------------------------------------------------------------------
 
     protected void onCreateHook(Bundle savedInstanceState) {
+
         m_loader.APPLICATION_PARAMETERS = APPLICATION_PARAMETERS;
         m_loader.ENVIRONMENT_VARIABLES = ENVIRONMENT_VARIABLES;
         m_loader.QT_ANDROID_THEMES = QT_ANDROID_THEMES;
         m_loader.QT_ANDROID_DEFAULT_THEME = QT_ANDROID_DEFAULT_THEME;
+
+
         m_loader.onCreate(savedInstanceState);
     }
 
@@ -506,9 +506,7 @@ public class QtActivity extends Activity {
         super.onPause();
         // GC: this trick allow us to show a splash activity until Qt app finishes
         // loading
-        if (!isLoading && !keepInterfaceRunning) {
-            QtApplication.invokeDelegate();
-        }
+        QtApplication.invokeDelegate();
     }
     //---------------------------------------------------------------------------
 
@@ -647,11 +645,7 @@ public class QtActivity extends Activity {
     @Override
     protected void onStop() {
         super.onStop();
-        if (!keepInterfaceRunning) {
-            QtApplication.invokeDelegate();
-        }
-        QtNative.terminateQt();
-        QtNative.setActivity(null,null);
+        QtApplication.invokeDelegate();
     }
 
     //---------------------------------------------------------------------------
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java
index e3066a3bd9..5258c0fb88 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java
@@ -79,6 +79,7 @@ public class QtActivityLoader {
     private static final String EXTRACT_STYLE_MINIMAL_KEY = "extract.android.style.option";
     private static final int BUFFER_SIZE = 1024;
 
+    public boolean Created=false;
     String APPLICATION_PARAMETERS = null; // use this variable to pass any parameters to your application,
     String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_DIALOGS=1";
     String[] QT_ANDROID_THEMES = null;
@@ -497,6 +498,8 @@ public class QtActivityLoader {
             }
 
             startApp();
+
+            Created=true;
         }
     }
 }
diff --git a/android/settings.gradle b/android/settings.gradle
index 64eb246719..23e54b0457 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -12,8 +12,8 @@ project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
 // Applications
 //
 
-include ':interface'
-project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+//include ':interface'
+//project(':interface').projectDir = new File(settingsDir, 'apps/interface')
 
 include ':questInterface'
 project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
@@ -22,8 +22,8 @@ project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterfa
 // Test projects
 //
 
-include ':framePlayer'
-project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+//include ':framePlayer'
+//project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
 
-include ':questFramePlayer'
-project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
+//include ':questFramePlayer'
+//project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')

From 8848d0210abdc4eb141385cb53c9ecec2753d5ea Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Fri, 8 Feb 2019 00:27:25 -0800
Subject: [PATCH 28/58] stuff

---
 .../questInterface/src/main/cpp/native.cpp    | 63 +++----------------
 .../questInterface/QuestActivity.java         | 17 +++--
 .../oculus/OculusMobileActivity.java          | 14 +----
 .../android/bindings/QtActivityLoader.java    |  3 -
 4 files changed, 19 insertions(+), 78 deletions(-)

diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index 02b585203d..5a4b1ee4ad 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -43,76 +43,31 @@ extern "C" {
         initOculusPlatform(env, obj);
     }
 
-QAndroidJniObject __interfaceActivity;
-
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_nativeOnCreate(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnCreate(JNIEnv *env, jobject obj) {
         initOculusPlatform(env, obj);
-        __interfaceActivity = QAndroidJniObject(obj);
+
 
         if(qApp) {
             QThread *thr = qApp->thread();
+            AndroidHelper::instance().moveToThread(thr);
+        }
+        else{
+            __android_log_print(ANDROID_LOG_ERROR,"QQQ_", "APP is not valid");
         }
-
-        AndroidHelper::instance().moveToThread(thr);
-
-
-         qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject");
-
-        JavaVM* jvm;
-        env->GetJavaVM(&jvm);
-
-        QObject::connect(&AndroidHelper::instance(), &AndroidHelper::androidActivityRequested, [jvm](const QString& a, const bool backToScene, QMap<QString, QString> args) {
-            JNIEnv* myNewEnv;
-            JavaVMAttachArgs jvmArgs;
-            jvmArgs.version = JNI_VERSION_1_6; // choose your JNI version
-            jvmArgs.name = NULL; // you might want to give the java thread a name
-            jvmArgs.group = NULL; // you might want to assign the java thread to a ThreadGroup
-
-            int attachedHere = 0; // know if detaching at the end is necessary
-            jint res = jvm->GetEnv((void**)&myNewEnv, JNI_VERSION_1_6); // checks if current env needs attaching or it is already attached
-            if (JNI_OK != res) {
-                qDebug() << "[JCRASH] GetEnv env not attached yet, attaching now..";
-                res = jvm->AttachCurrentThread(reinterpret_cast<JNIEnv **>(&myNewEnv), &jvmArgs);
-                if (JNI_OK != res) {
-                    qDebug() << "[JCRASH] Failed to AttachCurrentThread, ErrorCode = " << res;
-                    return;
-                } else {
-                    attachedHere = 1;
-                }
-            }
-
-            QAndroidJniObject string = QAndroidJniObject::fromString(a);
-            jboolean jBackToScene = (jboolean) backToScene;
-            jclass hashMapClass = myNewEnv->FindClass("java/util/HashMap");
-            jmethodID mapClassConstructor =  myNewEnv->GetMethodID(hashMapClass, "<init>", "()V");
-            jobject hashmap = myNewEnv->NewObject(hashMapClass, mapClassConstructor);
-            jmethodID mapClassPut = myNewEnv->GetMethodID(hashMapClass, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-            QMap<QString, QString>::iterator i;
-            for (i = args.begin(); i != args.end(); ++i) {
-                QAndroidJniObject jKey = QAndroidJniObject::fromString(i.key());
-                QAndroidJniObject jValue = QAndroidJniObject::fromString(i.value());
-                myNewEnv->CallObjectMethod(hashmap, mapClassPut, jKey.object<jstring>(), jValue.object<jstring>());
-            }
-            __interfaceActivity.callMethod<void>("openAndroidActivity", "(Ljava/lang/String;ZLjava/util/HashMap;)V", string.object<jstring>(), jBackToScene, hashmap);
-            if (attachedHere) {
-                jvm->DetachCurrentThread();
-            }
-        });
-
     }
 
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_nativeOnDestroy(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnDestroy(JNIEnv *env, jobject obj) {
     }
 
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_nativeOnPause(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnPause(JNIEnv *env, jobject obj) {
         AndroidHelper::instance().notifyEnterBackground();
     }
 
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_nativeOnResume(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnResume(JNIEnv *env, jobject obj) {
         AndroidHelper::instance().notifyEnterForeground();
     }
 
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
index a7aa93dbb9..a482e98a24 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
@@ -19,38 +19,37 @@ import io.highfidelity.oculus.OculusMobileActivity;
 import io.highfidelity.utils.HifiUtils;
 
 public class QuestActivity extends OculusMobileActivity {
-    private native void nativeOnCreate();
-    private native void nativeOnDestroy();
-    private native void nativeOnPause();
-    private native void nativeOnResume();
-
+    private native void questNativeOnCreate();
+    private native void questNativeOnDestroy();
+    private native void questNativeOnPause();
+    private native void questNativeOnResume();
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
-        nativeOnCreate();
+        questNativeOnCreate();
     }
 
 
     @Override
     protected void onPause() {
         super.onPause();
-        nativeOnPause();
+        questNativeOnPause();
 
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        nativeOnResume();
+        questNativeOnResume();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        nativeOnDestroy();
+        questNativeOnDestroy();
     }
 
 }
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index b06f850afc..0a39e3abf0 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -36,29 +36,19 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
     private SurfaceView mView;
     private SurfaceHolder mSurfaceHolder;
 
-    public static void launch(Activity activity) {
-        if (activity != null) {
-            activity.runOnUiThread(()->{
-                activity.startActivity(new Intent(activity, OculusMobileActivity.class));
-            });
-        }
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Log.w(TAG, "QQQ onCreate");
         super.onCreate(savedInstanceState);
 
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
         // Create a native surface for VR rendering (Qt GL surfaces are not suitable
         // because of the lack of fine control over the surface callbacks)
         mView = new SurfaceView(this);
-        setContentView(mView);
         mView.getHolder().addCallback(this);
-
+        setContentView(mView);
         // Forward the create message to the JNI code
         nativeOnCreate();
+
     }
 
     @Override
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java
index 5258c0fb88..e3066a3bd9 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivityLoader.java
@@ -79,7 +79,6 @@ public class QtActivityLoader {
     private static final String EXTRACT_STYLE_MINIMAL_KEY = "extract.android.style.option";
     private static final int BUFFER_SIZE = 1024;
 
-    public boolean Created=false;
     String APPLICATION_PARAMETERS = null; // use this variable to pass any parameters to your application,
     String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_DIALOGS=1";
     String[] QT_ANDROID_THEMES = null;
@@ -498,8 +497,6 @@ public class QtActivityLoader {
             }
 
             startApp();
-
-            Created=true;
         }
     }
 }

From e8a35c63c75b4c04c99540f89555993e07a2a0d5 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Fri, 8 Feb 2019 13:45:53 -0800
Subject: [PATCH 29/58] moved asset loading to the permissions screen, added
 the onNotifyAppLoaded signal connect function as well as binding to the
 qtread with the ui thread.

---
 .../hifiinterface/MainActivity.java           |  1 +
 .../questInterface/src/main/cpp/native.cpp    | 26 +++++++++++++------
 .../questInterface/PermissionsChecker.java    |  3 +++
 .../questInterface/QuestActivity.java         | 12 ++++++---
 .../oculus/OculusMobileActivity.java          |  4 +--
 interface/src/Application.cpp                 |  1 +
 6 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index e5ea0f998d..239dc96523 100644
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -1,3 +1,4 @@
+
 package io.highfidelity.hifiinterface;
 
 import android.app.Activity;
diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index 5a4b1ee4ad..047ec2007c 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -42,21 +42,31 @@ extern "C" {
     Java_io_highfidelity_questInterface_QuestActivity_nativeInitOculusPlatform(JNIEnv *env, jobject obj){
         initOculusPlatform(env, obj);
     }
-
+QAndroidJniObject __interfaceActivity;
     JNIEXPORT void JNICALL
     Java_io_highfidelity_questInterface_QuestActivity_questNativeOnCreate(JNIEnv *env, jobject obj) {
+        __android_log_print(ANDROID_LOG_WARN, "QQQ","questNativeOnCreate called");
         initOculusPlatform(env, obj);
+        __interfaceActivity = QAndroidJniObject (obj);
+        QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
 
 
-        if(qApp) {
-            QThread *thr = qApp->thread();
-            AndroidHelper::instance().moveToThread(thr);
-        }
-        else{
-            __android_log_print(ANDROID_LOG_ERROR,"QQQ_", "APP is not valid");
-        }
+            QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
+                __interfaceActivity.callMethod<void>("onAppLoadedComplete", "()V");
+
+            QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, nullptr,
+                                    nullptr);
+            });
+
+            QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete,
+                                nullptr, nullptr);
+        });
     }
 
+JNIEXPORT void Java_io_highfidelity_questInterface_QuestActivity_questOnAppAfterLoad(JNIEnv* env, jobject obj) {
+    AndroidHelper::instance().moveToThread(qApp->thread());
+}
+
     JNIEXPORT void JNICALL
     Java_io_highfidelity_questInterface_QuestActivity_questNativeOnDestroy(JNIEnv *env, jobject obj) {
     }
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
index 7d8ce383dc..10a0faf9cc 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
@@ -6,6 +6,8 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 
+import io.highfidelity.utils.HifiUtils;
+
 public class PermissionsChecker extends Activity {
     private static final int REQUEST_PERMISSIONS = 20;
     private static final String TAG = PermissionsChecker.class.getName();
@@ -44,6 +46,7 @@ public class PermissionsChecker extends Activity {
     }
 
     private void launchActivityWithPermissions() {
+        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
         startActivity(new Intent(this, QuestActivity.class));
 
     }
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
index a482e98a24..6c8072498b 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
@@ -13,6 +13,7 @@ package io.highfidelity.questInterface;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.WindowManager;
 
 import io.highfidelity.oculus.OculusMobileActivity;
@@ -23,15 +24,20 @@ public class QuestActivity extends OculusMobileActivity {
     private native void questNativeOnDestroy();
     private native void questNativeOnPause();
     private native void questNativeOnResume();
-
+    private native void questOnAppAfterLoad();
+    String TAG = OculusMobileActivity.class.getSimpleName();
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
         questNativeOnCreate();
     }
 
+    public void onAppLoadedComplete() {
+        Log.w(TAG, "QQQ Load Completed");
+        runOnUiThread(() -> {
+            questOnAppAfterLoad();
+        });
+    }
 
     @Override
     protected void onPause() {
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index 0a39e3abf0..a14057e57f 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -44,11 +44,11 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         // Create a native surface for VR rendering (Qt GL surfaces are not suitable
         // because of the lack of fine control over the surface callbacks)
         mView = new SurfaceView(this);
+
         mView.getHolder().addCallback(this);
         setContentView(mView);
-        // Forward the create message to the JNI code
         nativeOnCreate();
-
+        // Forward the create message to the JNI code
     }
 
     @Override
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d9eae20752..62c65ee940 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2428,6 +2428,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
     AndroidHelper::instance().notifyLoadComplete();
 #endif
+    AndroidHelper::instance().notifyLoadComplete();
     pauseUntilLoginDetermined();
 }
 

From e6366eaf025aeadef213d078a2e847031337ac30 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Mon, 11 Feb 2019 09:46:06 -0800
Subject: [PATCH 30/58] consolidated the OculusAcitivity into
 OCulusMobilieAcitivity to reduce amount of back and forth between super and
 base as well as remove reduntant calls to native. Moved setcontentView on the
 native callback becuase it was blocking QtActivity from finishing its
 initialization

---
 .../src/main/AndroidManifest.xml              |  2 +-
 .../questInterface/src/main/cpp/native.cpp    | 53 +++++++++++-----
 .../questInterface/PermissionsChecker.java    |  6 +-
 .../questInterface/QuestActivity.java         | 17 ++++-
 .../oculus/OculusMobileActivity.java          | 62 +++++++++++++++----
 libraries/oculusMobile/src/ovr/VrHandler.cpp  | 19 ++++++
 6 files changed, 124 insertions(+), 35 deletions(-)

diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml
index 24bd643744..f3d06e0c13 100644
--- a/android/apps/questInterface/src/main/AndroidManifest.xml
+++ b/android/apps/questInterface/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         </activity>
         <activity
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-            android:name=".QuestActivity"
+            android:name="io.highfidelity.oculus.OculusMobileActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <meta-data android:name="android.app.lib_name" android:value="questInterface"/>
diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index 047ec2007c..9864273158 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -37,47 +37,66 @@ void initOculusPlatform(JNIEnv* env, jobject obj) {
     });
 }
 
+void getClassName(JNIEnv *env, jobject obj){
+    jclass cls = env->GetObjectClass(obj);
+    jmethodID mid = env->GetMethodID(cls,"getClass", "()Ljava/lang/Class;");
+    jobject clsObj = env->CallObjectMethod(obj, mid);
+
+    cls= env->GetObjectClass(clsObj);
+
+    mid= env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
+
+    jstring strObj = (jstring) env->CallObjectMethod(clsObj, mid);
+
+    const char* str = env->GetStringUTFChars(strObj, NULL);
+
+    __android_log_print(ANDROID_LOG_ERROR,__FUNCTION__, "Native Class call: %s",str);
+
+    env->ReleaseStringUTFChars(strObj, str);
+}
+
+
 extern "C" {
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_nativeInitOculusPlatform(JNIEnv *env, jobject obj){
+    Java_io_highfidelity_oculus_OculusMobileActivity_nativeInitOculusPlatform(JNIEnv *env, jobject obj){
         initOculusPlatform(env, obj);
     }
 QAndroidJniObject __interfaceActivity;
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnCreate(JNIEnv *env, jobject obj) {
-        __android_log_print(ANDROID_LOG_WARN, "QQQ","questNativeOnCreate called");
+    Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnCreate(JNIEnv *env, jobject obj) {
+        __android_log_print(ANDROID_LOG_INFO, "QQQ", __FUNCTION__);
         initOculusPlatform(env, obj);
-        __interfaceActivity = QAndroidJniObject (obj);
+        getClassName(env, obj);
+
+         qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject");
+        __interfaceActivity = QAndroidJniObject(obj);
+
         QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
-
-
-            QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
-                __interfaceActivity.callMethod<void>("onAppLoadedComplete", "()V");
-
-            QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, nullptr,
-                                    nullptr);
-            });
+            __interfaceActivity.callMethod<void>("onAppLoadedComplete", "()V");
 
             QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete,
-                                nullptr, nullptr);
+                                nullptr,
+                                nullptr);
         });
     }
 
-JNIEXPORT void Java_io_highfidelity_questInterface_QuestActivity_questOnAppAfterLoad(JNIEnv* env, jobject obj) {
+
+
+JNIEXPORT void Java_io_highfidelity_oculus_OculusMobileActivity_questOnAppAfterLoad(JNIEnv* env, jobject obj) {
     AndroidHelper::instance().moveToThread(qApp->thread());
 }
 
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnDestroy(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnDestroy(JNIEnv *env, jobject obj) {
     }
 
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnPause(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnPause(JNIEnv *env, jobject obj) {
         AndroidHelper::instance().notifyEnterBackground();
     }
 
     JNIEXPORT void JNICALL
-    Java_io_highfidelity_questInterface_QuestActivity_questNativeOnResume(JNIEnv *env, jobject obj) {
+    Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnResume(JNIEnv *env, jobject obj) {
         AndroidHelper::instance().notifyEnterForeground();
     }
 
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
index 10a0faf9cc..72fc4b5182 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 
+import io.highfidelity.oculus.OculusMobileActivity;
 import io.highfidelity.utils.HifiUtils;
 
 public class PermissionsChecker extends Activity {
@@ -46,9 +47,8 @@ public class PermissionsChecker extends Activity {
     }
 
     private void launchActivityWithPermissions() {
-        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
-        startActivity(new Intent(this, QuestActivity.class));
-
+        startActivity(new Intent(this, OculusMobileActivity.class));
+        finish();
     }
 
     @Override
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
index 6c8072498b..9e2ace3bd3 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
@@ -14,6 +14,7 @@ package io.highfidelity.questInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.SurfaceView;
 import android.view.WindowManager;
 
 import io.highfidelity.oculus.OculusMobileActivity;
@@ -25,15 +26,22 @@ public class QuestActivity extends OculusMobileActivity {
     private native void questNativeOnPause();
     private native void questNativeOnResume();
     private native void questOnAppAfterLoad();
+
+    private boolean isLoading=false;
     String TAG = OculusMobileActivity.class.getSimpleName();
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
+        isLoading=true;
         questNativeOnCreate();
+
     }
 
     public void onAppLoadedComplete() {
         Log.w(TAG, "QQQ Load Completed");
+        isLoading=false;
         runOnUiThread(() -> {
             questOnAppAfterLoad();
         });
@@ -42,20 +50,25 @@ public class QuestActivity extends OculusMobileActivity {
     @Override
     protected void onPause() {
         super.onPause();
-        questNativeOnPause();
+
+        Log.w(TAG, "OnPause");
+        if(!isLoading){
+            questNativeOnPause();
+        }
 
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+        Log.w(TAG, "OnResume");
         questNativeOnResume();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        Log.w(TAG, "OnDestroy");
         questNativeOnDestroy();
     }
-
 }
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index a14057e57f..f1aa42c22c 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -10,16 +10,20 @@ package io.highfidelity.oculus;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.WindowManager;
-
+import android.widget.LinearLayout;
 
 
 import org.qtproject.qt5.android.bindings.QtActivity;
 
+import io.highfidelity.utils.HifiUtils;
+
 /**
  * Contains a native surface and forwards the activity lifecycle and surface lifecycle
  * events to the OculusMobileDisplayPlugin
@@ -27,52 +31,86 @@ import org.qtproject.qt5.android.bindings.QtActivity;
 public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Callback {
     private static final String TAG = OculusMobileActivity.class.getSimpleName();
     static { System.loadLibrary("oculusMobile"); }
+
     private native void nativeOnCreate();
     private native static void nativeOnResume();
     private native static void nativeOnPause();
     private native static void nativeOnDestroy();
     private native static void nativeOnSurfaceChanged(Surface s);
 
+    private native void questNativeOnCreate();
+    private native void questNativeOnDestroy();
+    private native void questNativeOnPause();
+    private native void questNativeOnResume();
+    private native void questOnAppAfterLoad();
+
+
     private SurfaceView mView;
     private SurfaceHolder mSurfaceHolder;
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        Log.w(TAG, "QQQ onCreate");
-        super.onCreate(savedInstanceState);
+    boolean isLoading =false;
 
+    public void onCreate(Bundle savedInstanceState) {
+        isLoading=true;
+        super.onCreate(savedInstanceState);
+        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
+
+        Log.w(TAG, "QQQ onCreate");
         // Create a native surface for VR rendering (Qt GL surfaces are not suitable
         // because of the lack of fine control over the surface callbacks)
-        mView = new SurfaceView(this);
-
-        mView.getHolder().addCallback(this);
-        setContentView(mView);
-        nativeOnCreate();
         // Forward the create message to the JNI code
+        mView = new SurfaceView(this);
+        mView.getHolder().addCallback(this);
+
+       // mainHandler=new Handler(Looper.getMainLooper());
+
+        nativeOnCreate();
+        questNativeOnCreate();
+    }
+
+
+ //   public static void runOnMainThread(Runnable run){
+ //       mainHandler.post(run);
+  //  }
+
+    public void onAppLoadedComplete() {
+        Log.w(TAG, "QQQ Load Completed");
+        isLoading=false;
+
+        //isLoading=false;
+        runOnUiThread(() -> {
+            setContentView(mView);
+            questOnAppAfterLoad();
+        });
     }
 
     @Override
     protected void onDestroy() {
         Log.w(TAG, "QQQ onDestroy");
+        super.onDestroy();
+
         if (mSurfaceHolder != null) {
             nativeOnSurfaceChanged(null);
         }
         nativeOnDestroy();
-        super.onDestroy();
+        questNativeOnDestroy();
     }
 
     @Override
     protected void onResume() {
         Log.w(TAG, "QQQ onResume");
         super.onResume();
+
         nativeOnResume();
+        questNativeOnResume();
     }
 
     @Override
     protected void onPause() {
         Log.w(TAG, "QQQ onPause");
-        nativeOnPause();
         super.onPause();
+        nativeOnPause();
+        questNativeOnPause();
     }
 
     @Override
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp
index de2b4e1ff6..c6329c62a6 100644
--- a/libraries/oculusMobile/src/ovr/VrHandler.cpp
+++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp
@@ -27,6 +27,25 @@ using namespace ovr;
 
 static thread_local bool isRenderThread { false };
 
+static void getClassName(JNIEnv *env, jobject obj){
+    jclass cls = env->GetObjectClass(obj);
+    jmethodID mid = env->GetMethodID(cls,"getClass", "()Ljava/lang/Class;");
+    jobject clsObj = env->CallObjectMethod(obj, mid);
+
+    cls= env->GetObjectClass(clsObj);
+
+    mid= env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
+
+    jstring strObj = (jstring) env->CallObjectMethod(clsObj, mid);
+
+    const char* str = env->GetStringUTFChars(strObj, NULL);
+
+    __android_log_print(ANDROID_LOG_ERROR,__FUNCTION__, "VRHandler class: %s",str);
+
+    env->ReleaseStringUTFChars(strObj, str);
+
+}
+
 struct VrSurface : public TaskQueue {
     using HandlerTask = VrHandler::HandlerTask;
 

From ef655cd243dcc44014c7cb0e70b9880c7876dc7d Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Mon, 11 Feb 2019 10:38:10 -0800
Subject: [PATCH 31/58] removed junk

---
 .../oculus/OculusMobileActivity.java            | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index f1aa42c22c..197c8a8da2 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -62,17 +62,10 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         mView = new SurfaceView(this);
         mView.getHolder().addCallback(this);
 
-       // mainHandler=new Handler(Looper.getMainLooper());
-
         nativeOnCreate();
         questNativeOnCreate();
     }
 
-
- //   public static void runOnMainThread(Runnable run){
- //       mainHandler.post(run);
-  //  }
-
     public void onAppLoadedComplete() {
         Log.w(TAG, "QQQ Load Completed");
         isLoading=false;
@@ -101,16 +94,20 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         Log.w(TAG, "QQQ onResume");
         super.onResume();
 
-        nativeOnResume();
         questNativeOnResume();
+        nativeOnResume();
+
     }
 
     @Override
     protected void onPause() {
         Log.w(TAG, "QQQ onPause");
         super.onPause();
-        nativeOnPause();
-        questNativeOnPause();
+
+        if (!isLoading) {
+            questNativeOnPause();
+            nativeOnPause();
+        }
     }
 
     @Override

From 68b3ae989f0340ca2d1bf7148a6cce6880aca4d9 Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Mon, 11 Feb 2019 14:24:51 -0800
Subject: [PATCH 32/58] removed unused activities. Fixed null refference
 pointer to activity.getApplicationContext() error on restart

---
 .../questInterface/src/main/cpp/native.cpp    |  1 -
 .../questInterface/MainActivity.java          | 72 ------------------
 .../questInterface/QuestActivity.java         | 74 -------------------
 .../oculus/OculusMobileActivity.java          | 12 ++-
 4 files changed, 9 insertions(+), 150 deletions(-)
 delete mode 100644 android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
 delete mode 100644 android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java

diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index 9864273158..b9ff56bbf7 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -68,7 +68,6 @@ QAndroidJniObject __interfaceActivity;
         initOculusPlatform(env, obj);
         getClassName(env, obj);
 
-         qRegisterMetaType<QAndroidJniObject>("QAndroidJniObject");
         __interfaceActivity = QAndroidJniObject(obj);
 
         QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
deleted file mode 100644
index 93aafa042b..0000000000
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/MainActivity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  MainActivity.java
-//  android/app/src/main/java
-//
-//  Created by Stephen Birarda on 1/26/15.
-//  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
-//
-
-package io.highfidelity.questInterface;
-
-import android.app.Activity;
-import android.app.Application;
-import android.content.Intent;
-import  android.os.Bundle;
-import android.util.Log;
-import android.view.WindowManager;
-
-import org.qtproject.qt5.android.bindings.QtActivity;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-import io.highfidelity.utils.HifiUtils;
-
-public class MainActivity extends QtActivity {
-    private native void nativeOnCreate();
-    private native void nativeOnDestroy();
-    private native void nativeOnPause();
-    private native void nativeOnResume();
-
-    private boolean isLoading;
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
-        nativeOnCreate();
-    }
-
-
-    public void onAppLoadedComplete() {
-
-        Log.w("QQQ", "Returning to quest activity");
-        runOnUiThread(()->{
-            startActivity(new Intent(MainActivity.this, QuestActivity.class));
-            //moveTaskToBack(true);
-        });
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-            nativeOnPause();
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        nativeOnResume();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        nativeOnDestroy();
-    }
-}
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
deleted file mode 100644
index 9e2ace3bd3..0000000000
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/QuestActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-//  MainActivity.java
-//  android/app/src/main/java
-//
-//  Created by Stephen Birarda on 1/26/15.
-//  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
-//
-
-package io.highfidelity.questInterface;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-
-import io.highfidelity.oculus.OculusMobileActivity;
-import io.highfidelity.utils.HifiUtils;
-
-public class QuestActivity extends OculusMobileActivity {
-    private native void questNativeOnCreate();
-    private native void questNativeOnDestroy();
-    private native void questNativeOnPause();
-    private native void questNativeOnResume();
-    private native void questOnAppAfterLoad();
-
-    private boolean isLoading=false;
-    String TAG = OculusMobileActivity.class.getSimpleName();
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
-        isLoading=true;
-        questNativeOnCreate();
-
-    }
-
-    public void onAppLoadedComplete() {
-        Log.w(TAG, "QQQ Load Completed");
-        isLoading=false;
-        runOnUiThread(() -> {
-            questOnAppAfterLoad();
-        });
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        Log.w(TAG, "OnPause");
-        if(!isLoading){
-            questNativeOnPause();
-        }
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Log.w(TAG, "OnResume");
-        questNativeOnResume();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Log.w(TAG, "OnDestroy");
-        questNativeOnDestroy();
-    }
-}
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index 197c8a8da2..637600b34b 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -72,7 +72,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
 
         //isLoading=false;
         runOnUiThread(() -> {
-            setContentView(mView);
+            setContentView(mView);  setContentView(mView);
             questOnAppAfterLoad();
         });
     }
@@ -110,9 +110,15 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         }
     }
 
+    @Override
+    protected void onRestart(){
+        super.onRestart();
+        nativeOnCreate();
+    }
+
     @Override
     public void surfaceCreated(SurfaceHolder holder) {
-        Log.w(TAG, "QQQ surfaceCreated");
+        Log.w(TAG, "QQQ surfaceCreated ************************************");
         nativeOnSurfaceChanged(holder.getSurface());
         mSurfaceHolder = holder;
     }
@@ -126,7 +132,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
-        Log.w(TAG, "QQQ surfaceDestroyed");
+        Log.w(TAG, "QQQ surfaceDestroyed ***************************************************");
         nativeOnSurfaceChanged(null);
         mSurfaceHolder = null;
     }

From 3cada9722c674ea1cac1715c691b3ec74371a1fb Mon Sep 17 00:00:00 2001
From: amerhifi <amer@ad.highfidelity.io>
Date: Mon, 11 Feb 2019 15:01:22 -0800
Subject: [PATCH 33/58] undoing some unfavorable changes

---
 android/apps/interface/build.gradle                      | 2 +-
 android/apps/questInterface/src/main/AndroidManifest.xml | 2 +-
 android/apps/questInterface/src/main/cpp/native.cpp      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/apps/interface/build.gradle b/android/apps/interface/build.gradle
index 4093f0ff0d..4163df03b7 100644
--- a/android/apps/interface/build.gradle
+++ b/android/apps/interface/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml
index f3d06e0c13..a5029382cb 100644
--- a/android/apps/questInterface/src/main/AndroidManifest.xml
+++ b/android/apps/questInterface/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.INFO" />
             </intent-filter>
         </activity>
         <activity
diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index b9ff56bbf7..f27bff8228 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -22,8 +22,8 @@
 #include <AndroidHelper.h>
 #include <udt/PacketHeaders.h>
 
-//#include <OVR_Platform.h>
-//#include <OVR_Functions_Voip.h>
+#include <OVR_Platform.h>
+#include <OVR_Functions_Voip.h>
 
 void initOculusPlatform(JNIEnv* env, jobject obj) {
     static std::once_flag once;

From 4dd853ddbc7a7b0b39298c14335fac75a631508b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 12 Feb 2019 15:14:37 -0800
Subject: [PATCH 34/58] Cleanup from master

---
 .../hifiinterface/MainActivity.java           |  1 -
 android/apps/questFramePlayer/build.gradle    |  1 +
 interface/CMakeLists.txt                      |  6 +----
 interface/src/Application.cpp                 |  7 +++---
 .../src/octree/OctreePacketProcessor.cpp      |  1 +
 interface/src/ui/AnimStats.cpp                |  2 +-
 interface/src/ui/Stats.cpp                    |  2 +-
 .../display-plugins/OpenGLDisplayPlugin.cpp   |  3 +--
 libraries/oculusMobile/src/ovr/VrHandler.cpp  | 19 ---------------
 scripts/defaultScripts.js                     | 23 +++++++++----------
 10 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
index 239dc96523..e5ea0f998d 100644
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/MainActivity.java
@@ -1,4 +1,3 @@
-
 package io.highfidelity.hifiinterface;
 
 import android.app.Activity;
diff --git a/android/apps/questFramePlayer/build.gradle b/android/apps/questFramePlayer/build.gradle
index f72b4c126e..0b153af0a9 100644
--- a/android/apps/questFramePlayer/build.gradle
+++ b/android/apps/questFramePlayer/build.gradle
@@ -15,6 +15,7 @@ android {
                     '-DHIFI_ANDROID_APP=questFramePlayer',
                     '-DANDROID_TOOLCHAIN=clang',
                     '-DANDROID_STL=c++_shared',
+
                     '-DCMAKE_VERBOSE_MAKEFILE=ON'
                 targets = ['questFramePlayer']
             }
diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 2cc3302af7..0bfed88d9c 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -202,10 +202,6 @@ if (WIN32)
   set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
 endif()
 
-if (ANDROID)
-    set(PLATFORM_DISPLAY_PLUGINS oculusMobile oculusMobilePlugin)
-endif()
-
 # link required hifi libraries
 link_hifi_libraries(
   shared workload task octree ktx gpu gl procedural graphics graphics-scripting render
@@ -283,7 +279,7 @@ target_link_libraries(
   ${TARGET_NAME}
   Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::Widgets
   Qt5::Qml Qt5::Quick Qt5::Script Qt5::Svg
-  Qt5::WebChannel 
+  Qt5::WebChannel
   ${PLATFORM_QT_LIBRARIES}
 )
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 543a7a5146..9272dbd1b0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2428,7 +2428,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
     AndroidHelper::instance().notifyLoadComplete();
 #endif
-    AndroidHelper::instance().notifyLoadComplete();
     pauseUntilLoginDetermined();
 }
 
@@ -3641,14 +3640,14 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
     }
 
     // Get controller availability
-    #ifdef Q_OS_ANDROID
+#ifdef Q_OS_ANDROID
     bool hasHandControllers = true;
-    #else
+#else
     bool hasHandControllers = false;
     if (PluginUtils::isViveControllerAvailable() || PluginUtils::isOculusTouchControllerAvailable()) {
         hasHandControllers = true;
     }
-    #endif
+#endif
 
     // Check HMD use (may be technically available without being in use)
     bool hasHMD = PluginUtils::isHMDAvailable();
diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index 62ef9cd875..6b07e6717c 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -40,6 +40,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
 
 #ifndef Q_OS_ANDROID
     const int WAY_BEHIND = 300;
+
     if (packetsToProcessCount() > WAY_BEHIND && qApp->getLogger()->extraDebugging()) {
         qDebug("OctreePacketProcessor::processPacket() packets to process=%d", packetsToProcessCount());
     }
diff --git a/interface/src/ui/AnimStats.cpp b/interface/src/ui/AnimStats.cpp
index 162292087d..6317c069f4 100644
--- a/interface/src/ui/AnimStats.cpp
+++ b/interface/src/ui/AnimStats.cpp
@@ -17,7 +17,7 @@ HIFI_QML_DEF(AnimStats)
 static AnimStats* INSTANCE{ nullptr };
 
 AnimStats* AnimStats::getInstance() {
-    //Q_ASSERT(INSTANCE);
+    Q_ASSERT(INSTANCE);
     return INSTANCE;
 }
 
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index 4fc14171e8..cb204c9772 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -46,7 +46,7 @@ static Stats* INSTANCE{ nullptr };
 QString getTextureMemoryPressureModeString();
 #endif
 Stats* Stats::getInstance() {
-    //Q_ASSERT(INSTANCE);
+    Q_ASSERT(INSTANCE);
     return INSTANCE;
 }
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 5b202429ab..e4deaf8f4b 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -256,7 +256,6 @@ bool OpenGLDisplayPlugin::activate() {
         return false;
     }
 
-
     // Start the present thread if necessary
     QSharedPointer<PresentThread> presentThread;
     if (DependencyManager::isSet<PresentThread>()) {
@@ -719,11 +718,11 @@ void OpenGLDisplayPlugin::present() {
             PROFILE_RANGE_EX(render, "internalPresent", 0xff00ffff, frameId)
             internalPresent();
         }
+
         gpu::Backend::freeGPUMemSize.set(gpu::gl::getFreeDedicatedMemory());
     } else {
         internalPresent();
     }
-
     _movingAveragePresent.addSample((float)(usecTimestampNow() - startPresent));
 }
 
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp
index c6329c62a6..de2b4e1ff6 100644
--- a/libraries/oculusMobile/src/ovr/VrHandler.cpp
+++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp
@@ -27,25 +27,6 @@ using namespace ovr;
 
 static thread_local bool isRenderThread { false };
 
-static void getClassName(JNIEnv *env, jobject obj){
-    jclass cls = env->GetObjectClass(obj);
-    jmethodID mid = env->GetMethodID(cls,"getClass", "()Ljava/lang/Class;");
-    jobject clsObj = env->CallObjectMethod(obj, mid);
-
-    cls= env->GetObjectClass(clsObj);
-
-    mid= env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-
-    jstring strObj = (jstring) env->CallObjectMethod(clsObj, mid);
-
-    const char* str = env->GetStringUTFChars(strObj, NULL);
-
-    __android_log_print(ANDROID_LOG_ERROR,__FUNCTION__, "VRHandler class: %s",str);
-
-    env->ReleaseStringUTFChars(strObj, str);
-
-}
-
 struct VrSurface : public TaskQueue {
     using HandlerTask = VrHandler::HandlerTask;
 
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 75c266e6c9..bd7e79dffc 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -14,21 +14,20 @@
 var DEFAULT_SCRIPTS_COMBINED = [
     "system/request-service.js",
     "system/progress.js",
-    // "system/away.js",
-    // "system/audio.js",
+    "system/away.js",
+    "system/audio.js",
     "system/hmd.js",
     "system/menu.js",
     "system/bubble.js",
-    // "system/snapshot.js",
-    //"system/pal.js", // "system/mod.js", // older UX, if you prefer
+    "system/snapshot.js",
+    "system/pal.js", // "system/mod.js", // older UX, if you prefer
     "system/avatarapp.js",
     "system/makeUserConnection.js",
-    "system/goto.js",
-    // "system/tablet-goto.js",
-    // "system/marketplaces/marketplaces.js",
+    "system/tablet-goto.js",
+    "system/marketplaces/marketplaces.js",
     "system/notifications.js",
-    // "system/commerce/wallet.js",
-    // "system/edit.js",
+    "system/commerce/wallet.js",
+    "system/edit.js",
     "system/dialTone.js",
     "system/firstPersonHMD.js",
     "system/tablet-ui/tabletUI.js",
@@ -41,12 +40,12 @@ var DEFAULT_SCRIPTS_SEPARATE = [
 ];
 
 if (Window.interstitialModeEnabled) {
-    //  Insert interstitial scripts at front so that they're started first.
+    // Insert interstitial scripts at front so that they're started first.
     DEFAULT_SCRIPTS_COMBINED.splice(0, 0, "system/interstitialPage.js", "system/redirectOverlays.js");
 }
 
 // add a menu item for debugging
-var MENU_CATEGORY = "Developer";
+var MENU_CATEGORY = "Developer > Scripting";
 var MENU_ITEM = "Debug defaultScripts.js";
 
 var SETTINGS_KEY = '_debugDefaultScriptsIsChecked';
@@ -117,7 +116,7 @@ function removeMenuItem() {
     }
 }
 
-Script.scriptEnding.connect(function () {
+Script.scriptEnding.connect(function() {
     removeMenuItem();
 });
 

From 3103ae6ca7f28a33dabc99482990dc60e50cf4ef Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 12 Feb 2019 16:09:47 -0800
Subject: [PATCH 35/58] reenable ik

---
 libraries/animation/src/AnimInverseKinematics.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index 7af9e81889..be3a769394 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -865,10 +865,6 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
-#ifdef Q_OS_ANDROID
-    // disable IK on android
-    return underPoses;
-#endif
 
     // allows solutionSource to be overridden by an animVar
     auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource);

From 292602afd7c3ecd844ee9ca03f767ff1bd8c3dff Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 14 Feb 2019 12:55:28 -0800
Subject: [PATCH 36/58] Resolving more master differences

---
 android/build.gradle                          | 122 +++++++++++++++++-
 android/settings.gradle                       |  12 +-
 interface/resources/qml/Web3DSurface.qml      |  75 +++--------
 .../resources/qml/hifi/tablet/TabletMenu.qml  |   1 +
 interface/src/ui/Keyboard.cpp                 |   3 +-
 .../animation/src/AnimInverseKinematics.cpp   |   4 +
 .../src/ConsoleScriptingInterface.cpp         |  12 --
 libraries/shaders/src/shaders/Shaders.cpp     |   2 +-
 libraries/ui/src/QmlFragmentClass.cpp         |   3 +-
 9 files changed, 151 insertions(+), 83 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index eebe7bdc27..5a4dbc0033 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,15 +1,29 @@
+import de.undercouch.gradle.tasks.download.Download
+import de.undercouch.gradle.tasks.download.Verify
+import groovy.io.FileType
+import groovy.json.JsonSlurper
+import groovy.xml.XmlUtil
 import org.apache.tools.ant.taskdefs.condition.Os
 
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
 buildscript {
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
+plugins {
+    id 'de.undercouch.download' version '3.3.0'
+    id "cz.malohlava" version "1.0.3"
+    id "io.github.http-builder-ng.http-plugin" version "0.1.1"
+}
+
 allprojects {
     repositories {
         google()
@@ -18,6 +32,10 @@ allprojects {
     }
 }
 
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
 ext {
     RELEASE_NUMBER = project.hasProperty('RELEASE_NUMBER') ? project.getProperty('RELEASE_NUMBER') : '0'
     VERSION_CODE = project.hasProperty('VERSION_CODE') ? project.getProperty('VERSION_CODE') : '0'
@@ -126,6 +144,108 @@ task setupDependencies() {
 task cleanDependencies(type: Delete) {
 }
 
+def runBreakpadDumpSyms = { buildType ->
+    gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS
+
+    def objDir = new File("${appDir}/build/intermediates/cmake/${buildType}/obj/arm64-v8a")
+    def stripDebugSymbol = "${appDir}/build/intermediates/transforms/stripDebugSymbol/${buildType}/0/lib/arm64-v8a/"
+    def outputDir = new File(breakpadDumpSymsDir, buildType)
+    if (!outputDir.exists()) {
+        outputDir.mkdirs()
+    }
+
+    objDir.eachFileRecurse (FileType.FILES) { file ->
+        if (file.name.endsWith('.so')) {
+            def output = file.name + ".sym"
+            def cmdArgs = [
+                    file.toString(),
+                    stripDebugSymbol
+            ]
+            def result = exec {
+                workingDir HIFI_ANDROID_PRECOMPILED + '/breakpad/bin'
+                commandLine './dump_syms'
+                args cmdArgs
+                ignoreExitValue true
+                standardOutput = new BufferedOutputStream(new FileOutputStream(new File(outputDir, output)))
+            }
+        }
+    }
+}
+
+task runBreakpadDumpSymsDebug() {
+    doLast {
+        runBreakpadDumpSyms("debug");
+    }
+}
+
+task runBreakpadDumpSymsRelease() {
+    doLast {
+        runBreakpadDumpSyms("release");
+    }
+}
+
+task zipDumpSymsDebug(type: Zip, dependsOn: runBreakpadDumpSymsDebug) {
+    from (new File(breakpadDumpSymsDir, "debug").absolutePath)
+    archiveName "symbols-${RELEASE_NUMBER}-debug.zip"
+    destinationDir(new File("${appDir}/build/tmp/"))
+}
+
+task zipDumpSymsRelease(type: Zip, dependsOn: runBreakpadDumpSymsRelease) {
+    from (new File(breakpadDumpSymsDir, "release").absolutePath)
+    archiveName "symbols-${RELEASE_NUMBER}-release.zip"
+    destinationDir(new File("${appDir}/build/tmp/"))
+}
+
+task uploadBreakpadDumpSymsDebug(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsDebug) {
+    onlyIf {
+        System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
+    }
+    config {
+        request.uri = System.getenv("CMAKE_BACKTRACE_URL")
+    }
+    post {
+        request.uri.path = '/post'
+        request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
+        request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-debug.zip").bytes
+        request.contentType = 'application/octet-stream'
+        response.success {
+            println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-debug.zip uploaded")
+        }
+    }
+}
+
+task uploadBreakpadDumpSymsRelease(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsRelease) {
+    onlyIf {
+        System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
+    }
+    config {
+        request.uri = System.getenv("CMAKE_BACKTRACE_URL")
+    }
+    post {
+        request.uri.path = '/post'
+        request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
+        request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-release.zip").bytes
+        request.contentType = 'application/octet-stream'
+        response.success {
+            println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-release.zip uploaded")
+        }
+    }
+}
+
+task renameHifiACTaskDebug() {
+    doLast {
+        def sourceFile = new File("${appDir}/build/intermediates/cmake/debug/obj/arm64-v8a/","libhifiCodec.so")
+        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
+        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
+    }
+}
+task renameHifiACTaskRelease(type: Copy) {
+    doLast {
+        def sourceFile = new File("${appDir}/build/intermediates/cmake/release/obj/arm64-v8a/","libhifiCodec.so")
+        def destinationFile = new File("${appDir}/src/main/jniLibs/arm64-v8a", "libplugins_libhifiCodec.so")
+        copy { from sourceFile;  into destinationFile.parent;  rename(sourceFile.name, destinationFile.name) }
+    }
+}
 
 // FIXME this code is prototyping the desired functionality for doing build time binary dependency resolution.
 // See the comment on the qtBundle task above
diff --git a/android/settings.gradle b/android/settings.gradle
index 23e54b0457..64eb246719 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -12,8 +12,8 @@ project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
 // Applications
 //
 
-//include ':interface'
-//project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+include ':interface'
+project(':interface').projectDir = new File(settingsDir, 'apps/interface')
 
 include ':questInterface'
 project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
@@ -22,8 +22,8 @@ project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterfa
 // Test projects
 //
 
-//include ':framePlayer'
-//project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+include ':framePlayer'
+project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
 
-//include ':questFramePlayer'
-//project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
+include ':questFramePlayer'
+project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
diff --git a/interface/resources/qml/Web3DSurface.qml b/interface/resources/qml/Web3DSurface.qml
index 4281755447..fdd5d8a7c6 100644
--- a/interface/resources/qml/Web3DSurface.qml
+++ b/interface/resources/qml/Web3DSurface.qml
@@ -1,7 +1,7 @@
 //
 //  Web3DOverlay.qml
 //
-//  Created by Gabriel Calero & Cristian Duarte on Jun 22, 2018
+//  Created by David Rowe on 16 Dec 2016.
 //  Copyright 2016 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
@@ -9,68 +9,23 @@
 //
 
 import QtQuick 2.5
-import QtGraphicalEffects 1.0
 
-Item {
+import "controls" as Controls
 
-    property string url
-    RadialGradient {
-        anchors.fill: parent
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "#262626" }
-            GradientStop { position: 1.0; color: "#000000" }
+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));
         }
     }
 
-    function shortUrl(url) {
-        var hostBegin = url.indexOf("://");
-        if (hostBegin > -1) {
-            url = url.substring(hostBegin + 3);
-        }
-
-        var portBegin = url.indexOf(":");
-        if (portBegin > -1) {
-            url = url.substring(0, portBegin);
-        }
-
-        var pathBegin = url.indexOf("/");
-        if (pathBegin > -1) {
-            url = url.substring(0, pathBegin);
-        }
-
-        if (url.length > 45) {
-            url = url.substring(0, 45);
-        }
-
-        return url;
+    Component.onCompleted: {
+        eventBridge.webEventReceived.connect(onWebEventReceived);
     }
-
-    Text { 
-        id: urlText
-        text: shortUrl(url)
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
-        anchors.fill: parent
-        anchors.rightMargin: 10
-        anchors.leftMargin: 10
-        font.family: "Cairo"
-        font.weight: Font.DemiBold
-        font.pointSize: 48
-        fontSizeMode: Text.Fit
-        color: "#FFFFFF"
-        minimumPixelSize: 5
-    }
-
-    Image {
-        id: hand
-        source: "../../icons/hand.svg"
-        width: 300
-        height: 300
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.bottomMargin: 100
-        anchors.rightMargin: 100
-    }
-
-
-}
\ No newline at end of file
+}
diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index 7170fcdf5f..5f06e4fbab 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -3,6 +3,7 @@ import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.4
 import QtQml 2.2
 
+
 import "."
 import stylesUit 1.0
 import "../../controls"
diff --git a/interface/src/ui/Keyboard.cpp b/interface/src/ui/Keyboard.cpp
index 9dd233b85b..9e9a319802 100644
--- a/interface/src/ui/Keyboard.cpp
+++ b/interface/src/ui/Keyboard.cpp
@@ -734,7 +734,6 @@ void Keyboard::setLayerIndex(int layerIndex) {
 }
 
 void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
-    return;
     if (keyboardFile.isEmpty()) {
         return;
     }
@@ -782,7 +781,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
             { "isSolid", true },
             { "visible", false },
             { "grabbable", true },
-            { "ignoreRayIntersection", false },
+            { "ignorePickIntersection", false },
             { "dimensions", anchorObject["dimensions"].toVariant() },
             { "position", anchorObject["position"].toVariant() },
             { "orientation", anchorObject["rotation"].toVariant() }
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index be3a769394..7af9e81889 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -865,6 +865,10 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
+#ifdef Q_OS_ANDROID
+    // disable IK on android
+    return underPoses;
+#endif
 
     // allows solutionSource to be overridden by an animVar
     auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource);
diff --git a/libraries/script-engine/src/ConsoleScriptingInterface.cpp b/libraries/script-engine/src/ConsoleScriptingInterface.cpp
index e95053b964..60de04aa9e 100644
--- a/libraries/script-engine/src/ConsoleScriptingInterface.cpp
+++ b/libraries/script-engine/src/ConsoleScriptingInterface.cpp
@@ -30,7 +30,6 @@ QList<QString> ConsoleScriptingInterface::_groupDetails = QList<QString>();
 QScriptValue ConsoleScriptingInterface::info(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptInfoMessage(appendArguments(context));
-        qDebug()<<"SCRIPTING INFO: %s"<<appendArguments(context);
     }
     return QScriptValue::NullValue;
 }
@@ -40,7 +39,6 @@ QScriptValue ConsoleScriptingInterface::log(QScriptContext* context, QScriptEngi
     if (_groupDetails.count() == 0) {
         if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
             scriptEngine->scriptPrintedMessage(message);
-            qDebug()<<"SCRIPTING LOG: %s"<<message;
         }
     } else {
         logGroupMessage(message, engine);
@@ -51,8 +49,6 @@ QScriptValue ConsoleScriptingInterface::log(QScriptContext* context, QScriptEngi
 QScriptValue ConsoleScriptingInterface::debug(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptPrintedMessage(appendArguments(context));
-        qDebug()<<"SCRIPTING DEBUG: %s"<<appendArguments(context);
-
     }
     return QScriptValue::NullValue;
 }
@@ -60,8 +56,6 @@ QScriptValue ConsoleScriptingInterface::debug(QScriptContext* context, QScriptEn
 QScriptValue ConsoleScriptingInterface::warn(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptWarningMessage(appendArguments(context));
-        qDebug()<<"SCRIPTING WARN: %s"<<appendArguments(context);
-
     }
     return QScriptValue::NullValue;
 }
@@ -69,8 +63,6 @@ QScriptValue ConsoleScriptingInterface::warn(QScriptContext* context, QScriptEng
 QScriptValue ConsoleScriptingInterface::error(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptErrorMessage(appendArguments(context));
-        qDebug()<<"SCRIPTING ERROR: %s"<<appendArguments(context);
-
     }
     return QScriptValue::NullValue;
 }
@@ -78,8 +70,6 @@ QScriptValue ConsoleScriptingInterface::error(QScriptContext* context, QScriptEn
 QScriptValue ConsoleScriptingInterface::exception(QScriptContext* context, QScriptEngine* engine) {
     if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
         scriptEngine->scriptErrorMessage(appendArguments(context));
-        qDebug()<<"SCRIPTING EXCEPTION: %s"<<appendArguments(context);
-
     }
     return QScriptValue::NullValue;
 }
@@ -135,8 +125,6 @@ QScriptValue ConsoleScriptingInterface::assertion(QScriptContext* context, QScri
         }
         if (ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine)) {
             scriptEngine->scriptErrorMessage(assertionResult);
-            qDebug()<<"SCRIPTING ASSERT: %s"<<assertionResult;
-
         }
     }
     return QScriptValue::NullValue;
diff --git a/libraries/shaders/src/shaders/Shaders.cpp b/libraries/shaders/src/shaders/Shaders.cpp
index dc1ac46d7d..a074c2f0c9 100644
--- a/libraries/shaders/src/shaders/Shaders.cpp
+++ b/libraries/shaders/src/shaders/Shaders.cpp
@@ -35,7 +35,7 @@ namespace shader {
 static const Dialect DEFAULT_DIALECT = Dialect::glsl310es;
 
 const std::vector<Dialect>& allDialects() {
-    static const std::vector<Dialect> ALL_DIALECTS{ Dialect::glsl310es };
+    static const std::vector<Dialect> ALL_DIALECTS{ { Dialect::glsl310es } };
     return ALL_DIALECTS;
 }
     
diff --git a/libraries/ui/src/QmlFragmentClass.cpp b/libraries/ui/src/QmlFragmentClass.cpp
index af386bfdd5..fbd045fdb1 100644
--- a/libraries/ui/src/QmlFragmentClass.cpp
+++ b/libraries/ui/src/QmlFragmentClass.cpp
@@ -53,8 +53,9 @@ QScriptValue QmlFragmentClass::internal_constructor(QScriptContext* context, QSc
     QScriptValue scriptObject = engine->newQObject(retVal);
     _fragments[qml.toString()] = scriptObject;
     return scriptObject;
-#endif
+#else
     return QScriptValue();
+#endif
 }
 
 void QmlFragmentClass::close() {

From 8d522d9ce71a79312e07ea1f4c9d944936ceaa60 Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Thu, 14 Feb 2019 14:48:56 -0800
Subject: [PATCH 37/58] fixed issues with pause/resume and start/stop. still
 issues with input after resume

---
 android/apps/questInterface/build.gradle      |  2 +
 .../questInterface/src/main/cpp/native.cpp    |  5 +--
 android/libraries/oculus/build.gradle         |  2 +
 .../oculus/OculusMobileActivity.java          | 41 +++++++++----------
 .../qt5/android/bindings/QtActivity.java      |  9 +++-
 .../animation/src/AnimInverseKinematics.cpp   |  5 ---
 libraries/oculusMobile/src/ovr/VrHandler.cpp  | 10 +++--
 libraries/render-utils/src/Model.cpp          |  2 +-
 libraries/shared/src/ShapeInfo.cpp            |  5 ++-
 9 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/android/apps/questInterface/build.gradle b/android/apps/questInterface/build.gradle
index cbf575d7b0..b1800fe33a 100644
--- a/android/apps/questInterface/build.gradle
+++ b/android/apps/questInterface/build.gradle
@@ -92,7 +92,9 @@ android {
             variant.mergeResources.dependsOn(task)
             if (Os.isFamily(Os.FAMILY_UNIX)) {
                 // FIXME
+
                 def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
+
                 def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first()
                 def renameHifiACTask = rootProject.getTasksByName("renameHifiACTask${variant.name.capitalize()}", false).first()
                 runDumpSymsTask.dependsOn(task)
diff --git a/android/apps/questInterface/src/main/cpp/native.cpp b/android/apps/questInterface/src/main/cpp/native.cpp
index f27bff8228..3c1563c93d 100644
--- a/android/apps/questInterface/src/main/cpp/native.cpp
+++ b/android/apps/questInterface/src/main/cpp/native.cpp
@@ -62,6 +62,7 @@ extern "C" {
         initOculusPlatform(env, obj);
     }
 QAndroidJniObject __interfaceActivity;
+
     JNIEXPORT void JNICALL
     Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnCreate(JNIEnv *env, jobject obj) {
         __android_log_print(ANDROID_LOG_INFO, "QQQ", __FUNCTION__);
@@ -85,10 +86,6 @@ JNIEXPORT void Java_io_highfidelity_oculus_OculusMobileActivity_questOnAppAfterL
     AndroidHelper::instance().moveToThread(qApp->thread());
 }
 
-    JNIEXPORT void JNICALL
-    Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnDestroy(JNIEnv *env, jobject obj) {
-    }
-
     JNIEXPORT void JNICALL
     Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnPause(JNIEnv *env, jobject obj) {
         AndroidHelper::instance().notifyEnterBackground();
diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle
index 776c0c1e48..bc8f8d1c45 100644
--- a/android/libraries/oculus/build.gradle
+++ b/android/libraries/oculus/build.gradle
@@ -18,4 +18,6 @@ android {
 
 dependencies {
     compile project(path: ':qt')
+        implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
+        implementation project(':qt')
 }
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index 637600b34b..48d16072d7 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -20,6 +20,7 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 
 
+import org.qtproject.qt5.android.QtNative;
 import org.qtproject.qt5.android.bindings.QtActivity;
 
 import io.highfidelity.utils.HifiUtils;
@@ -35,11 +36,9 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
     private native void nativeOnCreate();
     private native static void nativeOnResume();
     private native static void nativeOnPause();
-    private native static void nativeOnDestroy();
     private native static void nativeOnSurfaceChanged(Surface s);
 
     private native void questNativeOnCreate();
-    private native void questNativeOnDestroy();
     private native void questNativeOnPause();
     private native void questNativeOnResume();
     private native void questOnAppAfterLoad();
@@ -48,10 +47,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
     private SurfaceView mView;
     private SurfaceHolder mSurfaceHolder;
 
-    boolean isLoading =false;
-
     public void onCreate(Bundle savedInstanceState) {
-        isLoading=true;
         super.onCreate(savedInstanceState);
         HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
 
@@ -65,14 +61,10 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         nativeOnCreate();
         questNativeOnCreate();
     }
-
     public void onAppLoadedComplete() {
         Log.w(TAG, "QQQ Load Completed");
-        isLoading=false;
-
-        //isLoading=false;
         runOnUiThread(() -> {
-            setContentView(mView);  setContentView(mView);
+            setContentView(mView);
             questOnAppAfterLoad();
         });
     }
@@ -80,23 +72,22 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
     @Override
     protected void onDestroy() {
         Log.w(TAG, "QQQ onDestroy");
-        super.onDestroy();
 
-        if (mSurfaceHolder != null) {
-            nativeOnSurfaceChanged(null);
-        }
-        nativeOnDestroy();
-        questNativeOnDestroy();
+        nativeOnSurfaceChanged(null);
+
+        Log.w(TAG, "QQQ onDestroy -- SUPER onDestroy");
+        super.onDestroy();
     }
 
     @Override
     protected void onResume() {
         Log.w(TAG, "QQQ onResume");
         super.onResume();
+        //Reconnect the global reference back to handler
+        nativeOnCreate();
 
         questNativeOnResume();
         nativeOnResume();
-
     }
 
     @Override
@@ -104,16 +95,21 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         Log.w(TAG, "QQQ onPause");
         super.onPause();
 
-        if (!isLoading) {
-            questNativeOnPause();
-            nativeOnPause();
-        }
+        questNativeOnPause();
+        nativeOnPause();
+    }
+
+    @Override
+    protected void onStop(){
+        super.onStop();
+        Log.w(TAG, "QQQ Onstop called");
     }
 
     @Override
     protected void onRestart(){
         super.onRestart();
-        nativeOnCreate();
+        Log.w(TAG, "QQQ onRestart called ****");
+        questOnAppAfterLoad();
     }
 
     @Override
@@ -135,5 +131,6 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
         Log.w(TAG, "QQQ surfaceDestroyed ***************************************************");
         nativeOnSurfaceChanged(null);
         mSurfaceHolder = null;
+
     }
 }
\ No newline at end of file
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 02597956e4..11e8ca8e08 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -364,7 +364,10 @@ public class QtActivity extends Activity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        QtApplication.invokeDelegate();
+
+        QtNative.terminateQt();
+        QtNative.setActivity(null,null);
+        System.exit(0);
     }
     //---------------------------------------------------------------------------
 
@@ -506,7 +509,9 @@ public class QtActivity extends Activity {
         super.onPause();
         // GC: this trick allow us to show a splash activity until Qt app finishes
         // loading
-        QtApplication.invokeDelegate();
+
+
+//        QtApplication.invokeDelegate();
     }
     //---------------------------------------------------------------------------
 
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index a1809f3438..9a55b66a39 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -865,11 +865,6 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
-#ifdef Q_OS_ANDROID
-    // disable IK on android
-    return underPoses;
-#endif
-
     // allows solutionSource to be overridden by an animVar
     auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource);
 
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp
index c6329c62a6..99338f94d4 100644
--- a/libraries/oculusMobile/src/ovr/VrHandler.cpp
+++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp
@@ -70,6 +70,12 @@ struct VrSurface : public TaskQueue {
     }
 
     void setResumed(bool newResumed) {
+
+        if(oculusActivity)
+            __android_log_write(ANDROID_LOG_WARN, "QQQ", "Set Resumed VRHANDLER ::: OCULUS ACTIVITY IN NOT NULL");
+        else
+            __android_log_write(ANDROID_LOG_WARN, "QQQ", "Set Resumed VRHANDLER ::: OCULUS ACTIVITY is null");
+
         this->resumed = newResumed;
         submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
     }
@@ -334,10 +340,6 @@ JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOn
     SURFACE.onCreate(env, obj);
 }
 
-JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnDestroy(JNIEnv*, jclass) {
-    __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
-}
-
 JNIEXPORT void JNICALL Java_io_highfidelity_oculus_OculusMobileActivity_nativeOnResume(JNIEnv*, jclass) {
     __android_log_write(ANDROID_LOG_WARN, "QQQ_JNI", __FUNCTION__);
     SURFACE.setResumed(true);
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index da8dceb176..63e6df1a61 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -137,7 +137,7 @@ const float SCALE_CHANGE_EPSILON = 0.0000001f;
 void Model::setScaleInternal(const glm::vec3& scale) {
     if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
         _scale = scale;
-        assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f);
+       // assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f);
         simulate(0.0f, true);
     }
 }
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index 564d79bfda..745004ab9c 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -152,7 +152,10 @@ void ShapeInfo::setSphere(float radius) {
 void ShapeInfo::setMultiSphere(const std::vector<glm::vec3>& centers, const std::vector<float>& radiuses) {
     _url = "";
     _type = SHAPE_TYPE_MULTISPHERE;
-    assert(centers.size() == radiuses.size() && centers.size() > 0);
+    if(centers.size() == radiuses.size())
+        return;
+
+  //  assert(centers.size() == radiuses.size() && centers.size() > 0);
     for (size_t i = 0; i < centers.size(); i++) {
         SphereData sphere = SphereData(centers[i], radiuses[i]);
         _sphereCollection.push_back(sphere);

From 72200618d90f2e8c04f248bcf98999bf5c56f73c Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Thu, 14 Feb 2019 16:38:15 -0800
Subject: [PATCH 38/58] cleanup of my debugging items

---
 android/apps/questInterface/build.gradle                    | 2 --
 android/libraries/oculus/build.gradle                       | 2 --
 .../java/org/qtproject/qt5/android/bindings/QtActivity.java | 2 --
 libraries/oculusMobile/src/ovr/VrHandler.cpp                | 6 ------
 libraries/render-utils/src/Model.cpp                        | 2 +-
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/android/apps/questInterface/build.gradle b/android/apps/questInterface/build.gradle
index b1800fe33a..cbf575d7b0 100644
--- a/android/apps/questInterface/build.gradle
+++ b/android/apps/questInterface/build.gradle
@@ -92,9 +92,7 @@ android {
             variant.mergeResources.dependsOn(task)
             if (Os.isFamily(Os.FAMILY_UNIX)) {
                 // FIXME
-
                 def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
-
                 def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first()
                 def renameHifiACTask = rootProject.getTasksByName("renameHifiACTask${variant.name.capitalize()}", false).first()
                 runDumpSymsTask.dependsOn(task)
diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle
index bc8f8d1c45..776c0c1e48 100644
--- a/android/libraries/oculus/build.gradle
+++ b/android/libraries/oculus/build.gradle
@@ -18,6 +18,4 @@ android {
 
 dependencies {
     compile project(path: ':qt')
-        implementation fileTree(include: ['*.jar'], dir: '../../libraries/qt/libs')
-        implementation project(':qt')
 }
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 11e8ca8e08..a5bc9f31f8 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -509,8 +509,6 @@ public class QtActivity extends Activity {
         super.onPause();
         // GC: this trick allow us to show a splash activity until Qt app finishes
         // loading
-
-
 //        QtApplication.invokeDelegate();
     }
     //---------------------------------------------------------------------------
diff --git a/libraries/oculusMobile/src/ovr/VrHandler.cpp b/libraries/oculusMobile/src/ovr/VrHandler.cpp
index f12b69d894..b3b1416785 100644
--- a/libraries/oculusMobile/src/ovr/VrHandler.cpp
+++ b/libraries/oculusMobile/src/ovr/VrHandler.cpp
@@ -51,12 +51,6 @@ struct VrSurface : public TaskQueue {
     }
 
     void setResumed(bool newResumed) {
-
-        if(oculusActivity)
-            __android_log_write(ANDROID_LOG_WARN, "QQQ", "Set Resumed VRHANDLER ::: OCULUS ACTIVITY IN NOT NULL");
-        else
-            __android_log_write(ANDROID_LOG_WARN, "QQQ", "Set Resumed VRHANDLER ::: OCULUS ACTIVITY is null");
-
         this->resumed = newResumed;
         submitRenderThreadTask([this](VrHandler* handler){ updateVrMode(); });
     }
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 1d7e3fb234..260e25009e 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -137,7 +137,7 @@ const float SCALE_CHANGE_EPSILON = 0.0000001f;
 void Model::setScaleInternal(const glm::vec3& scale) {
     if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) {
         _scale = scale;
-       // assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f);
+        assert(_scale.x != 0.0f && scale.y != 0.0f && scale.z != 0.0f);
         simulate(0.0f, true);
     }
 }

From 165ec3feca1908ad2fe61ca013141fed41539171 Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Thu, 14 Feb 2019 16:41:28 -0800
Subject: [PATCH 39/58] removing unused reference no longer reachable

---
 .../main/java/io/highfidelity/oculus/OculusMobileActivity.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index 48d16072d7..eda656ed30 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -19,10 +19,7 @@ import android.view.SurfaceView;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 
-
-import org.qtproject.qt5.android.QtNative;
 import org.qtproject.qt5.android.bindings.QtActivity;
-
 import io.highfidelity.utils.HifiUtils;
 
 /**

From 272b941b17a1a588644e80f9e7478b06ec5e1e84 Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Thu, 14 Feb 2019 17:14:28 -0800
Subject: [PATCH 40/58] removed an obselete variable

---
 .../java/io/highfidelity/frameplayer/QuestQtActivity.java   | 1 -
 .../java/io/highfidelity/oculus/OculusMobileActivity.java   | 6 ------
 .../java/org/qtproject/qt5/android/bindings/QtActivity.java | 4 +++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
index d498e27547..6fed737266 100644
--- a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
+++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
@@ -36,7 +36,6 @@ public class QuestQtActivity extends QtActivity {
     public void launchOculusActivity() {
         Log.w("QQQ_Qt", "QuestQtActivity::launchOculusActivity");
         runOnUiThread(()->{
-            keepInterfaceRunning = true;
             launchedQuestMode = true;
             moveTaskToBack(true);
             startActivity(new Intent(this, QuestRenderActivity.class));
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index eda656ed30..cc71ba53a8 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -7,17 +7,11 @@
 //
 package io.highfidelity.oculus;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
 
 import org.qtproject.qt5.android.bindings.QtActivity;
 import io.highfidelity.utils.HifiUtils;
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index a5bc9f31f8..46f2af46e7 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -509,7 +509,9 @@ public class QtActivity extends Activity {
         super.onPause();
         // GC: this trick allow us to show a splash activity until Qt app finishes
         // loading
-//        QtApplication.invokeDelegate();
+        //QtApplication.invokeDelegate();
+
+        //TODO(Amer): looking into why this messes up pause.
     }
     //---------------------------------------------------------------------------
 

From 4409e5968269d297b0717049e85617f2a437a82b Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:11:26 -0800
Subject: [PATCH 41/58] Add per-android-app preprocessor macros

---
 CMakeLists.txt                |  9 ++++++++-
 interface/src/Application.cpp | 16 ++++++++--------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8710eed05..faf88c5126 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,6 +100,13 @@ if (ANDROID)
     add_definitions(-DCUSTOM_DISPLAY_PLUGINS) 
     set(PLATFORM_PLUGIN_LIBRARIES oculusMobile oculusMobilePlugin)
   endif()
+
+  # Allow client code to use preprocessor macros to distinguish between quest and non-quest builds
+  if (${HIFI_ANDROID_APP} STREQUAL "questInterface")
+    add_definitions(-DANDROID_APP_QUEST_INTERFACE) 
+  elseif(${HIFI_ANDROID_APP} STREQUAL "interface")
+    add_definitions(-DANDROID_APP_INTERFACE) 
+  endif()
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine Xml)
 endif ()
@@ -128,7 +135,7 @@ set(PLATFORM_QT_GL OpenGL)
 
 if (USE_GLES)
   add_definitions(-DUSE_GLES)
-  add_definitions(-DGPU_POINTER_STORAGE_SHARED)
+  add_definitions(-DGPU_POINTER_STORAGE_sRED)
   set(PLATFORM_GL_BACKEND gpu-gl-common gpu-gles)
 else()
   add_definitions(-DGPU_POINTER_STORAGE_RAW)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 82a8347c32..c784be2539 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3106,12 +3106,12 @@ void Application::initializeUi() {
         }
         if (TouchscreenVirtualPadDevice::NAME == inputPlugin->getName()) {
             _touchscreenVirtualPadDevice = std::dynamic_pointer_cast<TouchscreenVirtualPadDevice>(inputPlugin);
-#if defined(Q_OS_ANDROID)
- //          auto& virtualPadManager = VirtualPad::Manager::instance();
- //          connect(&virtualPadManager, &VirtualPad::Manager::hapticFeedbackRequested,
- //                  this, [](int duration) {
- //                      AndroidHelper::instance().performHapticFeedback(duration);
- //                  });
+#if defined(ANDROID_APP_INTERFACE)
+            auto& virtualPadManager = VirtualPad::Manager::instance();
+            connect(&virtualPadManager, &VirtualPad::Manager::hapticFeedbackRequested,
+                    this, [](int duration) {
+                        AndroidHelper::instance().performHapticFeedback(duration);
+                    });
 #endif
         }
     }
@@ -3638,7 +3638,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
     }
 
     // Get controller availability
-#ifdef Q_OS_ANDROID
+#ifdef ANDROID_APP_QUEST_INTERFACE
     bool hasHandControllers = true;
 #else
     bool hasHandControllers = false;
@@ -8260,7 +8260,7 @@ void Application::loadDomainConnectionDialog() {
 }
 
 void Application::toggleLogDialog() {
-#ifndef Q_OS_ANDROID
+#ifndef ANDROID_APP_QUEST_INTERFACE
     if (getLoginDialogPoppedUp()) {
         return;
     }

From 78be935e1a4058a61cfad751867af9f0b295ad52 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:12:37 -0800
Subject: [PATCH 42/58] Consolidating differences from master

---
 .../interface/InterfaceActivity.java          | 40 +++++++++++++++++++
 .../animation/src/AnimInverseKinematics.cpp   |  5 +++
 2 files changed, 45 insertions(+)
 create mode 100644 interface/src/java/io/highfidelity/interface/InterfaceActivity.java

diff --git a/interface/src/java/io/highfidelity/interface/InterfaceActivity.java b/interface/src/java/io/highfidelity/interface/InterfaceActivity.java
new file mode 100644
index 0000000000..ae10c320f8
--- /dev/null
+++ b/interface/src/java/io/highfidelity/interface/InterfaceActivity.java
@@ -0,0 +1,40 @@
+//
+//  InterfaceActivity.java
+//  gvr-interface/java
+//
+//  Created by Stephen Birarda on 1/26/15.
+//  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
+//
+
+package io.highfidelity.gvrinterface;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.WindowManager;
+import org.qtproject.qt5.android.bindings.QtActivity;
+
+public class InterfaceActivity extends QtActivity {
+    
+    public static native void handleHifiURL(String hifiURLString);
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        
+        // Get the intent that started this activity in case we have a hifi:// URL to parse
+        Intent intent = getIntent();
+        if (intent.getAction() == Intent.ACTION_VIEW) {
+            Uri data = intent.getData();
+        
+            if (data.getScheme().equals("hifi")) {
+                handleHifiURL(data.toString());
+            }
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/libraries/animation/src/AnimInverseKinematics.cpp b/libraries/animation/src/AnimInverseKinematics.cpp
index 9a55b66a39..a1809f3438 100644
--- a/libraries/animation/src/AnimInverseKinematics.cpp
+++ b/libraries/animation/src/AnimInverseKinematics.cpp
@@ -865,6 +865,11 @@ const AnimPoseVec& AnimInverseKinematics::evaluate(const AnimVariantMap& animVar
 
 //virtual
 const AnimPoseVec& AnimInverseKinematics::overlay(const AnimVariantMap& animVars, const AnimContext& context, float dt, AnimVariantMap& triggersOut, const AnimPoseVec& underPoses) {
+#ifdef Q_OS_ANDROID
+    // disable IK on android
+    return underPoses;
+#endif
+
     // allows solutionSource to be overridden by an animVar
     auto solutionSource = animVars.lookup(_solutionSourceVar, (int)_solutionSource);
 

From 5030bbd2cf69e40dfb107d48bc1ed01de8ac2a65 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:12:52 -0800
Subject: [PATCH 43/58] Update Oculus platform SDK

---
 hifi_android.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hifi_android.py b/hifi_android.py
index 2e6a42d127..b8a606a82f 100644
--- a/hifi_android.py
+++ b/hifi_android.py
@@ -53,9 +53,9 @@ ANDROID_PACKAGES = {
         'includeLibs': ['libvrapi.so']
     },
     'oculusPlatform': {
-        'file': 'OVRPlatformSDK_v1.32.0.zip',
-        'versionId': 'jG9DB16zOGxSrmtZy4jcQnwO0TJUuaeL',
-        'checksum': 'ab5b203b3a39a56ab148d68fff769e05',
+        'file': 'OVRPlatformSDK_v1.34.0.zip',
+        'versionId': 'vbRUkkyzUAXfTGSEtuiUr_7.Fm5h5BZk',
+        'checksum': '16e4c5f39520f122bc49cb6d5bb88289',
         'sharedLibFolder': 'Android/libs/arm64-v8a',
         'includeLibs': ['libovrplatformloader.so']
     },

From 578bc4fc89c4fe7016e26770cd533aaee44bd410 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:15:24 -0800
Subject: [PATCH 44/58] Suppress logspam with missing Controller in QML

---
 interface/resources/qml/desktop/Desktop.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/desktop/Desktop.qml b/interface/resources/qml/desktop/Desktop.qml
index 7d71ecf1d9..9a9252112c 100644
--- a/interface/resources/qml/desktop/Desktop.qml
+++ b/interface/resources/qml/desktop/Desktop.qml
@@ -462,9 +462,11 @@ FocusScope {
             return;
         }
 */
+
         var oldRecommendedRect = recommendedRect;
         var oldRecommendedDimmensions = { x: oldRecommendedRect.width, y: oldRecommendedRect.height };
         var newRecommendedRect = { width: 1280, height: 720, x: 0, y: 0 };
+		if (typeof Controller !== "undefined") newRecommendedRect = Controller.getRecommendedHUDRect();
         var newRecommendedDimmensions = { x: newRecommendedRect.width, y: newRecommendedRect.height };
         repositionWindow(targetWindow, false, oldRecommendedRect, oldRecommendedDimmensions, newRecommendedRect, newRecommendedDimmensions);
     }
@@ -481,7 +483,8 @@ FocusScope {
             return;
         }
 
-        var recommended = { width: 1280, height: 720, x: 0, y: 0 }; //Controller.getRecommendedHUDRect();
+        var recommended = { width: 1280, height: 720, x: 0, y: 0 };
+   	    if (typeof Controller !== "undefined") recommended = Controller.getRecommendedHUDRect();
         var maxX = recommended.x + recommended.width;
         var maxY = recommended.y + recommended.height;
         var newPosition = Qt.vector2d(targetWindow.x, targetWindow.y);

From 51884155eef1517f69b804a42a879c433777b0a1 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:16:58 -0800
Subject: [PATCH 45/58] Support Android app-specific extensions in shaders

---
 cmake/macros/AutoScribeShader.cmake          | 11 ++++++
 libraries/shaders/headers/310es/header.glsl  |  5 +--
 libraries/shaders/headers/310es/version.glsl |  3 ++
 libraries/shaders/headers/410/header.glsl    |  2 -
 libraries/shaders/headers/410/version.glsl   |  2 +
 libraries/shaders/headers/450/header.glsl    |  2 -
 libraries/shaders/headers/450/version.glsl   |  2 +
 tools/shadergen.py                           | 39 +++++++++++++++++---
 8 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 libraries/shaders/headers/310es/version.glsl
 create mode 100644 libraries/shaders/headers/410/version.glsl
 create mode 100644 libraries/shaders/headers/450/version.glsl

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index 64fbcc4ea6..b56b3f8eea 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -270,6 +270,16 @@ macro(AUTOSCRIBE_SHADER_LIBS)
     set(AUTOSCRIBE_SHADERGEN_COMMANDS_FILE ${CMAKE_CURRENT_BINARY_DIR}/shadergen.txt)
     file(WRITE ${AUTOSCRIBE_SHADERGEN_COMMANDS_FILE} "${AUTOSCRIBE_SHADERGEN_COMMANDS}")
 
+    if (HIFI_ANDROID)
+        if (
+            (${HIFI_ANDROID_APP} STREQUAL "questInterface") OR 
+            (${HIFI_ANDROID_APP} STREQUAL "questFramePlayer") OR
+            (${HIFI_ANDROID_APP} STREQUAL "framePlayer") 
+        )
+            set(EXTRA_SHADERGEN_ARGS "--extensions EXT_clip_cull_distance")
+        endif()
+    endif()
+
     # A custom python script which will generate all our shader artifacts
     add_custom_command(
         OUTPUT ${SCRIBED_SHADERS} ${SPIRV_SHADERS} ${REFLECTED_SHADERS}
@@ -279,6 +289,7 @@ macro(AUTOSCRIBE_SHADER_LIBS)
             --tools-dir ${VCPKG_TOOLS_DIR}
             --build-dir ${CMAKE_CURRENT_BINARY_DIR}
             --source-dir ${CMAKE_SOURCE_DIR}
+            ${EXTRA_SHADERGEN_ARGS}
         DEPENDS ${AUTOSCRIBE_SHADER_HEADERS} ${CMAKE_SOURCE_DIR}/tools/shadergen.py ${ALL_SCRIBE_SHADERS})
 
     add_custom_target(shadergen DEPENDS ${SCRIBED_SHADERS} ${SPIRV_SHADERS} ${REFLECTED_SHADERS})
diff --git a/libraries/shaders/headers/310es/header.glsl b/libraries/shaders/headers/310es/header.glsl
index f98aed7659..a21b2ec5d6 100644
--- a/libraries/shaders/headers/310es/header.glsl
+++ b/libraries/shaders/headers/310es/header.glsl
@@ -1,6 +1,3 @@
-#version 310 es
-#define GPU_GLES
-#define GPU_GLES_310
 #define BITFIELD highp int
 #define LAYOUT(X) layout(X)
 #define LAYOUT_STD140(X) layout(std140, X)
@@ -9,7 +6,7 @@
     #define gl_VertexID  gl_VertexIndex
 #endif
 #extension GL_EXT_texture_buffer : enable
-#ifndef VULKAN
+#if defined(HAVE_EXT_clip_cull_distance) && !defined(VULKAN)
 #extension GL_EXT_clip_cull_distance : enable
 #endif
 precision highp float;
diff --git a/libraries/shaders/headers/310es/version.glsl b/libraries/shaders/headers/310es/version.glsl
new file mode 100644
index 0000000000..52e5edea8b
--- /dev/null
+++ b/libraries/shaders/headers/310es/version.glsl
@@ -0,0 +1,3 @@
+#version 310 es
+#define GPU_GLES
+#define GPU_GLES_310
diff --git a/libraries/shaders/headers/410/header.glsl b/libraries/shaders/headers/410/header.glsl
index 901ae6f9db..20bd6b2505 100644
--- a/libraries/shaders/headers/410/header.glsl
+++ b/libraries/shaders/headers/410/header.glsl
@@ -1,5 +1,3 @@
-#version 410 core
-#define GPU_GL410
 #define BITFIELD int
 #if defined(VULKAN)
   #extension GL_ARB_shading_language_420pack : require
diff --git a/libraries/shaders/headers/410/version.glsl b/libraries/shaders/headers/410/version.glsl
new file mode 100644
index 0000000000..01ab7e5398
--- /dev/null
+++ b/libraries/shaders/headers/410/version.glsl
@@ -0,0 +1,2 @@
+#version 410 core
+#define GPU_GL410
diff --git a/libraries/shaders/headers/450/header.glsl b/libraries/shaders/headers/450/header.glsl
index 6ce61b4378..ef0ec09414 100644
--- a/libraries/shaders/headers/450/header.glsl
+++ b/libraries/shaders/headers/450/header.glsl
@@ -1,5 +1,3 @@
-#version 450 core
-#define GPU_GL450
 #define GPU_SSBO_TRANSFORM_OBJECT
 #define BITFIELD int
 #define LAYOUT(X) layout(X)
diff --git a/libraries/shaders/headers/450/version.glsl b/libraries/shaders/headers/450/version.glsl
new file mode 100644
index 0000000000..874d578bd9
--- /dev/null
+++ b/libraries/shaders/headers/450/version.glsl
@@ -0,0 +1,2 @@
+#version 450 core
+#define GPU_GL450
diff --git a/tools/shadergen.py b/tools/shadergen.py
index ffbe1662ec..f82b471f17 100644
--- a/tools/shadergen.py
+++ b/tools/shadergen.py
@@ -49,11 +49,36 @@ def getCommonScribeArgs(scribefile, includeLibs):
     scribeArgs.append(scribefile)
     return scribeArgs
 
-def getDialectAndVariantHeaders(dialect, variant):
+extensionsHeaderMutex = Lock()
+
+def getExtensionsHeader(dialect, variant, extensions):
+    extensionHeader = '{}/extensions_{}_{}.glsl'.format(args.build_dir, dialect, variant)
+    global extensionsHeaderMutex
+    extensionsHeaderMutex.acquire()
+    if not os.path.exists(extensionHeader):
+        extensionsDefines = []
+        for extension in extensions:
+            extensionsDefines.append('#define HAVE_{}'.format(extension))
+        # make sure we end with a line feed
+        extensionsDefines.append("\r\n")
+        with open(extensionHeader, "w") as f:
+            f.write('\r\n'.join(extensionsDefines))
+    extensionsHeaderMutex.release()
+    return extensionHeader
+
+
+def getDialectAndVariantHeaders(dialect, variant, extensions=None):
+    result = []
     headerPath = args.source_dir + '/libraries/shaders/headers/'
-    variantHeader = headerPath + ('stereo.glsl' if (variant == 'stereo') else 'mono.glsl')
+    versionHeader = headerPath + dialect + '/version.glsl'
+    result.append(versionHeader)
+    if extensions is not None:
+        result.append(getExtensionsHeader(dialect, variant, extensions))
     dialectHeader = headerPath + dialect + '/header.glsl'
-    return [dialectHeader, variantHeader]
+    result.append(dialectHeader)
+    variantHeader = headerPath + ('stereo.glsl' if (variant == 'stereo') else 'mono.glsl')
+    result.append(variantHeader)
+    return result
 
 class ScribeDependenciesCache:
     cache = {}
@@ -170,7 +195,7 @@ def processCommand(line):
 
         scribeDepCache.gen(scribeFile, libs, dialect, variant)
         scribeArgs = getCommonScribeArgs(scribeFile, libs)
-        for header in getDialectAndVariantHeaders(dialect, variant):
+        for header in getDialectAndVariantHeaders(dialect, variant, args.extensions):
             scribeArgs.extend(['-H', header])
         scribeArgs.extend(['-o', unoptGlslFile])
         executeSubprocess(scribeArgs)
@@ -218,6 +243,7 @@ def main():
 
 
 parser = ArgumentParser(description='Generate shader artifacts.')
+parser.add_argument('--extensions', type=str, nargs='*', help='Available extensions for the shaders')
 parser.add_argument('--commands', type=argparse.FileType('r'), help='list of commands to execute')
 parser.add_argument('--tools-dir', type=str, help='location of the host compatible binaries')
 parser.add_argument('--build-dir', type=str, help='The build directory base path')
@@ -230,8 +256,8 @@ args = None
 if len(sys.argv) == 1:
     # for debugging
     sourceDir = expanduser('~/git/hifi')
-    toolsDir = os.path.join(expanduser('~/git/vcpkg'), 'installed', 'x64-windows', 'tools')
-    buildPath = sourceDir + '/build'
+    toolsDir = 'd:/hifi/vcpkg/android/fd82f0a8/installed/x64-windows/tools'
+    buildPath = sourceDir + '/build_android'
     commandsPath = buildPath + '/libraries/shaders/shadergen.txt'
     shaderDir = buildPath + '/libraries/shaders'
     testArgs = '--commands {} --tools-dir {} --build-dir {} --source-dir {}'.format(
@@ -239,6 +265,7 @@ if len(sys.argv) == 1:
     ).split()
     testArgs.append('--debug')
     testArgs.append('--force')
+    testArgs.extend('--extensions EXT_clip_cull_distance'.split())
     #testArgs.append('--dry-run')
     args = parser.parse_args(testArgs)
 else:

From f8966234044871b0bd46383e5beff2a87967edc7 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:30:54 -0800
Subject: [PATCH 46/58] Fix prebuild crash if can't find git binary (such as
 when running under Android Studio)

---
 prebuild.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/prebuild.py b/prebuild.py
index 060e1fd3b0..5325ca34bc 100644
--- a/prebuild.py
+++ b/prebuild.py
@@ -58,6 +58,9 @@ logging.setLoggerClass(TrackableLogger)
 logger = logging.getLogger('prebuild')
 
 def headSha():
+    if shutil.which('git') is None:
+        logger.warn("Unable to find git executable, can't caclulate commit ID")
+        return '0xDEADBEEF'
     repo_dir = os.path.dirname(os.path.abspath(__file__))
     git = subprocess.Popen(
         'git rev-parse --short HEAD',
@@ -67,7 +70,7 @@ def headSha():
     stdout, _ = git.communicate()
     sha = stdout.split('\n')[0]
     if not sha:
-        raise RuntimeError("couldn't find git sha")
+        raise RuntimeError("couldn't find git sha for repository {}".format(repo_dir))
     return sha
 
 @contextmanager

From 00ed86d1cff0bd1f257769a4634d9f43d491a56f Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 14:34:40 -0800
Subject: [PATCH 47/58] fixing typo

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index faf88c5126..c126dce56a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,7 +135,7 @@ set(PLATFORM_QT_GL OpenGL)
 
 if (USE_GLES)
   add_definitions(-DUSE_GLES)
-  add_definitions(-DGPU_POINTER_STORAGE_sRED)
+  add_definitions(-DGPU_POINTER_STORAGE_SHARED)
   set(PLATFORM_GL_BACKEND gpu-gl-common gpu-gles)
 else()
   add_definitions(-DGPU_POINTER_STORAGE_RAW)

From 02a95b599dde2165cd89b9bc813ebcd2d0d683d5 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 15:57:19 -0800
Subject: [PATCH 48/58] fix extra shadergen args

---
 cmake/macros/AutoScribeShader.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/macros/AutoScribeShader.cmake b/cmake/macros/AutoScribeShader.cmake
index b56b3f8eea..c5bb2b4054 100755
--- a/cmake/macros/AutoScribeShader.cmake
+++ b/cmake/macros/AutoScribeShader.cmake
@@ -276,7 +276,7 @@ macro(AUTOSCRIBE_SHADER_LIBS)
             (${HIFI_ANDROID_APP} STREQUAL "questFramePlayer") OR
             (${HIFI_ANDROID_APP} STREQUAL "framePlayer") 
         )
-            set(EXTRA_SHADERGEN_ARGS "--extensions EXT_clip_cull_distance")
+            set(EXTRA_SHADERGEN_ARGS --extensions EXT_clip_cull_distance)
         endif()
     endif()
 

From bfda7d73c1a48b6361df9c37c54e746d67671b04 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 15 Feb 2019 16:38:55 -0800
Subject: [PATCH 49/58] Fix frame player

---
 android/apps/questFramePlayer/CMakeLists.txt  |  2 +-
 .../src/main/AndroidManifest.xml              | 25 +++------
 .../src/main/cpp/AndroidHelper.cpp            | 33 ++++++++++++
 .../src/main/cpp/AndroidHelper.h              | 46 ++++++++++++++++
 .../src/main/cpp/RenderThread.cpp             | 44 +++++++++++-----
 .../questFramePlayer/src/main/cpp/main.cpp    | 25 +++++----
 .../frameplayer/QuestQtActivity.java          | 52 -------------------
 .../frameplayer/QuestRenderActivity.java      |  8 ---
 .../src/main/AndroidManifest.xml              |  2 +-
 .../questInterface/InterfaceActivitiy.java    | 11 ++++
 android/libraries/oculus/build.gradle         |  2 +-
 .../oculus/OculusMobileActivity.java          |  1 -
 libraries/gpu/src/gpu/FrameReader.cpp         | 15 +++++-
 13 files changed, 159 insertions(+), 107 deletions(-)
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp
 create mode 100644 android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h
 delete mode 100644 android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
 create mode 100644 android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java

diff --git a/android/apps/questFramePlayer/CMakeLists.txt b/android/apps/questFramePlayer/CMakeLists.txt
index 5889585a6c..ea60e27a7d 100644
--- a/android/apps/questFramePlayer/CMakeLists.txt
+++ b/android/apps/questFramePlayer/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(TARGET_NAME questFramePlayer)
 setup_hifi_library(AndroidExtras)
 link_hifi_libraries(shared ktx shaders gpu gl oculusMobile ${PLATFORM_GL_BACKEND})
-target_include_directories(${TARGET_NAME} PRIVATE ${HIFI_ANDROID_PRECOMPILED}/ovr/VrApi/Include)
+
 target_link_libraries(${TARGET_NAME} android log m)
 target_opengl()
 target_oculus_mobile()
diff --git a/android/apps/questFramePlayer/src/main/AndroidManifest.xml b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
index 721e8cee89..ba14b04532 100644
--- a/android/apps/questFramePlayer/src/main/AndroidManifest.xml
+++ b/android/apps/questFramePlayer/src/main/AndroidManifest.xml
@@ -19,24 +19,6 @@
         android:name="org.qtproject.qt5.android.bindings.QtApplication"
         tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon">
         <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
-        <activity
-            android:name=".QuestQtActivity"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
-            android:launchMode="singleTask"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
-            android:excludeFromRecents="false"
-            android:alwaysRetainTaskState="true"
-            android:configChanges="screenSize|screenLayout|orientation|keyboardHidden|keyboard|navigation|uiMode"
-            >
-            <!-- JNI nonsense -->
-            <meta-data android:name="android.app.lib_name" android:value="questFramePlayer"/>
-            <!-- Qt nonsense -->
-            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
-        </activity>
 
         <activity
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
@@ -50,6 +32,13 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- JNI nonsense -->
+            <meta-data android:name="android.app.lib_name" android:value="questFramePlayer"/>
+            <!-- Qt nonsense -->
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/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"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
         </activity>
     </application>
 </manifest>
diff --git a/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp
new file mode 100644
index 0000000000..40cadfaf7d
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp
@@ -0,0 +1,33 @@
+//
+//  AndroidHelper.cpp
+//  interface/src
+//
+//  Created by Gabriel Calero & Cristian Duarte on 3/30/18.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include "AndroidHelper.h"
+
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+
+AndroidHelper::AndroidHelper() {
+}
+
+AndroidHelper::~AndroidHelper() {
+}
+
+void AndroidHelper::notifyLoadComplete() {
+    emit qtAppLoadComplete();
+}
+
+void AndroidHelper::notifyEnterForeground() {
+    emit enterForeground();
+}
+
+void AndroidHelper::notifyEnterBackground() {
+    emit enterBackground();
+}
+
diff --git a/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h
new file mode 100644
index 0000000000..7ee85294f1
--- /dev/null
+++ b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h
@@ -0,0 +1,46 @@
+//
+//  AndroidHelper.h
+//  interface/src
+//
+//  Created by Gabriel Calero & Cristian Duarte on 3/30/18.
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_Android_Helper_h
+#define hifi_Android_Helper_h
+
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QUrl>
+#include <QtCore/QEventLoop>
+
+class AndroidHelper : public QObject {
+    Q_OBJECT
+public:
+    AndroidHelper(AndroidHelper const&)  = delete;
+    void operator=(AndroidHelper const&) = delete;
+
+    static AndroidHelper& instance() {
+            static AndroidHelper instance;
+            return instance;
+    }
+
+    void notifyLoadComplete();
+    void notifyEnterForeground();
+    void notifyEnterBackground();
+
+
+signals:
+    void qtAppLoadComplete();
+    void enterForeground();
+    void enterBackground();
+
+private:
+    AndroidHelper();
+    ~AndroidHelper();
+};
+
+#endif
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
index 5eabe6b9b1..22cb85a889 100644
--- a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
@@ -16,6 +16,7 @@
 #include <QtCore/QFileInfo>
 #include <QtGui/QWindow>
 #include <QtGui/QImageReader>
+#include <QtAndroidExtras/QAndroidJniObject>
 
 #include <gl/QOpenGLContextWrapper.h>
 #include <gpu/FrameIO.h>
@@ -29,9 +30,9 @@
 #include <VrApi.h>
 #include <VrApi_Input.h>
 
-static JNIEnv* _env { nullptr };
-static JavaVM* _vm { nullptr };
-static jobject _activity { nullptr };
+#include "AndroidHelper.h"
+
+//static jobject _activity { nullptr };
 
 struct HandController{
     ovrInputTrackedRemoteCapabilities caps {};
@@ -48,21 +49,43 @@ struct HandController{
 };
 
 std::vector<HandController> devices;
+QAndroidJniObject __interfaceActivity;
 
 extern "C" {
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *, void *) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void *) {
     __android_log_write(ANDROID_LOG_WARN, "QQQ", __FUNCTION__);
     return JNI_VERSION_1_6;
 }
 
+JNIEXPORT void JNICALL
+Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnCreate(JNIEnv *env, jobject obj) {
+    __android_log_print(ANDROID_LOG_INFO, "QQQ", __FUNCTION__);
+    __interfaceActivity = QAndroidJniObject(obj);
+    QObject::connect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, []() {
+        __interfaceActivity.callMethod<void>("onAppLoadedComplete", "()V");
+        QObject::disconnect(&AndroidHelper::instance(), &AndroidHelper::qtAppLoadComplete, nullptr, nullptr);
+    });
+}
 
-JNIEXPORT void JNICALL Java_io_highfidelity_frameplayer_QuestQtActivity_nativeOnCreate(JNIEnv* env, jobject obj) {
-    env->GetJavaVM(&_vm);
-    _activity = env->NewGlobalRef(obj);
+JNIEXPORT void
+Java_io_highfidelity_oculus_OculusMobileActivity_questOnAppAfterLoad(JNIEnv *env, jobject obj) {
+    AndroidHelper::instance().moveToThread(qApp->thread());
 }
+
+JNIEXPORT void JNICALL
+Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnPause(JNIEnv *env, jobject obj) {
+    AndroidHelper::instance().notifyEnterBackground();
 }
 
+JNIEXPORT void JNICALL
+Java_io_highfidelity_oculus_OculusMobileActivity_questNativeOnResume(JNIEnv *env, jobject obj) {
+    AndroidHelper::instance().notifyEnterForeground();
+}
+
+}
+
+
 static const char* FRAME_FILE = "assets:/frames/20190121_1220.json";
 
 static void textureLoader(const std::string& filename, const gpu::TexturePointer& texture, uint16_t layer) {
@@ -96,14 +119,7 @@ void RenderThread::setup() {
     // Wait until the context has been moved to this thread
     { std::unique_lock<std::mutex> lock(_frameLock); }
 
-
     ovr::VrHandler::initVr();
-    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Launching oculus activity");
-    _vm->AttachCurrentThread(&_env, nullptr);
-    jclass cls = _env->GetObjectClass(_activity);
-    jmethodID mid = _env->GetMethodID(cls, "launchOculusActivity", "()V");
-    _env->CallVoidMethod(_activity, mid);
-    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Launching oculus activity done");
     ovr::VrHandler::setHandler(this);
 
     makeCurrent();
diff --git a/android/apps/questFramePlayer/src/main/cpp/main.cpp b/android/apps/questFramePlayer/src/main/cpp/main.cpp
index 4730d3fa15..123ba904f4 100644
--- a/android/apps/questFramePlayer/src/main/cpp/main.cpp
+++ b/android/apps/questFramePlayer/src/main/cpp/main.cpp
@@ -11,30 +11,33 @@
 #include <QtGui/QGuiApplication>
 #include <QtCore/QTimer>
 #include <QtCore/QFileInfo>
+#include <QtAndroidExtras/QAndroidJniObject>
 
 #include <Trace.h>
 
 #include "PlayerWindow.h"
+#include "AndroidHelper.h"
+
 
 void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
     if (!message.isEmpty()) {
-        const char * local=message.toStdString().c_str();
+        const char* local = message.toStdString().c_str();
         switch (type) {
             case QtDebugMsg:
-                __android_log_write(ANDROID_LOG_DEBUG,"Interface",local);
+                __android_log_write(ANDROID_LOG_DEBUG, "Interface", local);
                 break;
             case QtInfoMsg:
-                __android_log_write(ANDROID_LOG_INFO,"Interface",local);
+                __android_log_write(ANDROID_LOG_INFO, "Interface", local);
                 break;
             case QtWarningMsg:
-                __android_log_write(ANDROID_LOG_WARN,"Interface",local);
+                __android_log_write(ANDROID_LOG_WARN, "Interface", local);
                 break;
             case QtCriticalMsg:
-                __android_log_write(ANDROID_LOG_ERROR,"Interface",local);
+                __android_log_write(ANDROID_LOG_ERROR, "Interface", local);
                 break;
             case QtFatalMsg:
             default:
-                __android_log_write(ANDROID_LOG_FATAL,"Interface",local);
+                __android_log_write(ANDROID_LOG_FATAL, "Interface", local);
                 abort();
         }
     }
@@ -46,11 +49,13 @@ int main(int argc, char** argv) {
     auto oldMessageHandler = qInstallMessageHandler(messageHandler);
     DependencyManager::set<tracing::Tracer>();
     PlayerWindow window;
-    __android_log_write(ANDROID_LOG_FATAL,"QQQ","Exec");
+    QTimer::singleShot(10, []{
+        __android_log_write(ANDROID_LOG_WARN, "QQQ", "notifyLoadComplete");
+        AndroidHelper::instance().notifyLoadComplete();
+    });
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Exec");
     app.exec();
-    __android_log_write(ANDROID_LOG_FATAL,"QQQ","Exec done");
+    __android_log_write(ANDROID_LOG_WARN, "QQQ", "Exec done");
     qInstallMessageHandler(oldMessageHandler);
     return 0;
 }
-
-
diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
deleted file mode 100644
index 6fed737266..0000000000
--- a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestQtActivity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2018/11/20
-//  Copyright 2013-2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-package io.highfidelity.frameplayer;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import org.qtproject.qt5.android.bindings.QtActivity;
-
-import io.highfidelity.oculus.OculusMobileActivity;
-
-
-public class QuestQtActivity extends QtActivity {
-    private native void nativeOnCreate();
-    private boolean launchedQuestMode = false;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        Log.w("QQQ_Qt", "QuestQtActivity::onCreate");
-        super.onCreate(savedInstanceState);
-        nativeOnCreate();
-    }
-
-    @Override
-    public void onDestroy() {
-        Log.w("QQQ_Qt", "QuestQtActivity::onDestroy");
-        super.onDestroy();
-    }
-
-    public void launchOculusActivity() {
-        Log.w("QQQ_Qt", "QuestQtActivity::launchOculusActivity");
-        runOnUiThread(()->{
-            launchedQuestMode = true;
-            moveTaskToBack(true);
-            startActivity(new Intent(this, QuestRenderActivity.class));
-        });
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (launchedQuestMode) {
-            moveTaskToBack(true);
-        }
-    }
-}
diff --git a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
index a395a32b68..9e7c0ab973 100644
--- a/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
+++ b/android/apps/questFramePlayer/src/main/java/io/highfidelity/frameplayer/QuestRenderActivity.java
@@ -1,14 +1,6 @@
 package io.highfidelity.frameplayer;
 
-import android.content.Intent;
-import android.os.Bundle;
-
 import io.highfidelity.oculus.OculusMobileActivity;
 
 public class QuestRenderActivity extends OculusMobileActivity {
-    @Override
-    public void onCreate(Bundle savedState) {
-        super.onCreate(savedState);
-        startActivity(new Intent(this, QuestQtActivity.class));
-    }
 }
diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml
index a5029382cb..a5de47bdce 100644
--- a/android/apps/questInterface/src/main/AndroidManifest.xml
+++ b/android/apps/questInterface/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         </activity>
         <activity
             android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
-            android:name="io.highfidelity.oculus.OculusMobileActivity"
+            android:name=".InterfaceActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <meta-data android:name="android.app.lib_name" android:value="questInterface"/>
diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java
new file mode 100644
index 0000000000..3fe4bbc5d2
--- /dev/null
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java
@@ -0,0 +1,11 @@
+package io.highfidelity.questInterface;
+
+import io.highfidelity.oculus.OculusMobileActivity;
+
+public class InterfaceActivity extends OculusMobileActivity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/android/libraries/oculus/build.gradle b/android/libraries/oculus/build.gradle
index 776c0c1e48..f31efcfe95 100644
--- a/android/libraries/oculus/build.gradle
+++ b/android/libraries/oculus/build.gradle
@@ -17,5 +17,5 @@ android {
 }
 
 dependencies {
-    compile project(path: ':qt')
+    implementation project(path: ':qt')
 }
diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
index cc71ba53a8..9ab07bb4dd 100644
--- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
+++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
@@ -40,7 +40,6 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath());
 
         Log.w(TAG, "QQQ onCreate");
         // Create a native surface for VR rendering (Qt GL surfaces are not suitable
diff --git a/libraries/gpu/src/gpu/FrameReader.cpp b/libraries/gpu/src/gpu/FrameReader.cpp
index 6e39a38097..2fe143ee90 100644
--- a/libraries/gpu/src/gpu/FrameReader.cpp
+++ b/libraries/gpu/src/gpu/FrameReader.cpp
@@ -388,10 +388,23 @@ ShaderPointer Deserializer::readShader(const json& node) {
         return nullptr;
     }
 
+    static std::map<std::string, uint32_t> shadersIdsByName;
+    if (shadersIdsByName.empty()) {
+        for (const auto id : shader::allShaders()) {
+            const auto& shaderSource = shader::Source::get(id);
+            shadersIdsByName[shaderSource.name] = id;
+        }
+    }
+
     // FIXME support procedural shaders
     Shader::Type type = node[keys::type];
     std::string name = node[keys::name];
-    uint32_t id = node[keys::id];
+    // Using the serialized ID is bad, because it's generated at 
+    // cmake time, and can change across platforms or when 
+    // shaders are added or removed
+    // uint32_t id = node[keys::id];
+    
+    uint32_t id = shadersIdsByName[name];
     ShaderPointer result;
     switch (type) {
         //case Shader::Type::GEOMETRY:

From 9a0078a216051f770770f178f4eaa5756ac4e7f8 Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Tue, 19 Feb 2019 07:32:05 -0800
Subject: [PATCH 50/58] fixing compile errors.

---
 .../{InterfaceActivitiy.java => InterfaceActivity.java}         | 2 ++
 1 file changed, 2 insertions(+)
 rename android/apps/questInterface/src/main/java/io/highfidelity/questInterface/{InterfaceActivitiy.java => InterfaceActivity.java} (84%)

diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java
similarity index 84%
rename from android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java
rename to android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java
index 3fe4bbc5d2..d55f97ad49 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivitiy.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java
@@ -1,6 +1,8 @@
 package io.highfidelity.questInterface;
 
+import android.os.Bundle;
 import io.highfidelity.oculus.OculusMobileActivity;
+import io.highfidelity.utils.HifiUtils;
 
 public class InterfaceActivity extends OculusMobileActivity {
     @Override

From ae796c2484ff3071a709f917e1f329fe1ce689dc Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Tue, 19 Feb 2019 07:42:35 -0800
Subject: [PATCH 51/58] rerouted the intent back to interfaceActivity since its
 back and registered in manifest

---
 .../java/io/highfidelity/questInterface/PermissionsChecker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
index 72fc4b5182..154435fcaf 100644
--- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
+++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
@@ -47,7 +47,7 @@ public class PermissionsChecker extends Activity {
     }
 
     private void launchActivityWithPermissions() {
-        startActivity(new Intent(this, OculusMobileActivity.class));
+        startActivity(new Intent(this, InterfaceActivity.class));
         finish();
     }
 

From 0ddb4ecd7c4cdfb382fe2ad9eba2df43b78b1ddb Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 19 Feb 2019 12:10:26 -0800
Subject: [PATCH 52/58] Allow per-machine customization of which android
 projects are loaded

---
 android/settings.gradle | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/android/settings.gradle b/android/settings.gradle
index 64eb246719..c7b70cfde2 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -12,18 +12,26 @@ project(':qt').projectDir = new File(settingsDir, 'libraries/qt')
 // Applications
 //
 
-include ':interface'
-project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+if (!getSettings().hasProperty("SUPPRESS_INTERFACE")) {
+    include ':interface'
+    project(':interface').projectDir = new File(settingsDir, 'apps/interface')
+}
 
-include ':questInterface'
-project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
+if (!getSettings().hasProperty("SUPPRESS_QUEST_INTERFACE")) {
+    include ':questInterface'
+    project(':questInterface').projectDir = new File(settingsDir, 'apps/questInterface')
+}
 
 //
 // Test projects
 //
 
-include ':framePlayer'
-project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+if (!getSettings().hasProperty("SUPPRESS_FRAME_PLAYER")) {
+    include ':framePlayer'
+    project(':framePlayer').projectDir = new File(settingsDir, 'apps/framePlayer')
+}
 
-include ':questFramePlayer'
-project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
+if (!getSettings().hasProperty("SUPPRESS_QUEST_FRAME_PLAYER")) {
+    include ':questFramePlayer'
+    project(':questFramePlayer').projectDir = new File(settingsDir, 'apps/questFramePlayer')
+}

From 44851bbf684e3ac612fe6abacba0c5a430bbc063 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 19 Feb 2019 12:37:17 -0800
Subject: [PATCH 53/58] Quest frame player cleanup

---
 .../questFramePlayer/src/main/cpp/AndroidHelper.cpp   |  7 ++-----
 .../questFramePlayer/src/main/cpp/AndroidHelper.h     | 11 ++++-------
 .../questFramePlayer/src/main/cpp/PlayerWindow.cpp    |  8 ++------
 .../apps/questFramePlayer/src/main/cpp/PlayerWindow.h | 11 +----------
 .../questFramePlayer/src/main/cpp/RenderThread.cpp    |  6 +-----
 .../apps/questFramePlayer/src/main/cpp/RenderThread.h |  4 +---
 6 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp
index 40cadfaf7d..797040ab69 100644
--- a/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp
+++ b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.cpp
@@ -1,9 +1,6 @@
 //
-//  AndroidHelper.cpp
-//  interface/src
-//
-//  Created by Gabriel Calero & Cristian Duarte on 3/30/18.
-//  Copyright 2018 High Fidelity, Inc.
+//  Created by Bradley Austin Davis on 2019/02/15
+//  Copyright 2013-2019 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h
index 7ee85294f1..ef6722462c 100644
--- a/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h
+++ b/android/apps/questFramePlayer/src/main/cpp/AndroidHelper.h
@@ -1,9 +1,6 @@
 //
-//  AndroidHelper.h
-//  interface/src
-//
-//  Created by Gabriel Calero & Cristian Duarte on 3/30/18.
-//  Copyright 2018 High Fidelity, Inc.
+//  Created by Bradley Austin Davis on 2019/02/15
+//  Copyright 2013-2019 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -24,8 +21,8 @@ public:
     void operator=(AndroidHelper const&) = delete;
 
     static AndroidHelper& instance() {
-            static AndroidHelper instance;
-            return instance;
+        static AndroidHelper instance;
+        return instance;
     }
 
     void notifyLoadComplete();
diff --git a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
index ec2986298e..8f78b1946a 100644
--- a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
+++ b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.cpp
@@ -11,15 +11,11 @@
 #include <QtWidgets/QFileDialog>
 
 PlayerWindow::PlayerWindow() {
-    installEventFilter(this);
-    setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
+    setFlags(Qt::Window);
     setSurfaceType(QSurface::OpenGLSurface);
     create();
     showFullScreen();
     // Ensure the window is visible and the GL context is valid
     QCoreApplication::processEvents();
-    _renderThread.initialize(this);
-}
-
-PlayerWindow::~PlayerWindow() {
+    _renderThread.initialize();
 }
diff --git a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
index e4dd6cef43..5e7dc82781 100644
--- a/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
+++ b/android/apps/questFramePlayer/src/main/cpp/PlayerWindow.h
@@ -8,22 +8,13 @@
 
 #pragma once
 #include <QtGui/QWindow>
-#include <QtCore/QSettings>
-
-#include <gpu/Forward.h>
 #include "RenderThread.h"
 
-// Create a simple OpenGL window that renders text in various ways
 class PlayerWindow : public QWindow {
 public:
     PlayerWindow();
-    virtual ~PlayerWindow();
-
-protected:
-    //bool eventFilter(QObject* obj, QEvent* event) override;
-    //void keyPressEvent(QKeyEvent* event) override;
+    virtual ~PlayerWindow() {}
 
 private:
-    QSettings _settings;
     RenderThread _renderThread;
 };
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
index 22cb85a889..78a4487284 100644
--- a/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp
@@ -32,8 +32,6 @@
 
 #include "AndroidHelper.h"
 
-//static jobject _activity { nullptr };
-
 struct HandController{
     ovrInputTrackedRemoteCapabilities caps {};
     ovrInputStateTrackedRemote state {};
@@ -107,11 +105,10 @@ void RenderThread::move(const glm::vec3& v) {
     _correction = glm::inverse(glm::translate(mat4(), v)) * _correction;
 }
 
-void RenderThread::initialize(QWindow* window) {
+void RenderThread::initialize() {
     std::unique_lock<std::mutex> lock(_frameLock);
     setObjectName("RenderThread");
     Parent::initialize();
-    _window = window;
     _thread->setObjectName("RenderThread");
 }
 
@@ -185,7 +182,6 @@ void RenderThread::handleInput() {
                 const auto &remote = controller.state;
                 if (remote.Joystick.x != 0.0f || remote.Joystick.y != 0.0f) {
                     glm::vec3 translation;
-                    float rotation = 0.0f;
                     if (caps.ControllerCapabilities & ovrControllerCaps_LeftHand) {
                         translation = glm::vec3{0.0f, -remote.Joystick.y, 0.0f};
                     } else {
diff --git a/android/apps/questFramePlayer/src/main/cpp/RenderThread.h b/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
index 701cd25f5b..747d0d9e8d 100644
--- a/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
+++ b/android/apps/questFramePlayer/src/main/cpp/RenderThread.h
@@ -20,11 +20,9 @@
 class RenderThread : public GenericThread, ovr::VrHandler {
     using Parent = GenericThread;
 public:
-    QWindow* _window{ nullptr };
     std::mutex _mutex;
     gpu::ContextPointer _gpuContext;  // initialized during window creation
     std::shared_ptr<gpu::Backend> _backend;
-    std::atomic<size_t> _presentCount{ 0 };
     std::mutex _frameLock;
     std::queue<gpu::FramePointer> _pendingFrames;
     gpu::FramePointer _activeFrame;
@@ -39,6 +37,6 @@ public:
     void handleInput();
 
     void submitFrame(const gpu::FramePointer& frame);
-    void initialize(QWindow* window);
+    void initialize();
     void renderFrame();
 };

From 8eca2a2c9db3ccdbc1b9074ccb137e6e3d094dcf Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 19 Feb 2019 13:09:18 -0800
Subject: [PATCH 54/58] Fix jenkins build failure

---
 android/apps/questInterface/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/apps/questInterface/build.gradle b/android/apps/questInterface/build.gradle
index cbf575d7b0..3d13877607 100644
--- a/android/apps/questInterface/build.gradle
+++ b/android/apps/questInterface/build.gradle
@@ -44,10 +44,10 @@ android {
         }
         signingConfigs {
             release {
-                storeFile file(HIFI_ANDROID_KEYSTORE)
-                storePassword HIFI_ANDROID_KEYSTORE_PASSWORD
-                keyAlias HIFI_ANDROID_KEY_ALIAS
-                keyPassword HIFI_ANDROID_KEY_PASSWORD
+                storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+                storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+                keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+                keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
                 v2SigningEnabled false
             }
         }

From bf69e6d67277e4b815fc5acf9d7401ceec02e67d Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Tue, 19 Feb 2019 16:03:02 -0800
Subject: [PATCH 55/58] fixing compile errors

---
 .../io/highfidelity/hifiinterface/InterfaceActivity.java | 9 ++++-----
 libraries/gpu/src/gpu/Transform.slh                      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index a7bda3c29b..756cc19fa5 100644
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -81,6 +81,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     private boolean nativeEnterBackgroundCallEnqueued = false;
     private SlidingDrawer mWebSlidingDrawer;
     private boolean mStartInDomain;
+    private booelan isLoading;
 //    private GvrApi gvrApi;
     // Opaque native pointer to the Application C++ object.
     // This object is owned by the InterfaceActivity instance and passed to the native methods.
@@ -94,7 +95,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        super.isLoading = true;
+        isLoading = true;
         Intent intent = getIntent();
         if (intent.hasExtra(DOMAIN_URL) && !TextUtils.isEmpty(intent.getStringExtra(DOMAIN_URL))) {
             intent.putExtra("applicationArguments", "--url " + intent.getStringExtra(DOMAIN_URL));
@@ -145,7 +146,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     @Override
     protected void onPause() {
         super.onPause();
-        if (super.isLoading) {
+        if (isLoading) {
             nativeEnterBackgroundCallEnqueued = true;
         } else {
             nativeEnterBackground();
@@ -172,7 +173,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
         super.onResume();
         nativeEnterForeground();
         surfacesWorkaround();
-        keepInterfaceRunning = false;
         registerReceiver(headsetStateReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG));
         //gvrApi.resumeTracking();
     }
@@ -382,7 +382,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     }
 
     public void onAppLoadedComplete() {
-        super.isLoading = false;
+        isLoading = false;
         if (nativeEnterBackgroundCallEnqueued) {
             nativeEnterBackground();
         }
@@ -413,7 +413,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
 
     @Override
     public void onExpand() {
-        keepInterfaceRunning = true;
     }
 
     @Override
diff --git a/libraries/gpu/src/gpu/Transform.slh b/libraries/gpu/src/gpu/Transform.slh
index 2d51698404..3015de7e0e 100644
--- a/libraries/gpu/src/gpu/Transform.slh
+++ b/libraries/gpu/src/gpu/Transform.slh
@@ -167,7 +167,7 @@ TransformObject getTransformObject() {
         vec4 eyeClipEdge[2]= vec4[2](vec4(-1,0,0,1), vec4(1,0,0,1));
         vec2 eyeOffsetScale = vec2(-0.5, +0.5);
         uint eyeIndex = uint(_stereoSide);
-#if !defined(GPU_GLES) || !defined(VULKAN)
+#if !defined(GPU_GLES) || (defined(HAVE_EXT_clip_cull_distance) && !defined(VULKAN))
         gl_ClipDistance[0] = dot(<$clipPos$>, eyeClipEdge[eyeIndex]);
 #endif
         float newClipPosX = <$clipPos$>.x * 0.5 + eyeOffsetScale[eyeIndex] * <$clipPos$>.w;

From 0d0acd8fb2c7a2d3bd5ef8dbb002c8e115d05833 Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Tue, 19 Feb 2019 16:09:16 -0800
Subject: [PATCH 56/58] fixed typo

---
 .../java/io/highfidelity/hifiinterface/InterfaceActivity.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index 756cc19fa5..3cdb9f5a09 100644
--- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -81,7 +81,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
     private boolean nativeEnterBackgroundCallEnqueued = false;
     private SlidingDrawer mWebSlidingDrawer;
     private boolean mStartInDomain;
-    private booelan isLoading;
+    private boolean isLoading;
 //    private GvrApi gvrApi;
     // Opaque native pointer to the Application C++ object.
     // This object is owned by the InterfaceActivity instance and passed to the native methods.

From 518e480a8b2f8844796f412f85f5a464ff43e791 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 19 Feb 2019 17:00:39 -0800
Subject: [PATCH 57/58] Fix plugin activation

---
 interface/src/Application.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 132f68f0a2..b995b6ffa8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2409,7 +2409,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 
-#if defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID) && 
     connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground);
     connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
     connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
@@ -9140,17 +9140,23 @@ void Application::beforeEnterBackground() {
 void Application::enterBackground() {
     QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
                               "stop", Qt::BlockingQueuedConnection);
-//    if (getActiveDisplayPlugin()->isActive()) {
-//        getActiveDisplayPlugin()->deactivate();
-//    }
+// Quest only supports one plugin which can't be deactivated currently
+#if !defined(ANDROID_APP_QUEST_INTERFACE)
+    if (getActiveDisplayPlugin()->isActive()) {
+        getActiveDisplayPlugin()->deactivate();
+    }
+#endif
 }
 
 void Application::enterForeground() {
     QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
                                   "start", Qt::BlockingQueuedConnection);
-//    if (!getActiveDisplayPlugin() || getActiveDisplayPlugin()->isActive() || !getActiveDisplayPlugin()->activate()) {
-//        qWarning() << "Could not re-activate display plugin";
-//    }
+// Quest only supports one plugin which can't be deactivated currently
+#if !defined(ANDROID_APP_QUEST_INTERFACE)
+    if (!getActiveDisplayPlugin() || getActiveDisplayPlugin()->isActive() || !getActiveDisplayPlugin()->activate()) {
+        qWarning() << "Could not re-activate display plugin";
+    }
+#endif
     auto nodeList = DependencyManager::get<NodeList>();
     nodeList->setSendDomainServerCheckInEnabled(true);
 }

From 122a246d2de9b94ca236bfd5aa305fcab5b92771 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 19 Feb 2019 17:30:47 -0800
Subject: [PATCH 58/58] Fix typo

---
 interface/src/Application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b995b6ffa8..db08b47665 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2409,7 +2409,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 
-#if defined(Q_OS_ANDROID) && 
+#if defined(Q_OS_ANDROID)
     connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground);
     connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
     connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);