From 65e9f88e6e13994df5b888215f4bee68ac600f52 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Tue, 2 Apr 2024 22:21:22 -0700
Subject: [PATCH 1/4] refactor application.cpp

---
 interface/src/Application.cpp                 | 10653 +++-------------
 interface/src/Application.h                   |  1037 +-
 interface/src/ApplicationEventHandler.h       |    77 +
 interface/src/ApplicationMeshProvider.h       |    67 +
 interface/src/Application_Assets.cpp          |   525 +
 interface/src/Application_Camera.cpp          |   374 +
 interface/src/Application_Entities.cpp        |   359 +
 interface/src/Application_Events.cpp          |   931 ++
 interface/src/Application_Graphics.cpp        |   597 +
 interface/src/Application_Plugins.cpp         |   418 +
 interface/src/Application_Setup.cpp           |  2153 ++++
 interface/src/Application_UI.cpp              |  1458 +++
 interface/src/CrashRecoveryHandler.cpp        |     6 -
 interface/src/CrashRecoveryHandler.h          |     5 -
 interface/src/DeadlockWatchdog.cpp            |    22 +
 interface/src/DeadlockWatchdog.h              |   159 +
 interface/src/LODManager.cpp                  |     1 +
 interface/src/WindowsSystemInfo.h             |   240 +
 interface/src/avatar/MyAvatar.cpp             |     1 +
 interface/src/avatar/MyHead.cpp               |     1 +
 interface/src/graphics/RenderEventHandler.cpp |     1 +
 interface/src/main.cpp                        |    15 +-
 .../src/octree/OctreePacketProcessor.cpp      |    43 +-
 interface/src/octree/OctreePacketProcessor.h  |    10 +
 .../src/raypick/PointerScriptingInterface.cpp |     2 +
 .../PerformanceScriptingInterface.cpp         |     2 +
 .../scripting/RenderScriptingInterface.cpp    |     6 +-
 interface/src/ui/HMDToolsDialog.cpp           |     2 +
 interface/src/ui/JSConsole.cpp                |     1 +
 interface/src/ui/OctreeStatsDialog.cpp        |     1 +
 interface/src/ui/OctreeStatsProvider.cpp      |     1 +
 .../src/AbstractViewStateInterface.h          |     5 -
 32 files changed, 9736 insertions(+), 9437 deletions(-)
 create mode 100644 interface/src/ApplicationEventHandler.h
 create mode 100644 interface/src/ApplicationMeshProvider.h
 create mode 100644 interface/src/Application_Assets.cpp
 create mode 100644 interface/src/Application_Camera.cpp
 create mode 100644 interface/src/Application_Entities.cpp
 create mode 100644 interface/src/Application_Events.cpp
 create mode 100644 interface/src/Application_Graphics.cpp
 create mode 100644 interface/src/Application_Plugins.cpp
 create mode 100644 interface/src/Application_Setup.cpp
 create mode 100644 interface/src/Application_UI.cpp
 create mode 100644 interface/src/DeadlockWatchdog.cpp
 create mode 100644 interface/src/DeadlockWatchdog.h
 create mode 100644 interface/src/WindowsSystemInfo.h

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 137457c7222..9d56810da4c 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -12,252 +12,124 @@
 //  SPDX-License-Identifier: Apache-2.0
 //
 
-
 #include "Application.h"
 
-#include <chrono>
-#include <thread>
-
-#include <glm/glm.hpp>
-#include <glm/gtx/component_wise.hpp>
-#include <glm/gtx/quaternion.hpp>
-#include <glm/gtx/vector_angle.hpp>
-#include <glm/gtc/type_ptr.hpp>
-
-#include <gl/Config.h>
-
-#include <QtCore/QResource>
-#include <QtCore/QAbstractNativeEventFilter>
-#include <QtCore/QMimeData>
-#include <QtCore/QThreadPool>
-#include <QtCore/QFileSelector>
-#include <QtConcurrent/QtConcurrentRun>
-
+#include <QDesktopWidget>
+#include <QDesktopServices>
 #include <QtGui/QClipboard>
-#include <QtGui/QScreen>
-#include <QtGui/QWindow>
-#include <QtGui/QDesktopServices>
-
 #include <QtNetwork/QLocalSocket>
 #include <QtNetwork/QLocalServer>
-#include <QtQml/QQmlContext>
-#include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickWindow>
+#include <QWidget>
 
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QMessageBox>
-
-#include <QtMultimedia/QMediaPlayer>
-
-#include <QFontDatabase>
-#include <QProcessEnvironment>
-#include <QTemporaryDir>
-
-
-#include <gl/QOpenGLContextWrapper.h>
-#include <gl/GLWindow.h>
-#include <gl/GLHelpers.h>
-
-#include <shared/FileUtils.h>
-#include <shared/QtHelpers.h>
-#include <shared/PlatformHelper.h>
-#include <shared/GlobalAppProperties.h>
-#include <GeometryUtil.h>
-#include <StatTracker.h>
-#include <Trace.h>
-#include <ResourceScriptingInterface.h>
 #include <AccountManager.h>
-#include <DomainAccountManager.h>
 #include <AddressManager.h>
-#include <AnimDebugDraw.h>
-#include <BuildInfo.h>
 #include <AnimationCacheScriptingInterface.h>
-#include <AssetClient.h>
-#include <AssetUpload.h>
-#include <AutoUpdater.h>
-#include <Midi.h>
-#include <AudioInjectorManager.h>
+#include <AnimDebugDraw.h>
 #include <AvatarBookmarks.h>
+#include <audio/AudioScope.h>
+#include <avatar/AvatarManager.h>
+#include <avatar/AvatarPackager.h>
+#include <avatar/GrabManager.h>
+#include <BuildInfo.h>
+#include <controllers/ScriptingInterface.h>
+#include <controllers/UserInputMapper.h>
 #include <CrashHelpers.h>
-#include <CursorManager.h>
-#include <VirtualPadManager.h>
 #include <DebugDraw.h>
-#include <DeferredLightingEffect.h>
-#include <EntityScriptClient.h>
+#include <DesktopPreviewProvider.h>
+#include <display-plugins/CompositorHelper.h>
+#include <display-plugins/DisplayPlugin.h>
+#include <DomainAccountManager.h>
 #include <EntityScriptServerLogClient.h>
-#include <EntityScriptingInterface.h>
-#include <ErrorDialog.h>
-#include <Finally.h>
-#include <FingerprintUtils.h>
 #include <FramebufferCache.h>
-#include <gpu/Batch.h>
-#include <gpu/Context.h>
-#include <InfoView.h>
+#include <GPUIdent.h>
+#include <graphics-scripting/GraphicsScriptingInterface.h>
+#include <hfm/ModelFormatRegistry.h>
 #include <input-plugins/InputPlugin.h>
-#include <controllers/UserInputMapper.h>
-#include <controllers/InputRecorder.h>
-#include <controllers/ScriptingInterface.h>
-#include <controllers/StateController.h>
-#include <UserActivityLoggerScriptingInterface.h>
-#include <LogHandler.h>
-#include "LocationBookmarks.h"
+#include <input-plugins/KeyboardMouseDevice.h>
 #include <LocationScriptingInterface.h>
+#include <LogHandler.h>
 #include <MainWindow.h>
-#include <MappingRequest.h>
 #include <MessagesClient.h>
-#include <hfm/ModelFormatRegistry.h>
-#include <model-networking/ModelCacheScriptingInterface.h>
-#include <procedural/MaterialCacheScriptingInterface.h>
 #include <material-networking/TextureCacheScriptingInterface.h>
-#include <ModelEntityItem.h>
-#include <NetworkAccessManager.h>
-#include <NetworkingConstants.h>
-#include <MetaverseAPI.h>
-#include <ObjectMotionState.h>
-#include <OctalCode.h>
-#include <OctreeSceneStats.h>
+#include <model-networking/ModelCacheScriptingInterface.h>
+#include <networking/CloseEventSender.h>
 #include <OffscreenUi.h>
-#include <gl/OffscreenGLCanvas.h>
-#include <ui/OffscreenQmlSurfaceCache.h>
-#include <PathUtils.h>
-#include <PerfStat.h>
-#include <PhysicsEngine.h>
-#include <PhysicsHelpers.h>
-#include <plugins/CodecPlugin.h>
+#include <PickManager.h>
+#include <plugins/OculusPlatformPlugin.h>
 #include <plugins/PluginManager.h>
 #include <plugins/PluginUtils.h>
 #include <plugins/SteamClientPlugin.h>
-#include <plugins/OculusPlatformPlugin.h>
-#include <plugins/InputConfiguration.h>
-#include <Quat.h>
+#include <Preferences.h>
+#include <procedural/MaterialCacheScriptingInterface.h>
+#include <QmlFragmentClass.h>
+#include <QmlWebWindowClass.h>
+#include <QmlWindowClass.h>
+#include <raypick/PickScriptingInterface.h>
+#include <raypick/PointerScriptingInterface.h>
+#include <raypick/RayPickScriptingInterface.h>
 #include <recording/RecordingScriptingInterface.h>
 #include <render/EngineStats.h>
-#include <SecondaryCamera.h>
-#include <ResourceCache.h>
-#include <ResourceRequest.h>
+#include <ResourceScriptingInterface.h>
 #include <SandboxUtils.h>
 #include <SceneScriptingInterface.h>
-#include <ScriptCache.h>
 #include <ScriptEngines.h>
-#include <ScriptEngineCast.h>
-#include <ScriptManager.h>
-#include <ScriptUUID.h>
-#include <ShapeEntityItem.h>
+#include <scripting/AccountServicesScriptingInterface.h>
+#include <scripting/Audio.h>
+#include <scripting/ClipboardScriptingInterface.h>
+#include <scripting/ControllerScriptingInterface.h>
+#include <scripting/DesktopScriptingInterface.h>
+#include <scripting/HMDScriptingInterface.h>
+#include <scripting/KeyboardScriptingInterface.h>
+#include <scripting/MenuScriptingInterface.h>
+#include <scripting/PerformanceScriptingInterface.h>
+#include <scripting/PlatformInfoScriptingInterface.h>
+#include <scripting/RatesScriptingInterface.h>
+#include <scripting/RenderScriptingInterface.h>
+#include <scripting/ScreenshareScriptingInterface.h>
+#include <scripting/SelectionScriptingInterface.h>
+#include <scripting/SettingsScriptingInterface.h>
+#include <scripting/TestScriptingInterface.h>
+#include <scripting/WindowScriptingInterface.h>
+#ifndef Q_OS_ANDROID
+#include <shared/FileLogger.h>
+#endif
+#include <shared/GlobalAppProperties.h>
+#include <shared/PlatformHelper.h>
+#include <shared/QtHelpers.h>
 #include <SoundCacheScriptingInterface.h>
+#include <StatTracker.h>
+#include <ui/AvatarInputs.h>
+#include <ui/AnimStats.h>
 #include <ui/TabletScriptingInterface.h>
+#include <ui/Keyboard.h>
+#include <ui/OctreeStatsProvider.h>
+#include <ui/OffscreenQmlSurfaceCache.h>
+#include <ui/Snapshot.h>
+#include <ui/SnapshotAnimated.h>
+#include <ui/StandAloneJSConsole.h>
+#include <ui/Stats.h>
 #include <ui/ToolbarScriptingInterface.h>
-#include <ui/types/ContextAwareProfile.h>
-#include <Tooltip.h>
-#include <udt/PacketHeaders.h>
 #include <UserActivityLogger.h>
+#include <UserActivityLoggerScriptingInterface.h>
 #include <UsersScriptingInterface.h>
-#include <recording/ClipCache.h>
-#include <recording/Deck.h>
-#include <recording/Recorder.h>
-#include <shared/StringHelpers.h>
-#include <QmlWebWindowClass.h>
-#include <QmlFragmentClass.h>
-#include <Preferences.h>
-#include <display-plugins/CompositorHelper.h>
-#include <display-plugins/hmd/HmdDisplayPlugin.h>
-#include <display-plugins/RefreshRateController.h>
-#include <avatars-renderer/ScriptAvatar.h>
-#include <RenderableEntityItem.h>
-#include <RenderableTextEntityItem.h>
-#include <RenderableWebEntityItem.h>
-#include <StencilMaskPass.h>
-#include <procedural/ProceduralMaterialCache.h>
-#include <procedural/ReferenceMaterial.h>
-#include "recording/ClipCache.h"
-#include <Vec3.h>
 
+#include "AboutUtil.h"
+#include "ApplicationEventHandler.h"
 #include "AudioClient.h"
-#include "audio/AudioScope.h"
-#include "avatar/AvatarManager.h"
-#include "avatar/MyHead.h"
-#include "avatar/AvatarPackager.h"
-#include "avatar/MyCharacterController.h"
-#include "CrashRecoveryHandler.h"
-#include "crash-handler/CrashHandler.h"
-#include "DiscoverabilityManager.h"
+#include "DeadlockWatchdog.h"
 #include "GLCanvas.h"
-#include "InterfaceDynamicFactory.h"
-#include "InterfaceLogging.h"
+#include "LocationBookmarks.h"
 #include "LODManager.h"
-#include "ModelPackager.h"
-#include "scripting/Audio.h"
-#include "networking/CloseEventSender.h"
-#include "scripting/TestScriptingInterface.h"
-#include "scripting/PlatformInfoScriptingInterface.h"
-#include "scripting/AssetMappingsScriptingInterface.h"
-#include "scripting/ClipboardScriptingInterface.h"
-#include "scripting/DesktopScriptingInterface.h"
-#include "scripting/ScreenshareScriptingInterface.h"
-#include "scripting/AccountServicesScriptingInterface.h"
-#include "scripting/HMDScriptingInterface.h"
-#include "scripting/MenuScriptingInterface.h"
-#include "graphics-scripting/GraphicsScriptingInterface.h"
-#include "scripting/SettingsScriptingInterface.h"
-#include "scripting/WindowScriptingInterface.h"
-#include "scripting/ControllerScriptingInterface.h"
-#include "scripting/RatesScriptingInterface.h"
-#include "scripting/SelectionScriptingInterface.h"
-#include "scripting/TTSScriptingInterface.h"
-#include "scripting/KeyboardScriptingInterface.h"
-#include "scripting/PerformanceScriptingInterface.h"
-#include "scripting/RenderScriptingInterface.h"
-
+#include "Menu.h"
+#include "ResourceRequestObserver.h"
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
 #include "SpeechRecognizer.h"
 #endif
-#include "ui/ResourceImageItem.h"
-#include "ui/AddressBarDialog.h"
-#include "ui/AvatarInputs.h"
-#include "ui/DialogsManager.h"
-#include "ui/LoginDialog.h"
-#include "ui/Snapshot.h"
-#include "ui/SnapshotAnimated.h"
-#include "ui/StandAloneJSConsole.h"
-#include "ui/Stats.h"
-#include "ui/AnimStats.h"
-#include "ui/UpdateDialog.h"
-#include "ui/DomainConnectionModel.h"
-#include "ui/Keyboard.h"
-#include "ui/InteractiveWindow.h"
 #include "Util.h"
-#include "InterfaceParentFinder.h"
-#include "ui/OctreeStatsProvider.h"
-
-#include "avatar/GrabManager.h"
-
-#include <GPUIdent.h>
-#include <gl/GLHelpers.h>
-#include <src/scripting/GooglePolyScriptingInterface.h>
-#include <EntityScriptClient.h>
-#include <ModelScriptingInterface.h>
-
-#include <PickManager.h>
-#include <PointerManager.h>
-#include <raypick/RayPickScriptingInterface.h>
-#include <raypick/PickScriptingInterface.h>
-#include <raypick/PointerScriptingInterface.h>
-#include <raypick/RayPick.h>
-#include <raypick/MouseTransformNode.h>
-
-#include <FadeEffect.h>
-
-#include "ResourceRequestObserver.h"
-
-#include "webbrowser/WebBrowserSuggestionsEngine.h"
-#include <DesktopPreviewProvider.h>
-
-#include "AboutUtil.h"
-#include "ExternalResource.h"
-#include <ThreadHelpers.h>
 
 #if defined(Q_OS_WIN)
-#include <VersionHelpers.h>
-#include <Windows.h>
+#include "WindowsSystemInfo.h"
 
 // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
 // FIXME seems to be broken.
@@ -266,315 +138,38 @@ extern "C" {
 }
 #endif
 
-#if defined(Q_OS_ANDROID)
-#include <android/log.h>
-#include "AndroidHelper.h"
-#endif
-
 #if defined(Q_OS_MAC)
 // On Mac OS, disable App Nap to prevent audio glitches while running in the background
 #include "AppNapDisabler.h"
 static AppNapDisabler appNapDisabler;   // disabled, while in scope
 #endif
 
-#include "graphics/RenderEventHandler.h"
-
-Q_LOGGING_CATEGORY(trace_app_input_mouse, "trace.app.input.mouse")
-
-using namespace std;
-
-static QTimer locationUpdateTimer;
-static QTimer identityPacketTimer;
-static QTimer pingTimer;
-
 #if defined(Q_OS_ANDROID)
-static bool DISABLE_WATCHDOG = true;
-#else
-static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
-static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
-#endif
-
-#if !defined(Q_OS_ANDROID)
-static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 16;
-#else
-static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 4;
+#include <android/log.h>
 #endif
 
 // For processing on QThreadPool, we target a number of threads after reserving some
 // based on how many are being consumed by the application and the display plugin.  However,
 // we will never drop below the 'min' value
 static const int MIN_PROCESSING_THREAD_POOL_SIZE = 2;
+static const int ENTITY_SERVER_CONNECTION_TIMEOUT = 5000;
 
-static const QString SNAPSHOT_EXTENSION = ".png";
-static const QString JPG_EXTENSION = ".jpg";
-static const QString PNG_EXTENSION = ".png";
-static const QString SVO_EXTENSION = ".svo";
-static const QString SVO_JSON_EXTENSION = ".svo.json";
-static const QString JSON_GZ_EXTENSION = ".json.gz";
-static const QString JSON_EXTENSION = ".json";
-static const QString JS_EXTENSION = ".js";
-static const QString FST_EXTENSION = ".fst";
-static const QString FBX_EXTENSION = ".fbx";
-static const QString OBJ_EXTENSION = ".obj";
-static const QString AVA_JSON_EXTENSION = ".ava.json";
-static const QString WEB_VIEW_TAG = "noDownload=true";
-static const QString ZIP_EXTENSION = ".zip";
-static const QString CONTENT_ZIP_EXTENSION = ".content.zip";
-
-static const float MIRROR_FULLSCREEN_DISTANCE = 0.789f;
+const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.0f;
+const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
+const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
+const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
+const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
+const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
+const bool DEFAULT_MINI_TABLET_ENABLED = false;
+const bool DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED = true;
 
 static const quint64 TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS = 1 * USECS_PER_SECOND;
 
-static const QString INFO_EDIT_ENTITIES_PATH = "html/edit-commands.html";
-static const QString INFO_HELP_PATH = "html/tabletHelp.html";
-
-static const unsigned int THROTTLED_SIM_FRAMERATE = 15;
-static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE;
-static const int ENTITY_SERVER_ADDED_TIMEOUT = 5000;
-static const int ENTITY_SERVER_CONNECTION_TIMEOUT = 5000;
-static const int WATCHDOG_TIMER_TIMEOUT = 100;
-
-static const float INITIAL_QUERY_RADIUS = 10.0f;  // priority radius for entities before physics enabled
-
 static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
-
-Setting::Handle<int> maxOctreePacketsPerSecond{"maxOctreePPS", DEFAULT_MAX_OCTREE_PPS};
-
-Setting::Handle<bool> loginDialogPoppedUp{"loginDialogPoppedUp", false};
-
-static const QUrl AVATAR_INPUTS_BAR_QML = PathUtils::qmlUrl("AvatarInputsBar.qml");
-static const QUrl MIC_BAR_APPLICATION_QML = PathUtils::qmlUrl("hifi/audio/MicBarApplication.qml");
-static const QUrl BUBBLE_ICON_QML = PathUtils::qmlUrl("BubbleIcon.qml");
-
-static const QString STANDARD_TO_ACTION_MAPPING_NAME = "Standard to Action";
-static const QString NO_MOVEMENT_MAPPING_NAME = "Standard to Action (No Movement)";
-static const QString NO_MOVEMENT_MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/standard_nomovement.json";
-
-static const int INTERVAL_TO_CHECK_HMD_WORN_STATUS = 500; // milliseconds
-static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
-static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin";
-static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
 static const QString KEEP_ME_LOGGED_IN_SETTING_NAME = "keepMeLoggedIn";
-static const QString CACHEBUST_SCRIPT_REQUIRE_SETTING_NAME = "cachebustScriptRequire";
-
-static const float FOCUS_HIGHLIGHT_EXPANSION_FACTOR = 1.05f;
-
-#if defined(Q_OS_ANDROID)
-static const QString TESTER_FILE = "/sdcard/_hifi_test_device.txt";
-#endif
-const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application::_acceptedExtensions {
-    { SVO_EXTENSION, &Application::importSVOFromURL },
-    { SVO_JSON_EXTENSION, &Application::importSVOFromURL },
-    { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl },
-    { JSON_EXTENSION, &Application::importJSONFromURL },
-    { JS_EXTENSION, &Application::askToLoadScript },
-    { FST_EXTENSION, &Application::askToSetAvatarUrl },
-    { JSON_GZ_EXTENSION, &Application::askToReplaceDomainContent },
-    { CONTENT_ZIP_EXTENSION, &Application::askToReplaceDomainContent },
-    { ZIP_EXTENSION, &Application::importFromZIP },
-    { JPG_EXTENSION, &Application::importImage },
-    { PNG_EXTENSION, &Application::importImage }
-};
-
-class DeadlockWatchdogThread : public QThread {
-public:
-    static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
-    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 120 * USECS_PER_SECOND; // 2 mins with no checkin probably a deadlock
-    static const int WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large
-    static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples
-
-    // Set the heartbeat on launch
-    DeadlockWatchdogThread() {
-        setObjectName("Deadlock Watchdog");
-        // Give the heartbeat an initial value
-        _heartbeat = usecTimestampNow();
-        _paused = false;
-        connect(qApp, &QCoreApplication::aboutToQuit, [this] {
-            _quit = true;
-        });
-    }
-
-    void setMainThreadID(Qt::HANDLE threadID) {
-        _mainThreadID = threadID;
-    }
-
-    static void updateHeartbeat() {
-        auto now = usecTimestampNow();
-        auto elapsed = now - _heartbeat;
-        _movingAverage.addSample(elapsed);
-        _heartbeat = now;
-    }
-
-    void deadlockDetectionCrash() {
-        auto &ch = CrashHandler::getInstance();
-
-        ch.setAnnotation("_mod_faulting_tid", std::to_string((uint64_t)_mainThreadID));
-        ch.setAnnotation("deadlock", "1");
-        uint32_t* crashTrigger = nullptr;
-        *crashTrigger = 0xDEAD10CC;
-    }
-
-    static void withPause(const std::function<void()>& lambda) {
-        pause();
-        lambda();
-        resume();
-    }
-    static void pause() {
-        _paused = true;
-    }
-
-    static void resume() {
-        // Update the heartbeat BEFORE resuming the checks
-        updateHeartbeat();
-        _paused = false;
-    }
-
-    void run() override {
-        while (!_quit) {
-            QThread::sleep(HEARTBEAT_UPDATE_INTERVAL_SECS);
-            // Don't do heartbeat detection under nsight
-            if (_paused) {
-                continue;
-            }
-            uint64_t lastHeartbeat = _heartbeat; // sample atomic _heartbeat, because we could context switch away and have it updated on us
-            uint64_t now = usecTimestampNow();
-            auto lastHeartbeatAge = (now > lastHeartbeat) ? now - lastHeartbeat : 0;
-            auto elapsedMovingAverage = _movingAverage.getAverage();
-
-            if (elapsedMovingAverage > _maxElapsedAverage * 1.1f) {
-#if !defined(NDEBUG)
-                qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
-                    << "lastHeartbeatAge:" << lastHeartbeatAge
-                    << "elapsedMovingAverage:" << elapsedMovingAverage
-                    << "maxElapsed:" << _maxElapsed
-                    << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage
-                    << "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **"
-                    << "samples:" << _movingAverage.getSamples();
-#endif
-                _maxElapsedAverage = elapsedMovingAverage;
-            }
-            if (lastHeartbeatAge > _maxElapsed) {
-#if !defined(NDEBUG)
-                qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
-                    << "lastHeartbeatAge:" << lastHeartbeatAge
-                    << "elapsedMovingAverage:" << elapsedMovingAverage
-                    << "PREVIOUS maxElapsed:" << _maxElapsed
-                    << "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **"
-                    << "maxElapsedAverage:" << _maxElapsedAverage
-                    << "samples:" << _movingAverage.getSamples();
-#endif
-                _maxElapsed = lastHeartbeatAge;
-            }
-
-#if !defined(NDEBUG)
-            if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) {
-                qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
-                    << "lastHeartbeatAge:" << lastHeartbeatAge
-                    << "elapsedMovingAverage:" << elapsedMovingAverage << "** OVER EXPECTED VALUE **"
-                    << "maxElapsed:" << _maxElapsed
-                    << "maxElapsedAverage:" << _maxElapsedAverage
-                    << "samples:" << _movingAverage.getSamples();
-            }
-#endif
-
-            if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) {
-                qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- "
-                         << "lastHeartbeatAge:" << lastHeartbeatAge
-                         << "[ lastHeartbeat :" << lastHeartbeat
-                         << "now:" << now << " ]"
-                         << "elapsedMovingAverage:" << elapsedMovingAverage
-                         << "maxElapsed:" << _maxElapsed
-                         << "maxElapsedAverage:" << _maxElapsedAverage
-                         << "samples:" << _movingAverage.getSamples();
-
-                // Don't actually crash in debug builds, in case this apparent deadlock is simply from
-                // the developer actively debugging code
-                #ifdef NDEBUG
-                deadlockDetectionCrash();
-                #endif
-            }
-        }
-    }
-
-    static std::atomic<bool> _paused;
-    static std::atomic<uint64_t> _heartbeat;
-    static std::atomic<uint64_t> _maxElapsed;
-    static std::atomic<int> _maxElapsedAverage;
-    static ThreadSafeMovingAverage<int, HEARTBEAT_SAMPLES> _movingAverage;
-
-    bool _quit { false };
-
-    Qt::HANDLE _mainThreadID = nullptr;
-};
-
-std::atomic<bool> DeadlockWatchdogThread::_paused;
-std::atomic<uint64_t> DeadlockWatchdogThread::_heartbeat;
-std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed;
-std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage;
-ThreadSafeMovingAverage<int, DeadlockWatchdogThread::HEARTBEAT_SAMPLES> DeadlockWatchdogThread::_movingAverage;
-
-#ifdef Q_OS_WIN
-static const UINT UWM_IDENTIFY_INSTANCES =
-    RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME"));
-static const UINT UWM_SHOW_APPLICATION =
-    RegisterWindowMessage("UWM_SHOW_APPLICATION_{71123FD6-3DA8-4DC1-9C27-8A12A6250CBA}_" + qgetenv("USERNAME"));
-
-class MyNativeEventFilter : public QAbstractNativeEventFilter {
-public:
-    static MyNativeEventFilter& getInstance() {
-        static MyNativeEventFilter staticInstance;
-        return staticInstance;
-    }
-
-    bool nativeEventFilter(const QByteArray &eventType, void* msg, long* result) Q_DECL_OVERRIDE {
-        if (eventType == "windows_generic_MSG") {
-            MSG* message = (MSG*)msg;
-
-            if (message->message == UWM_IDENTIFY_INSTANCES) {
-                *result = UWM_IDENTIFY_INSTANCES;
-                return true;
-            }
-
-            if (message->message == UWM_SHOW_APPLICATION) {
-                MainWindow* applicationWindow = qApp->getWindow();
-                if (applicationWindow->isMinimized()) {
-                    applicationWindow->showNormal();  // Restores to windowed or maximized state appropriately.
-                }
-                qApp->setActiveWindow(applicationWindow);  // Flashes the taskbar icon if not focus.
-                return true;
-            }
-
-            // Attempting to close MIDI interfaces of a hot-unplugged device can result in audio-driver deadlock.
-            // Detecting MIDI devices that have been added/removed after starting Inteface has been disabled.
-            // https://support.microsoft.com/en-us/help/4460006/midi-device-app-hangs-when-former-midi-api-is-used
-#if 0
-            if (message->message == WM_DEVICECHANGE) {
-                const float MIN_DELTA_SECONDS = 2.0f; // de-bounce signal
-                static float lastTriggerTime = 0.0f;
-                const float deltaSeconds = secTimestampNow() - lastTriggerTime;
-                lastTriggerTime = secTimestampNow();
-                if (deltaSeconds > MIN_DELTA_SECONDS) {
-                    Midi::USBchanged();                // re-scan the MIDI bus
-                }
-            }
-#endif
-        }
-        return false;
-    }
-};
-#endif
+const QString DEFAULT_CURSOR_NAME = "SYSTEM";
 
-class LambdaEvent : public QEvent {
-    std::function<void()> _fun;
-public:
-    LambdaEvent(const std::function<void()> & fun) :
-    QEvent(static_cast<QEvent::Type>(ApplicationEvent::Lambda)), _fun(fun) {
-    }
-    LambdaEvent(std::function<void()> && fun) :
-    QEvent(static_cast<QEvent::Type>(ApplicationEvent::Lambda)), _fun(fun) {
-    }
-    void call() const { _fun(); }
-};
+Setting::Handle<int> sessionRunTime { "sessionRunTime", 0 };
 
 void messageHandler(QtMsgType type, const QMessageLogContext& context, const QString& message) {
     QString logMessage = LogHandler::getInstance().printMessage((LogMsgType) type, context, message);
@@ -606,2050 +201,841 @@ void messageHandler(QtMsgType type, const QMessageLogContext& context, const QSt
     }
 }
 
-
-class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
-public:
-    virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) override {
-        bool success;
-        if (auto nestable = DependencyManager::get<SpatialParentFinder>()->find(uuid, success).lock()) {
-            auto type = nestable->getNestableType();
-#ifdef SCRIPTABLE_MESH_DEBUG
-            qCDebug(interfaceapp) << "ApplicationMeshProvider::lookupModelProvider" << uuid << SpatiallyNestable::nestableTypeToString(type);
+Application::Application(
+    int& argc, char** argv,
+    const QCommandLineParser& parser,
+    QElapsedTimer& startupTimer
+) :
+    QApplication(argc, argv),
+    _window(new MainWindow(desktop())),
+    // Menu needs to be initialized before other initializers. Otherwise deadlock happens on qApp->getWindow()->menuBar().
+    _isMenuInitialized(initMenu()),
+#ifndef Q_OS_ANDROID
+    _logger(new FileLogger(this)),
 #endif
-            switch (type) {
-            case NestableType::Entity:
-                return getEntityModelProvider(static_cast<EntityItemID>(uuid));
-            case NestableType::Avatar:
-                return getAvatarModelProvider(uuid);
-            }
-        }
-        return nullptr;
-    }
+    _sessionRunTimer(startupTimer),
+    _lastNackTime(usecTimestampNow()),
+    _lastSendDownstreamAudioStats(usecTimestampNow()),
+    _firstRun(Settings::firstRun, true),
+    _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION),
+    // UI
+    _hmdTabletScale("hmdTabletScale", DEFAULT_HMD_TABLET_SCALE_PERCENT),
+    _desktopTabletScale("desktopTabletScale", DEFAULT_DESKTOP_TABLET_SCALE_PERCENT),
+    _desktopTabletBecomesToolbarSetting("desktopTabletBecomesToolbar", DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR),
+    _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
+    _preferStylusOverLaserSetting("preferStylusOverLaser", DEFAULT_PREFER_STYLUS_OVER_LASER),
+    _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),
+    _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
+    _awayStateWhenFocusLostInVREnabled("awayStateWhenFocusLostInVREnabled", DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED),
+    _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),
+    _miniTabletEnabledSetting("miniTabletEnabled", DEFAULT_MINI_TABLET_ENABLED),
+    // Entities
+    _maxOctreePacketsPerSecond("maxOctreePPS", DEFAULT_MAX_OCTREE_PPS),
+    _maxOctreePPS(_maxOctreePacketsPerSecond.get()),
+    // Camera
+    _fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES)
+{
+    setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
 
-private:
-    scriptable::ModelProviderPointer getEntityModelProvider(EntityItemID entityID) {
-        scriptable::ModelProviderPointer provider;
-        auto entityTreeRenderer = qApp->getEntities();
-        auto entityTree = entityTreeRenderer->getTree();
-        if (auto entity = entityTree->findEntityByID(entityID)) {
-            if (auto renderer = entityTreeRenderer->renderableForEntityId(entityID)) {
-                provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(renderer);
-                provider->modelProviderType = NestableType::Entity;
-            } else {
-                qCWarning(interfaceapp) << "no renderer for entity ID" << entityID.toString();
-            }
-        }
-        return provider;
-    }
+    LogHandler::getInstance().moveToThread(thread());
+    LogHandler::getInstance().setupRepeatedMessageFlusher();
+    qInstallMessageHandler(messageHandler);
 
-    scriptable::ModelProviderPointer getAvatarModelProvider(QUuid sessionUUID) {
-        scriptable::ModelProviderPointer provider;
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        if (auto avatar = avatarManager->getAvatarBySessionID(sessionUUID)) {
-            provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(avatar);
-            provider->modelProviderType = NestableType::Avatar;
-        }
-        return provider;
-    }
-};
-
-/*@jsdoc
- * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property
- * values are integer IDs, uniquely identifying each output. <em>Read-only.</em></p>
- * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject}
- * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or
- * <code>0.0</code> for "false".</p>
- * <table>
- *   <thead>
- *     <tr><th>Property</th><th>Type</th><th>Data</th><th>Description</th></tr>
- *   </thead>
- *   <tbody>
- *     <tr><td><code>CameraFirstPerson</code></td><td>number</td><td>number</td><td>The camera is in first-person mode.
- *       <em>Legacy first person camera mode.</em></td></tr>
- *     <tr><td><code>CameraFirstPersonLookAt</code></td><td>number</td><td>number</td><td>The camera is in first-person mode.
- *       <em>Default first person camera mode.</em></td></tr>
- *     <tr><td><code>CameraThirdPerson</code></td><td>number</td><td>number</td><td>The camera is in third-person mode.
- *       <em>Legacy third person camera mode.</em></td></tr>
- *     <tr><td><code>CameraLookAt</code></td><td>number</td><td>number</td><td>The camera is in third-person mode.
- *       <em>Default third person camera mode.</em></td></tr>
- *     <tr><td><code>CameraFSM</code></td><td>number</td><td>number</td><td>The camera is in full screen mirror mode.
- *       <em>Legacy "look at myself" behavior.</em></td></tr>
- *     <tr><td><code>CameraSelfie</code></td><td>number</td><td>number</td><td>The camera is in selfie mode.
- *       <em>Default "look at myself" camera mode.</em></td></tr>
- *     <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr>
- *     <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr>
- *     <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr>
- *     <tr><td><code>CaptureMouse</code></td><td>number</td><td>number</td><td>The mouse is captured.  In this mode,
- *       the mouse is invisible and cannot leave the bounds of Interface, as long as Interface is the active window and
- *       no menu item is selected.</td></tr>
- *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are
- *       enabled.</td></tr>
- *     <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr>
- *     <tr><td><code>LeftHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to left.</td></tr>
- *     <tr><td><code>RightHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to right.</td></tr>
- *     <tr><td><code>SnapTurn</code></td><td>number</td><td>number</td><td>Snap turn is enabled.</td></tr>
- *     <tr><td><code>Grounded</code></td><td>number</td><td>number</td><td>The user's avatar is on the ground.</td></tr>
- *     <tr><td><code>NavigationFocused</code></td><td>number</td><td>number</td><td><em>Not used.</em></td></tr>
- *     <tr><td><code>PlatformWindows</code></td><td>number</td><td>number</td><td>The operating system is Windows.</td></tr>
- *     <tr><td><code>PlatformMac</code></td><td>number</td><td>number</td><td>The operating system is Mac.</td></tr>
- *     <tr><td><code>PlatformAndroid</code></td><td>number</td><td>number</td><td>The operating system is Android.</td></tr>
- *   </tbody>
- * </table>
- * @typedef {object} Controller.Hardware-Application
- */
-
-static const QString STATE_IN_HMD = "InHMD";
-static const QString STATE_CAMERA_FULL_SCREEN_MIRROR = "CameraFSM";
-static const QString STATE_CAMERA_FIRST_PERSON = "CameraFirstPerson";
-static const QString STATE_CAMERA_FIRST_PERSON_LOOK_AT = "CameraFirstPersonLookat";
-static const QString STATE_CAMERA_THIRD_PERSON = "CameraThirdPerson";
-static const QString STATE_CAMERA_ENTITY = "CameraEntity";
-static const QString STATE_CAMERA_INDEPENDENT = "CameraIndependent";
-static const QString STATE_CAMERA_LOOK_AT = "CameraLookAt";
-static const QString STATE_CAMERA_SELFIE = "CameraSelfie";
-static const QString STATE_SNAP_TURN = "SnapTurn";
-static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement";
-static const QString STATE_GROUNDED = "Grounded";
-static const QString STATE_NAV_FOCUSED = "NavigationFocused";
-static const QString STATE_PLATFORM_WINDOWS = "PlatformWindows";
-static const QString STATE_PLATFORM_MAC = "PlatformMac";
-static const QString STATE_PLATFORM_ANDROID = "PlatformAndroid";
-static const QString STATE_LEFT_HAND_DOMINANT = "LeftHandDominant";
-static const QString STATE_RIGHT_HAND_DOMINANT = "RightHandDominant";
-static const QString STATE_STRAFE_ENABLED = "StrafeEnabled";
-static const QString STATE_CAPTURE_MOUSE = "CaptureMouse";
-
-// Statically provided display and input plugins
-extern DisplayPluginList getDisplayPlugins();
-extern InputPluginList getInputPlugins();
-extern void saveInputPluginSettings(const InputPluginList& plugins);
-
-bool setupEssentials(const QCommandLineParser& parser, bool runningMarkerExisted) {
-
-
-
-    const int listenPort = parser.isSet("listenPort") ? parser.value("listenPort").toInt() : INVALID_PORT;
-
-    bool suppressPrompt = parser.isSet("suppress-settings-reset");
-
-    // set the OCULUS_STORE property so the oculus plugin can know if we ran from the Oculus Store
-    qApp->setProperty(hifi::properties::OCULUS_STORE, parser.isSet("oculus-store"));
-
-    // emulate standalone device
-    qApp->setProperty(hifi::properties::STANDALONE, parser.isSet("standalone"));
-
-    // Ignore any previous crashes if running from command line with a test script.
-    bool inTestMode = parser.isSet("testScript");
-
-    bool previousSessionCrashed { false };
-    if (!inTestMode) {
-        // TODO: FIX
-        previousSessionCrashed = CrashRecoveryHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt);
+    DependencyManager::set<PathUtils>();
+}
+
+Application::~Application() {
+    // remove avatars from physics engine
+    if (auto avatarManager = DependencyManager::get<AvatarManager>()) {
+        // AvatarManager may not yet exist in case of an early exit
+
+        avatarManager->clearOtherAvatars();
+        auto myCharacterController = getMyAvatar()->getCharacterController();
+        myCharacterController->clearDetailedMotionStates();
+
+        PhysicsEngine::Transaction transaction;
+        avatarManager->buildPhysicsTransaction(transaction);
+        _physicsEngine->processTransaction(transaction);
+        avatarManager->handleProcessedPhysicsTransaction(transaction);
+        avatarManager->deleteAllAvatars();
     }
 
-    // get dir to use for cache
-    if (parser.isSet("cache")) {
-        qApp->setProperty(hifi::properties::APP_LOCAL_DATA_PATH, parser.value("cache"));
+    if (_physicsEngine) {
+        _physicsEngine->setCharacterController(nullptr);
     }
 
-    {
-        const QString resourcesBinaryFile = PathUtils::getRccPath();
-        qCInfo(interfaceapp) << "Loading primary resources from" << resourcesBinaryFile;
+    // the _shapeManager should have zero references
+    _shapeManager.collectGarbage();
+    assert(_shapeManager.getNumShapes() == 0);
 
-        if (!QFile::exists(resourcesBinaryFile)) {
-            throw std::runtime_error(QString("Unable to find primary resources from '%1'").arg(resourcesBinaryFile).toStdString());
-        }
-        if (!QResource::registerResource(resourcesBinaryFile)) {
-            throw std::runtime_error(QString("Unable to load primary resources from '%1'").arg(resourcesBinaryFile).toStdString());
-        }
+    if (_graphicsEngine) {
+        // shutdown graphics engine
+        _graphicsEngine->shutdown();
     }
 
+    _gameWorkload.shutdown();
 
+    DependencyManager::destroy<Preferences>();
+    PlatformHelper::shutdown();
 
-    DependencyManager::set<ScriptInitializers>();
+    if (_entityClipboard) {
+        _entityClipboard->eraseAllOctreeElements();
+        _entityClipboard.reset();
+    }
 
-    // Tell the plugin manager about our statically linked plugins
-    auto pluginManager = PluginManager::getInstance();
-    if (auto steamClient = pluginManager->getSteamClientPlugin()) {
-        steamClient->init();
+    if (_octreeProcessor) {
+        _octreeProcessor->terminate();
     }
-    if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
-        oculusPlatform->init();
+
+    if (_entityEditSender) {
+        _entityEditSender->terminate();
     }
 
+    if (auto pluginManager = PluginManager::getInstance()) {
+        if (auto steamClient = pluginManager->getSteamClientPlugin()) {
+            steamClient->shutdown();
+        }
 
-    PROFILE_SET_THREAD_NAME("Main Thread");
-
-#if defined(Q_OS_WIN)
-    // Select appropriate audio DLL
-    QString audioDLLPath = QCoreApplication::applicationDirPath();
-    if (IsWindows8OrGreater()) {
-        audioDLLPath += "/audioWin8";
-    } else {
-        audioDLLPath += "/audioWin7";
-    }
-    QCoreApplication::addLibraryPath(audioDLLPath);
-#endif
-
-    QString defaultScriptsOverrideOption = parser.value("defaultScriptsOverride");
-
-    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
-    DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>();
-    DependencyManager::registerInheritance<EntityDynamicFactoryInterface, InterfaceDynamicFactory>();
-    DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
-
-    // Set dependencies
-    DependencyManager::set<PickManager>();
-    DependencyManager::set<PointerManager>();
-    DependencyManager::set<RayPickScriptingInterface>();
-    DependencyManager::set<PointerScriptingInterface>();
-    DependencyManager::set<PickScriptingInterface>();
-    DependencyManager::set<Cursor::Manager>();
-    DependencyManager::set<VirtualPad::Manager>();
-    DependencyManager::set<DesktopPreviewProvider>();
-#if defined(Q_OS_ANDROID)
-    DependencyManager::set<AccountManager>(true); // use the default user agent getter
-#else
-    DependencyManager::set<AccountManager>(true, std::bind(&Application::getUserAgent, qApp));
-#endif
-    DependencyManager::set<DomainAccountManager>();
-    DependencyManager::set<StatTracker>();
-    DependencyManager::set<ScriptEngines>(ScriptManager::CLIENT_SCRIPT, defaultScriptsOverrideOption);
-    DependencyManager::set<Preferences>();
-    DependencyManager::set<recording::Deck>();
-    DependencyManager::set<recording::Recorder>();
-    DependencyManager::set<AddressManager>();
-    DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
-    DependencyManager::set<recording::ClipCache>();
-    DependencyManager::set<GeometryCache>();
-    DependencyManager::set<ModelFormatRegistry>(); // ModelFormatRegistry must be defined before ModelCache. See the ModelCache constructor.
-    DependencyManager::set<ModelCache>();
-    DependencyManager::set<ModelCacheScriptingInterface>();
-    DependencyManager::set<ScriptCache>();
-    DependencyManager::set<SoundCache>();
-    DependencyManager::set<SoundCacheScriptingInterface>();
-    DependencyManager::set<AudioClient>();
-    DependencyManager::set<AudioScope>();
-    DependencyManager::set<DeferredLightingEffect>();
-    DependencyManager::set<TextureCache>();
-    DependencyManager::set<MaterialCache>();
-    DependencyManager::set<TextureCacheScriptingInterface>();
-    DependencyManager::set<MaterialCacheScriptingInterface>();
-    DependencyManager::set<FramebufferCache>();
-    DependencyManager::set<AnimationCache>();
-    DependencyManager::set<AnimationCacheScriptingInterface>();
-    DependencyManager::set<ModelBlender>();
-    DependencyManager::set<UsersScriptingInterface>();
-    DependencyManager::set<AvatarManager>();
-    DependencyManager::set<LODManager>();
-    DependencyManager::set<StandAloneJSConsole>();
-    DependencyManager::set<DialogsManager>();
-    DependencyManager::set<ResourceCacheSharedItems>();
-    DependencyManager::set<DesktopScriptingInterface>();
-    DependencyManager::set<EntityScriptingInterface>(true);
-    DependencyManager::set<GraphicsScriptingInterface>();
-    DependencyManager::registerInheritance<scriptable::ModelProviderFactory, ApplicationMeshProvider>();
-    DependencyManager::set<ApplicationMeshProvider>();
-    DependencyManager::set<RecordingScriptingInterface>();
-    DependencyManager::set<WindowScriptingInterface>();
-    DependencyManager::set<HMDScriptingInterface>();
-    DependencyManager::set<ResourceScriptingInterface>();
-    DependencyManager::set<TabletScriptingInterface>();
-    DependencyManager::set<InputConfiguration>();
-    DependencyManager::set<ToolbarScriptingInterface>();
-    DependencyManager::set<UserActivityLoggerScriptingInterface>();
-    DependencyManager::set<AssetMappingsScriptingInterface>();
-    DependencyManager::set<DomainConnectionModel>();
-
-#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
-    DependencyManager::set<SpeechRecognizer>();
-#endif
-    DependencyManager::set<DiscoverabilityManager>();
-    DependencyManager::set<SceneScriptingInterface>();
-#if !defined(DISABLE_QML)
-    DependencyManager::set<OffscreenUi>();
-    {
-        auto window = DependencyManager::get<OffscreenUi>()->getWindow();
-        auto desktopScriptingInterface = DependencyManager::get<DesktopScriptingInterface>();
-        QObject::connect(window, &QQuickWindow::focusObjectChanged, [desktopScriptingInterface](QObject *object) {
-            if (object) {
-                if (object->objectName() == QString("desktop")) {
-                    emit desktopScriptingInterface->uiFocusChanged(false);
-                    return;
-                }
-                // Signal with empty object name happens in addition to regular named ones and is not necessary here
-                if (!object->objectName().isEmpty()) {
-                    emit desktopScriptingInterface->uiFocusChanged(true);
-                }
-            }
-        });
-    }
-#endif
-    DependencyManager::set<Midi>();
-    DependencyManager::set<PathUtils>();
-    DependencyManager::set<InterfaceDynamicFactory>();
-    DependencyManager::set<AudioInjectorManager>();
-    DependencyManager::set<MessagesClient>();
-    controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR,
-                    STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_FIRST_PERSON_LOOK_AT, STATE_CAMERA_THIRD_PERSON,
-                    STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE, STATE_CAPTURE_MOUSE,
-                    STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED,
-                    STATE_PLATFORM_WINDOWS, STATE_PLATFORM_MAC, STATE_PLATFORM_ANDROID, STATE_LEFT_HAND_DOMINANT, STATE_RIGHT_HAND_DOMINANT, STATE_STRAFE_ENABLED } });
-    DependencyManager::set<UserInputMapper>();
-    DependencyManager::set<controller::ScriptingInterface, ControllerScriptingInterface>();
-    DependencyManager::set<InterfaceParentFinder>();
-    DependencyManager::set<EntityTreeRenderer>(true, qApp, qApp);
-    DependencyManager::set<CompositorHelper>();
-    DependencyManager::set<OffscreenQmlSurfaceCache>();
-    DependencyManager::set<EntityScriptClient>();
-
-    DependencyManager::set<EntityScriptServerLogClient>();
-    auto scriptEngines = DependencyManager::get<ScriptEngines>();
-    auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
-    QObject::connect(scriptEngines.data(), &ScriptEngines::requestingEntityScriptServerLog, entityScriptServerLog.data(), &EntityScriptServerLogClient::requestMessagesForScriptEngines);
-
-    DependencyManager::set<GooglePolyScriptingInterface>();
-    DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
-    DependencyManager::set<AvatarBookmarks>();
-    DependencyManager::set<LocationBookmarks>();
-    DependencyManager::set<Snapshot>();
-    DependencyManager::set<CloseEventSender>();
-    DependencyManager::set<ResourceManager>();
-    DependencyManager::set<SelectionScriptingInterface>();
-    DependencyManager::set<TTSScriptingInterface>();
-
-    DependencyManager::set<FadeEffect>();
-    DependencyManager::set<ResourceRequestObserver>();
-    DependencyManager::set<Keyboard>();
-    DependencyManager::set<KeyboardScriptingInterface>();
-    DependencyManager::set<GrabManager>();
-    DependencyManager::set<AvatarPackager>();
-    DependencyManager::set<ScreenshareScriptingInterface>();
-    PlatformHelper::setup();
-
-    QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
-        QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
-        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "noteAwakening", Qt::QueuedConnection);
-    });
-
-
-    QString setBookmarkValue = parser.value("setBookmark");
-    if (!setBookmarkValue.isEmpty()) {
-        // Bookmarks are expected to be in a name=url form.
-        // An `=` character in the name or url is unsupported.
-        auto parts = setBookmarkValue.split("=");
-        if (parts.length() != 2) {
-            qWarning() << "Malformed setBookmark argument: " << setBookmarkValue;
-        } else {
-            qDebug() << "Setting bookmark" << parts[0] << "to" << parts[1];
-            DependencyManager::get<LocationBookmarks>()->insert(parts[0], parts[1]);
+        if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
+            oculusPlatform->shutdown();
         }
     }
 
-    return previousSessionCrashed;
-}
-
-// FIXME move to header, or better yet, design some kind of UI manager
-// to take care of highlighting keyboard focused items, rather than
-// continuing to overburden Application.cpp
-QUuid _keyboardFocusHighlightID;
-
-OffscreenGLCanvas* _qmlShareContext { nullptr };
-
-// FIXME hack access to the internal share context for the Chromium helper
-// Normally we'd want to use QWebEngine::initialize(), but we can't because
-// our primary context is a QGLWidget, which can't easily be initialized to share
-// from a QOpenGLContext.
-//
-// So instead we create a new offscreen context to share with the QGLWidget,
-// and manually set THAT to be the shared context for the Chromium helper
-#if !defined(DISABLE_QML)
-OffscreenGLCanvas* _chromiumShareContext { nullptr };
-#endif
+    DependencyManager::destroy<PluginManager>();
 
-Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context);
-Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
+    DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache
 
-Setting::Handle<int> sessionRunTime{ "sessionRunTime", 0 };
+    DependencyManager::destroy<SoundCacheScriptingInterface>();
 
-const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.0f;
-const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
-const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
-const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
-const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
-const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
-const QString DEFAULT_CURSOR_NAME = "SYSTEM";
-const bool DEFAULT_MINI_TABLET_ENABLED = false;
-const bool DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED = true;
+    DependencyManager::destroy<AudioInjectorManager>();
+    DependencyManager::destroy<AvatarManager>();
+    DependencyManager::destroy<AnimationCacheScriptingInterface>();
+    DependencyManager::destroy<AnimationCache>();
+    DependencyManager::destroy<FramebufferCache>();
+    DependencyManager::destroy<MaterialCacheScriptingInterface>();
+    DependencyManager::destroy<MaterialCache>();
+    DependencyManager::destroy<TextureCacheScriptingInterface>();
+    DependencyManager::destroy<TextureCache>();
+    DependencyManager::destroy<ModelCacheScriptingInterface>();
+    DependencyManager::destroy<ModelCache>();
+    DependencyManager::destroy<ModelFormatRegistry>();
+    DependencyManager::destroy<ScriptCache>();
+    DependencyManager::destroy<SoundCacheScriptingInterface>();
+    DependencyManager::destroy<SoundCache>();
+    DependencyManager::destroy<OctreeStatsProvider>();
+    DependencyManager::destroy<GeometryCache>();
+    DependencyManager::destroy<ScreenshareScriptingInterface>();
 
-QSharedPointer<OffscreenUi> getOffscreenUI() {
-#if !defined(DISABLE_QML)
-    return DependencyManager::get<OffscreenUi>();
-#else
-    return nullptr;
-#endif
-}
+    if (auto resourceManager = DependencyManager::get<ResourceManager>()) {
+        resourceManager->cleanup();
+    }
 
-bool Application::initMenu() {
-    _isMenuInitialized = false;
-    qApp->getWindow()->menuBar();
-    return true;
-}
+    // remove the NodeList from the DependencyManager
+    DependencyManager::destroy<NodeList>();
 
-Application::Application(
-    int& argc, char** argv,
-    const QCommandLineParser& parser,
-    QElapsedTimer& startupTimer
-) :
-    QApplication(argc, argv),
-    _window(new MainWindow(desktop())),
-    // Menu needs to be initialized before other initializers. Otherwise deadlock happens on qApp->getWindow()->menuBar().
-    _isMenuInitialized(initMenu()),
-    _sessionRunTimer(startupTimer),
-#ifndef Q_OS_ANDROID
-    _logger(new FileLogger(this)),
+#if 0
+    ConnexionClient::getInstance().destroy();
 #endif
-    _previousSessionCrashed(false), //setupEssentials(parser, false)),
-    _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION),
-    _fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES),
-    _hmdTabletScale("hmdTabletScale", DEFAULT_HMD_TABLET_SCALE_PERCENT),
-    _desktopTabletScale("desktopTabletScale", DEFAULT_DESKTOP_TABLET_SCALE_PERCENT),
-    _firstRun(Settings::firstRun, true),
-    _desktopTabletBecomesToolbarSetting("desktopTabletBecomesToolbar", DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR),
-    _hmdTabletBecomesToolbarSetting("hmdTabletBecomesToolbar", DEFAULT_HMD_TABLET_BECOMES_TOOLBAR),
-    _preferStylusOverLaserSetting("preferStylusOverLaser", DEFAULT_PREFER_STYLUS_OVER_LASER),
-    _preferAvatarFingerOverStylusSetting("preferAvatarFingerOverStylus", DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS),
-    _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
-    _awayStateWhenFocusLostInVREnabled("awayStateWhenFocusLostInVREnabled", DEFAULT_AWAY_STATE_WHEN_FOCUS_LOST_IN_VR_ENABLED),
-    _preferredCursor("preferredCursor", DEFAULT_CURSOR_NAME),
-    _miniTabletEnabledSetting("miniTabletEnabled", DEFAULT_MINI_TABLET_ENABLED),
-    _scaleMirror(1.0f),
-    _mirrorYawOffset(0.0f),
-    _raiseMirror(0.0f),
-    _enableProcessOctreeThread(true),
-    _lastNackTime(usecTimestampNow()),
-    _lastSendDownstreamAudioStats(usecTimestampNow()),
-    _notifiedPacketVersionMismatchThisDomain(false),
-    _maxOctreePPS(maxOctreePacketsPerSecond.get()),
-    _snapshotSound(nullptr),
-    _sampleSound(nullptr)
-{
-    setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
+    // The window takes ownership of the menu, so this has the side effect of destroying it.
+    _window->setMenuBar(nullptr);
 
-    LogHandler::getInstance().moveToThread(thread());
-    LogHandler::getInstance().setupRepeatedMessageFlusher();
-    qInstallMessageHandler(messageHandler);
+    _window->deleteLater();
 
-    DependencyManager::set<PathUtils>();
-}
+    // make sure that the quit event has finished sending before we take the application down
+    if (auto closeEventSender = DependencyManager::get<CloseEventSender>()) {
+        while (!closeEventSender->hasFinishedQuitEvent() && !closeEventSender->hasTimedOutQuitEvent()) {
+            // sleep a little so we're not spinning at 100%
+            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+        }
+        // quit the thread used by the closure event sender
+        closeEventSender->thread()->quit();
+    }
 
-void Application::initializePluginManager(const QCommandLineParser& parser) {
-    DependencyManager::set<PluginManager>();
-    auto pluginManager = PluginManager::getInstance();
+    // Can't log to file past this point, FileLogger about to be deleted
+    qInstallMessageHandler(LogHandler::verboseMessageHandler);
 
-    // To avoid any confusion: the getInputPlugins and getDisplayPlugins are not the ones
-    // from PluginManager, but functions exported by input-plugins/InputPlugin.cpp and
-    // display-plugins/DisplayPlugin.cpp.
+#ifdef Q_OS_MAC
+    // 26 Feb 2021 - Tried re-enabling this call but OSX still crashes on exit.
     //
-    // These functions provide the plugin manager with static default plugins.
-    pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
-    pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
-    pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
-
-
-    // This must be a member function -- PluginManager must exist, and for that
-    // QApplication must exist, or it can't find the plugin path, as QCoreApplication:applicationDirPath
-    // won't work yet.
+    // 10/16/2019 - Disabling this call. This causes known crashes (A), and it is not
+    // fully understood whether it might cause other unknown crashes (B).
+    //
+    // (A) Although we try to shutdown the ScriptEngine threads in onAboutToQuit, there is
+    // currently no guarantee that they have stopped. Waiting on them to stop has so far appeared to
+    // never return on Mac, causing the application to hang on shutdown. Because ScriptEngines
+    // may still be running, they may end up receiving events that are triggered from this processEvents call,
+    // and then try to access resources that are no longer available at this point in time.
+    // If the ScriptEngine threads were fully destroyed before getting here, this would
+    // not be an issue.
+    //
+    // (B) It seems likely that a bunch of potential event handlers are dependent on Application
+    // and other common dependencies to be available and not destroyed or in the middle of being
+    // destroyed.
 
-    if (parser.isSet("display")) {
-        auto preferredDisplays = parser.value("display").split(',', Qt::SkipEmptyParts);
-        qInfo() << "Setting prefered display plugins:" << preferredDisplays;
-        PluginManager::getInstance()->setPreferredDisplayPlugins(preferredDisplays);
-    }
 
-    if (parser.isSet("disableDisplayPlugins")) {
-        auto disabledDisplays = parser.value("disableDisplayPlugins").split(',', Qt::SkipEmptyParts);
-        qInfo() << "Disabling following display plugins:"  << disabledDisplays;
-        PluginManager::getInstance()->disableDisplays(disabledDisplays);
-    }
+    // Clear the event queue before application is totally destructed.
+    // This will drain the messasge queue of pending "deleteLaters" queued up
+    // during shutdown of the script engines.
+    // We do this here because there is a possiblty that [NSApplication terminate:]
+    // will be called during processEvents which will invoke all static destructors.
+    // We want to postpone this utill the last possible moment.
+    //QCoreApplication::processEvents();
+#endif
+}
 
-    if (parser.isSet("disableInputPlugins")) {
-        auto disabledInputs = parser.value("disableInputPlugins").split(',', Qt::SkipEmptyParts);
-        qInfo() << "Disabling following input plugins:" << disabledInputs;
-        PluginManager::getInstance()->disableInputs(disabledInputs);
+bool Application::isServerlessMode() const {
+    auto tree = getEntities()->getTree();
+    if (tree) {
+        return tree->isServerlessMode();
     }
 
+    return false;
 }
 
-void Application::initialize(const QCommandLineParser &parser) {
-
-    //qCDebug(interfaceapp) << "Setting up essentials";
-    setupEssentials(parser, _previousSessionCrashed);
-    qCDebug(interfaceapp) << "Initializing application";
-
-    _entitySimulation = std::make_shared<PhysicalEntitySimulation>();
-    _physicsEngine = std::make_shared<PhysicsEngine>(Vectors::ZERO);
-    _entityClipboard = std::make_shared<EntityTree>();
-    _octreeProcessor = std::make_shared<OctreePacketProcessor>();
-    _entityEditSender = std::make_shared<EntityEditPacketSender>();
-    _graphicsEngine = std::make_shared<GraphicsEngine>();
-    _applicationOverlay = std::make_shared<ApplicationOverlay>();
-
+QString Application::getUserAgent() {
+    if (QThread::currentThread() != thread()) {
+        QString userAgent;
 
+        BLOCKING_INVOKE_METHOD(this, "getUserAgent", Q_RETURN_ARG(QString, userAgent));
 
-    auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
-    setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
+        return userAgent;
+    }
 
+    QString userAgent = NetworkingConstants::OVERTE_USER_AGENT + "/" + BuildInfo::VERSION + "; "
+        + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")";
 
-    {
-        if (parser.isSet("testScript")) {
-                QString testScriptPath = parser.value("testScript");
-                // If the URL scheme is http(s) or ftp, then use as is, else - treat it as a local file
-                // This is done so as not break previous command line scripts
-                if (testScriptPath.left(HIFI_URL_SCHEME_HTTP.length()) == HIFI_URL_SCHEME_HTTP ||
-                    testScriptPath.left(HIFI_URL_SCHEME_FTP.length()) == HIFI_URL_SCHEME_FTP) {
-
-                    setProperty(hifi::properties::TEST, QUrl::fromUserInput(testScriptPath));
-                } else if (QFileInfo(testScriptPath).exists()) {
-                    setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath));
-                }
+    auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-");  };
 
-                if (parser.isSet("quitWhenFinished")) {
-                    quitWhenFinished = true;
-                }
+    // For each plugin, add to userAgent
+    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+    for (const auto& dp : displayPlugins) {
+        if (dp->isActive() && dp->isHmd()) {
+            userAgent += " " + formatPluginName(dp->getName());
         }
-        if (parser.isSet("testResultsLocation")) {
-            // Set test snapshot location only if it is a writeable directory
-            QString path = parser.value("testResultsLocation");
-
-            QFileInfo fileInfo(path);
-            if (fileInfo.isDir() && fileInfo.isWritable()) {
-                TestScriptingInterface::getInstance()->setTestResultsLocation(path);
-            }
+    }
+    const auto& inputPlugins = PluginManager::getInstance()->getInputPlugins();
+    for (const auto& ip : inputPlugins) {
+        if (ip->isActive()) {
+            userAgent += " " + formatPluginName(ip->getName());
         }
-        _urlParam = parser.value("url");
     }
-
-    {
-        // identify gpu as early as possible to help identify OpenGL initialization errors.
-        auto gpuIdent = GPUIdent::getInstance();
-        auto &ch = CrashHandler::getInstance();
-
-        ch.setAnnotation("sentry[contexts][gpu][name]", gpuIdent->getName().toStdString());
-        ch.setAnnotation("sentry[contexts][gpu][version]", gpuIdent->getDriver().toStdString());
-        ch.setAnnotation("gpu_memory", std::to_string(gpuIdent->getMemory()));
+    // for codecs, we include all of them, even if not active
+    const auto& codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    for (const auto& cp : codecPlugins) {
+        userAgent += " " + formatPluginName(cp->getName());
     }
 
-    // make sure the debug draw singleton is initialized on the main thread.
-    DebugDraw::getInstance().removeMarker("");
-
-    PluginContainer* pluginContainer = dynamic_cast<PluginContainer*>(this); // set the container for any plugins that care
-    PluginManager::getInstance()->setContainer(pluginContainer);
-
-    QThreadPool::globalInstance()->setMaxThreadCount(MIN_PROCESSING_THREAD_POOL_SIZE);
-    thread()->setPriority(QThread::HighPriority);
-    thread()->setObjectName("Main Thread");
-
-    setInstance(this);
-
-    auto controllerScriptingInterface = DependencyManager::get<controller::ScriptingInterface>().data();
-    _controllerScriptingInterface = dynamic_cast<ControllerScriptingInterface*>(controllerScriptingInterface);
-    connect(PluginManager::getInstance().data(), &PluginManager::inputDeviceRunningChanged,
-        controllerScriptingInterface, &controller::ScriptingInterface::updateRunningInputDevices);
-
-    EntityTree::setEntityClicksCapturedOperator([this] {
-        return _controllerScriptingInterface->areEntityClicksCaptured();
-    });
-
-    _entityClipboard->createRootElement();
-
-#ifdef Q_OS_WIN
-    installNativeEventFilter(&MyNativeEventFilter::getInstance());
-#endif
+    return userAgent;
+}
 
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/fontawesome-webfont.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/hifi-glyphs.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/AnonymousPro-Regular.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Light.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Regular.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/rawline-500.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf");
-    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Medium.ttf");
-    _window->setWindowTitle("Overte");
-
-    Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
+static const QString CONTENT_SET_NAME_QUERY_PARAM = "name";
+void Application::replaceDomainContent(const QString& url, const QString& itemName) {
+    qCDebug(interfaceapp) << "Attempting to replace domain content";
+    QUrl msgUrl(url);
+    QUrlQuery urlQuery(msgUrl.query());
+    urlQuery.addQueryItem(CONTENT_SET_NAME_QUERY_PARAM, itemName);
+    msgUrl.setQuery(urlQuery.query(QUrl::QUrl::FullyEncoded));
+    QByteArray urlData(msgUrl.toString(QUrl::QUrl::FullyEncoded).toUtf8());
+    auto limitedNodeList = DependencyManager::get<NodeList>();
+    const auto& domainHandler = limitedNodeList->getDomainHandler();
 
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->startThread();
-    nodeList->setFlagTimeForConnectionStep(true);
+    auto octreeFilePacket = NLPacket::create(PacketType::DomainContentReplacementFromUrl, urlData.size(), true);
+    octreeFilePacket->write(urlData);
+    limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr());
 
-    // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur
-    // before we tell MyAvatar to go to a new location in the new domain
     auto addressManager = DependencyManager::get<AddressManager>();
-    addressManager->moveToThread(nodeList->thread());
+    addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
+    QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
+    qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
+    DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
+}
 
-    if (parser.isSet("disableWatchdog")) {
-        DISABLE_WATCHDOG = true;
+void Application::openDirectory(const QString& path) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "openDirectory", Q_ARG(const QString&, path));
+        return;
     }
-    // Set up a watchdog thread to intentionally crash the application on deadlocks
-    if (!DISABLE_WATCHDOG) {
-        auto deadlockWatchdogThread = new DeadlockWatchdogThread();
-        deadlockWatchdogThread->setMainThreadID(QThread::currentThreadId());
-        connect(deadlockWatchdogThread, &QThread::started, [] { setThreadName("DeadlockWatchdogThread"); });
-        deadlockWatchdogThread->start();
-
-        // Pause the deadlock watchdog when we sleep, or it might
-        // trigger a false positive when we wake back up
-        auto platformHelper = PlatformHelper::instance();
-
-        connect(platformHelper, &PlatformHelper::systemWillSleep, [] {
-            DeadlockWatchdogThread::pause();
-        });
-
-        connect(platformHelper, &PlatformHelper::systemWillWake, [] {
-            DeadlockWatchdogThread::resume();
-        });
 
-        // Main thread timer to keep the watchdog updated
-        QTimer* watchdogUpdateTimer = new QTimer(this);
-        connect(watchdogUpdateTimer, &QTimer::timeout, [this] { updateHeartbeat(); });
-        connect(this, &QCoreApplication::aboutToQuit, [watchdogUpdateTimer] {
-            watchdogUpdateTimer->stop();
-            watchdogUpdateTimer->deleteLater();
-        });
-        watchdogUpdateTimer->setSingleShot(false);
-        watchdogUpdateTimer->setInterval(WATCHDOG_TIMER_TIMEOUT); // 100ms, Qt::CoarseTimer acceptable
-        watchdogUpdateTimer->start();
+    QString dirPath = path;
+#if defined(Q_OS_WIN)
+    const QString FILE_SCHEME = "file:///";
+#else
+    const QString FILE_SCHEME = "file://";
+#endif
+    if (dirPath.startsWith(FILE_SCHEME)) {
+        dirPath.remove(0, FILE_SCHEME.length());
     }
-
-    // Set File Logger Session UUID
-    auto avatarManager = DependencyManager::get<AvatarManager>();
-    auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
-    if (avatarManager) {
-        workload::SpacePointer space = getEntities()->getWorkloadSpace();
-        avatarManager->setSpace(space);
+    QFileInfo fileInfo(dirPath);
+    if (fileInfo.isDir()) {
+        auto scheme = QUrl(path).scheme();
+        QDesktopServices::unsetUrlHandler(scheme);
+        QDesktopServices::openUrl(path);
+        QDesktopServices::setUrlHandler(scheme, this, "showUrlHandler");
     }
-    auto accountManager = DependencyManager::get<AccountManager>();
+}
 
-    // set the account manager's root URL and trigger a login request if we don't have the access token
-    accountManager->setIsAgent(true);
-    accountManager->setAuthURL(MetaverseAPI::getCurrentMetaverseServerURL());
-    if (!accountManager->hasKeyPair()) {
-        accountManager->generateNewUserKeypair();
-    }
+void Application::forceLoginWithTokens(const QString& tokens) {
+    DependencyManager::get<AccountManager>()->setAccessTokens(tokens);
+    Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, true).set(true);
+}
 
-#ifndef Q_OS_ANDROID
-    _logger->setSessionID(accountManager->getSessionID());
-#endif
-
-    auto &ch = CrashHandler::getInstance();
-
-    ch.setAnnotation("metaverse_session_id", accountManager->getSessionID().toString().toStdString());
-    ch.setAnnotation("main_thread_id", std::to_string((size_t)QThread::currentThreadId()));
+void Application::setConfigFileURL(const QString& fileUrl) {
+    DependencyManager::get<AccountManager>()->setConfigFileURL(fileUrl);
+}
 
-    if (steamClient) {
-        qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID();
+void Application::loadAvatarScripts(const QVector<QString>& urls) {
+    auto scriptEngines = DependencyManager::get<ScriptEngines>();
+    auto runningScripts = scriptEngines->getRunningScripts();
+    for (auto url : urls) {
+        int index = runningScripts.indexOf(url);
+        if (index < 0) {
+            auto scriptEnginePointer = scriptEngines->loadScript(url, false);
+            if (scriptEnginePointer) {
+                scriptEnginePointer->setType(ScriptManager::Type::AVATAR);
+            }
+        }
     }
-    ch.setAnnotation("steam", property(hifi::properties::STEAM).toBool() ? "1" : "0");
-
-    qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
-    qCDebug(interfaceapp) << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
-    qCDebug(interfaceapp) << "[VERSION] VERSION:" << BuildInfo::VERSION;
-    qCDebug(interfaceapp) << "[VERSION] BUILD_TYPE_STRING:" << BuildInfo::BUILD_TYPE_STRING;
-    qCDebug(interfaceapp) << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
-#if USE_STABLE_GLOBAL_SERVICES
-    qCDebug(interfaceapp) << "[VERSION] We will use STABLE global services.";
-#else
-    qCDebug(interfaceapp) << "[VERSION] We will use DEVELOPMENT global services.";
-#endif
+}
 
-    updateHeartbeat();
+void Application::unloadAvatarScripts() {
+    auto scriptEngines = DependencyManager::get<ScriptEngines>();
+    auto urls = scriptEngines->getRunningScripts();
+    for (auto url : urls) {
+        auto scriptEngine = scriptEngines->getScriptEngine(url);
+        if (scriptEngine->getType() == ScriptManager::Type::AVATAR) {
+            scriptEngines->stopScript(url, false);
+        }
+    }
+}
 
-    // setup a timer for domain-server check ins
-    QTimer* domainCheckInTimer = new QTimer(this);
-    connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
-    domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
-    connect(this, &QCoreApplication::aboutToQuit, [domainCheckInTimer] {
-        domainCheckInTimer->stop();
-        domainCheckInTimer->deleteLater();
-    });
+void Application::copyToClipboard(const QString& text) {
+    if (QThread::currentThread() != qApp->thread()) {
+        QMetaObject::invokeMethod(this, "copyToClipboard");
+        return;
+    }
 
-    {
-        auto audioIO = DependencyManager::get<AudioClient>().data();
-        audioIO->setPositionGetter([] {
-            auto avatarManager = DependencyManager::get<AvatarManager>();
-            auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+    // assume that the address is being copied because the user wants a shareable address
+    QApplication::clipboard()->setText(text);
+}
 
-            return myAvatar ? myAvatar->getPositionForAudio() : Vectors::ZERO;
-        });
-        audioIO->setOrientationGetter([] {
-            auto avatarManager = DependencyManager::get<AvatarManager>();
-            auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+void Application::registerScriptEngineWithApplicationServices(ScriptManagerPointer& scriptManager) {
 
-            return myAvatar ? myAvatar->getOrientationForAudio() : Quaternions::IDENTITY;
-        });
+    auto scriptEngine = scriptManager->engine();
+    scriptManager->setEmitScriptUpdatesFunction([this]() {
+        SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
+        return !entityServerNode || isPhysicsEnabled();
+    });
 
-        recording::Frame::registerFrameHandler(AudioConstants::getAudioFrameName(), [&audioIO](recording::Frame::ConstPointer frame) {
-            audioIO->handleRecordedAudioInput(frame->data);
-        });
+    // setup the packet sender of the script engine's scripting interfaces so
+    // we can use the same ones from the application.
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    entityScriptingInterface->setPacketSender(_entityEditSender.get());
+    entityScriptingInterface->setEntityTree(getEntities()->getTree());
 
-        connect(audioIO, &AudioClient::inputReceived, [](const QByteArray& audio) {
-            static auto recorder = DependencyManager::get<recording::Recorder>();
-            if (recorder->isRecording()) {
-                static const recording::FrameType AUDIO_FRAME_TYPE = recording::Frame::registerFrameType(AudioConstants::getAudioFrameName());
-                recorder->recordFrame(AUDIO_FRAME_TYPE, audio);
-            }
-        });
-        audioIO->startThread();
+    if (property(hifi::properties::TEST).isValid()) {
+        scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance());
     }
 
-    // Make sure we don't time out during slow operations at startup
-    updateHeartbeat();
-
-    // Setup MessagesClient
-    DependencyManager::get<MessagesClient>()->startThread();
-
-    const DomainHandler& domainHandler = nodeList->getDomainHandler();
-
-    connect(&domainHandler, SIGNAL(domainURLChanged(QUrl)), SLOT(domainURLChanged(QUrl)));
-    connect(&domainHandler, SIGNAL(redirectToErrorDomainURL(QUrl)), SLOT(goToErrorDomainURL(QUrl)));
-    connect(&domainHandler, &DomainHandler::domainURLChanged, [](QUrl domainURL){
-        auto &ch = CrashHandler::getInstance();
-        ch.setAnnotation("domain", domainURL.toString().toStdString());
-    });
-    connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain()));
-    connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle()));
-    connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
-    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() {
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        entityScriptingInterface->deleteEntity(getTabletScreenID());
-        entityScriptingInterface->deleteEntity(getTabletHomeButtonID());
-        entityScriptingInterface->deleteEntity(getTabletFrameID());
-        _failedToConnectToEntityServer = false;
-    });
+    scriptEngine->registerGlobalObject("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
+    scriptEngine->registerGlobalObject("Rates", new RatesScriptingInterface(this));
 
-    _entityServerConnectionTimer.setSingleShot(true);
-    connect(&_entityServerConnectionTimer, &QTimer::timeout, this, &Application::setFailedToConnectToEntityServer);
+    scriptEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarManager>().data());
 
-    connect(&domainHandler, &DomainHandler::confirmConnectWithoutAvatarEntities,
-        this, &Application::confirmConnectWithoutAvatarEntities);
+    scriptEngine->registerGlobalObject("Camera", &_myCamera);
+    scriptEngine->registerGlobalObject("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
 
-    connect(&domainHandler, &DomainHandler::connectedToDomain, this, [this]() {
-        if (!isServerlessMode()) {
-            _entityServerConnectionTimer.setInterval(ENTITY_SERVER_ADDED_TIMEOUT);
-            _entityServerConnectionTimer.start();
-            _failedToConnectToEntityServer = false;
-        }
-    });
-    connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &Application::domainConnectionRefused);
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+    scriptEngine->registerGlobalObject("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
+#endif
 
-    nodeList->getDomainHandler().setErrorDomainURL(QUrl(REDIRECT_HIFI_ADDRESS));
+    ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface();
+    scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable);
+    connect(scriptManager.get(), &ScriptManager::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater);
 
-    // We could clear ATP assets only when changing domains, but it's possible that the domain you are connected
-    // to has gone down and switched to a new content set, so when you reconnect the cached ATP assets will no longer be valid.
-    connect(&domainHandler, &DomainHandler::disconnectedFromDomain, DependencyManager::get<ScriptCache>().data(), &ScriptCache::clearATPScriptsFromCache);
+    scriptEngine->registerGlobalObject("Overlays", &_overlays);
 
-    // update our location every 5 seconds in the directory server, assuming that we are authenticated with one
-    const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * MSECS_PER_SECOND;
+    bool clientScript = scriptManager->isClientScript();
 
-    auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
-    connect(&locationUpdateTimer, &QTimer::timeout, discoverabilityManager.data(), &DiscoverabilityManager::updateLocation);
-    connect(&locationUpdateTimer, &QTimer::timeout,
-        DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
-    locationUpdateTimer.start(DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS);
+#if !defined(DISABLE_QML)
+    scriptEngine->registerGlobalObject("OffscreenFlags", getOffscreenUI()->getFlags());
+    if (clientScript) {
+        scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
+    } else {
+        auto desktopScriptingInterface = new DesktopScriptingInterface(nullptr, true);
+        scriptEngine->registerGlobalObject("Desktop", desktopScriptingInterface);
+        if (QThread::currentThread() != thread()) {
+            desktopScriptingInterface->moveToThread(thread());
+        }
+    }
+#endif
 
-    // if we get a domain change, immediately attempt update location in directory server
-    connect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain,
-        discoverabilityManager.data(), &DiscoverabilityManager::updateLocation);
+    scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());
 
-    // send a location update immediately
-    discoverabilityManager->updateLocation();
+    scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
+    // FIXME remove these deprecated names for the tablet scripting interface
+    scriptEngine->registerGlobalObject("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
 
-    connect(nodeList.data(), &NodeList::nodeAdded, this, &Application::nodeAdded);
-    connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled);
-    connect(nodeList.data(), &NodeList::nodeActivated, this, &Application::nodeActivated);
-    connect(nodeList.data(), &NodeList::uuidChanged, myAvatar.get(), &MyAvatar::setSessionUUID);
-    connect(nodeList.data(), &NodeList::uuidChanged, this, &Application::setSessionUUID);
-    connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);
+    auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>().data();
+    DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface);
 
-    // you might think we could just do this in NodeList but we only want this connection for Interface
-    connect(&nodeList->getDomainHandler(), &DomainHandler::limitOfSilentDomainCheckInsReached,
-        nodeList.data(), [nodeList]() {nodeList->reset("Domain checkin limit"); });
+    scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
+    scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
+                        LocationScriptingInterface::locationSetter, "Window");
+    // register `location` on the global object.
+    scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
+                                       LocationScriptingInterface::locationSetter);
 
-    auto dialogsManager = DependencyManager::get<DialogsManager>();
-#if defined(Q_OS_ANDROID)
-    connect(accountManager.data(), &AccountManager::authRequired, this, []() {
-        auto addressManager = DependencyManager::get<AddressManager>();
-        AndroidHelper::instance().showLoginDialog(addressManager->currentAddress());
-    });
-#else
-    connect(accountManager.data(), &AccountManager::authRequired, dialogsManager.data(), &DialogsManager::showLoginDialog);
+    scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor);
+#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
+    scriptEngine->registerFunction("OverlayWebWindow", clientScript ? QmlWebWindowClass::constructor : QmlWebWindowClass::restricted_constructor);
 #endif
-    connect(accountManager.data(), &AccountManager::usernameChanged, this, &Application::updateWindowTitle);
-
-    auto domainAccountManager = DependencyManager::get<DomainAccountManager>();
-    connect(domainAccountManager.data(), &DomainAccountManager::authRequired,
-        dialogsManager.data(), &DialogsManager::showDomainLoginDialog);
-    connect(domainAccountManager.data(), &DomainAccountManager::authRequired, this, &Application::updateWindowTitle);
-    connect(domainAccountManager.data(), &DomainAccountManager::loginComplete, this, &Application::updateWindowTitle);
-    // ####### TODO: Connect any other signals from domainAccountManager.
-
-    // use our MyAvatar position and quat for address manager path
-    addressManager->setPositionGetter([] {
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
-        return myAvatar ? myAvatar->getWorldFeetPosition() : Vectors::ZERO;
-    });
-    addressManager->setOrientationGetter([] {
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
-        return myAvatar ? myAvatar->getWorldOrientation() : glm::quat();
-    });
-
-    connect(addressManager.data(), &AddressManager::hostChanged, this, &Application::updateWindowTitle);
-    connect(this, &QCoreApplication::aboutToQuit, addressManager.data(), &AddressManager::storeCurrentAddress);
+    scriptEngine->registerFunction("QmlFragment", clientScript ? QmlFragmentClass::constructor : QmlFragmentClass::restricted_constructor);
 
-    connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateThreadPoolCount);
-    if (parser.isSet("system-cursor")) {
-        _preferredCursor.set(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
+    scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
+    scriptEngine->registerGlobalObject("DesktopPreviewProvider", DependencyManager::get<DesktopPreviewProvider>().data());
+#if !defined(DISABLE_QML)
+    scriptEngine->registerGlobalObject("Stats", Stats::getInstance());
+#endif
+    scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
+    scriptEngine->registerGlobalObject("Snapshot", DependencyManager::get<Snapshot>().data());
+    scriptEngine->registerGlobalObject("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
+    scriptEngine->registerGlobalObject("AudioScope", DependencyManager::get<AudioScope>().data());
+    scriptEngine->registerGlobalObject("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
+    scriptEngine->registerGlobalObject("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
 
-        connect(this, &Application::activeDisplayPluginChanged, this, [=](){
-            qApp->setProperty(hifi::properties::HMD, qApp->isHMDMode());
-            auto displayPlugin = qApp->getActiveDisplayPlugin();
+    scriptEngine->registerGlobalObject("RayPick", DependencyManager::get<RayPickScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("Picks", DependencyManager::get<PickScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("Pointers", DependencyManager::get<PointerScriptingInterface>().data());
 
-            if (displayPlugin->isHmd()) {
-                if (_preferredCursor.get() == Cursor::Manager::getIconName(Cursor::Icon::RETICLE)) {
-                    setPreferredCursor(Cursor::Manager::getIconName(Cursor::Icon::RETICLE));
-                } else {
-                    setPreferredCursor(Cursor::Manager::getIconName(Cursor::Icon::ARROW));
-                }
-            } else {
-                setPreferredCursor(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
-            }
+    // Caches
+    scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCacheScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("TextureCache", DependencyManager::get<TextureCacheScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("MaterialCache", DependencyManager::get<MaterialCacheScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("ModelCache", DependencyManager::get<ModelCacheScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
 
-            auto &ch = CrashHandler::getInstance();
-            ch.setAnnotation("display_plugin", displayPlugin->getName().toStdString());
-            ch.setAnnotation("hmd", displayPlugin->isHmd() ? "1" : "0");
-        });
-    }
-    connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode);
-    connect(this, &Application::activeDisplayPluginChanged, this, [&](){
-        if (getLoginDialogPoppedUp()) {
-            auto dialogsManager = DependencyManager::get<DialogsManager>();
-            auto keyboard = DependencyManager::get<Keyboard>();
-            if (_firstRun.get()) {
-                // display mode changed.  Don't allow auto-switch to work after this session.
-                _firstRun.set(false);
-            }
-            if (isHMDMode()) {
-                emit loginDialogFocusDisabled();
-                dialogsManager->hideLoginDialog();
-                createLoginDialog();
-            } else {
-                DependencyManager::get<EntityScriptingInterface>()->deleteEntity(_loginDialogID);
-                _loginDialogID = QUuid();
-                _loginStateManager.tearDown();
-                dialogsManager->showLoginDialog();
-                emit loginDialogFocusEnabled();
-            }
-        }
-    });
+    scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface);
 
-    // Save avatar location immediately after a teleport.
-    connect(myAvatar.get(), &MyAvatar::positionGoneTo,
-        DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
+    scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance());
 
-    connect(myAvatar.get(), &MyAvatar::positionGoneTo, this, [this] {
-        if (!_physicsEnabled) {
-            // when we arrive somewhere without physics enabled --> startSafeLanding
-            _octreeProcessor->startSafeLanding();
-        }
-    }, Qt::QueuedConnection);
+    scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data());
 
-    connect(myAvatar.get(), &MyAvatar::skeletonModelURLChanged, [](){
-        QUrl avatarURL = qApp->getMyAvatar()->getSkeletonModelURL();
-        auto &ch = CrashHandler::getInstance();
-        ch.setAnnotation("avatar", avatarURL.toString().toStdString());
-    });
+    scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data());
 
-    // Inititalize sample before registering
-    _sampleSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/sample.wav"));
+    scriptEngine->registerGlobalObject("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("Performance", new PerformanceScriptingInterface());
 
-    {
-        auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
-        scriptEngines->registerScriptInitializer([this](ScriptManagerPointer manager) {
-            registerScriptEngineWithApplicationServices(manager);
-        });
+    scriptEngine->registerGlobalObject("Paths", DependencyManager::get<PathUtils>().data());
 
-        connect(scriptEngines, &ScriptEngines::scriptCountChanged, this, [this] {
-            auto scriptEngines = DependencyManager::get<ScriptEngines>();
-            if (scriptEngines->getRunningScripts().isEmpty()) {
-                getMyAvatar()->clearScriptableSettings();
-            }
-        }, Qt::QueuedConnection);
+    scriptEngine->registerGlobalObject("HMD", DependencyManager::get<HMDScriptingInterface>().data());
+    scriptEngine->registerFunction("HMD", "getHUDLookAtPosition2D", HMDScriptingInterface::getHUDLookAtPosition2D, 0);
+    scriptEngine->registerFunction("HMD", "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0);
 
-        connect(scriptEngines, &ScriptEngines::scriptsReloading, this, [this] {
-            getEntities()->reloadEntityScripts();
-            loadAvatarScripts(getMyAvatar()->getScriptUrls());
-        }, Qt::QueuedConnection);
+    scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("Render", RenderScriptingInterface::getInstance());
+    scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get());
 
-        connect(scriptEngines, &ScriptEngines::scriptLoadError,
-            this, [](const QString& filename, const QString& error) {
-            OffscreenUi::asyncWarning(nullptr, "Error Loading Script", filename + " failed to load.");
-        }, Qt::QueuedConnection);
-    }
+    scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data());
 
-#ifdef _WIN32
-    WSADATA WsaData;
-    int wsaresult = WSAStartup(MAKEWORD(2, 2), &WsaData);
-#endif
+    scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
+    scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
 
-    // tell the NodeList instance who to tell the domain server we care about
-    nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
-        << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer << NodeType::EntityScriptServer);
+    scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
 
-    if (parser.isSet("concurrent-downloads")) {
-        bool success;
-        uint32_t concurrentDownloads = parser.value("concurrent-downloads").toUInt(&success);
-        if (!success) {
-            concurrentDownloads = MAX_CONCURRENT_RESOURCE_DOWNLOADS;
-        }
-        ResourceCache::setRequestLimit(concurrentDownloads);
-    }
+    //scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data());
 
-    // perhaps override the avatar url.  Since we will test later for validity
-    // we don't need to do so here.
-    if (parser.isSet("avatarURL")) {
-        _avatarOverrideUrl = QUrl::fromUserInput(parser.value("avatarURL"));
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.get(), steamClient.get()));
     }
+    auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
+    scriptEngine->registerGlobalObject("Controller", scriptingInterface.data());
 
-    // If someone specifies both --avatarURL and --replaceAvatarURL,
-    // the replaceAvatarURL wins.  So only set the _overrideUrl if this
-    // does have a non-empty string.
-    if (parser.isSet("replaceAvatarURL")) {
-        QString replaceURL = parser.value("replaceAvatarURL");
-        _avatarOverrideUrl = QUrl::fromUserInput(replaceURL);
-        _saveAvatarOverrideUrl = true;
+    {
+        auto connection = std::make_shared<QMetaObject::Connection>();
+        *connection = scriptManager->connect(scriptManager.get(), &ScriptManager::scriptEnding, [this, scriptManager, connection]() {
+            // Request removal of controller routes with callbacks to a given script engine
+            auto userInputMapper = DependencyManager::get<UserInputMapper>();
+            // scheduleScriptEndpointCleanup will have the last instance of shared pointer to script manager
+            // so script manager will get deleted as soon as cleanup is done
+            userInputMapper->scheduleScriptEndpointCleanup(scriptManager);
+            QObject::disconnect(*connection);
+        });
     }
 
-    // setDefaultFormat has no effect after the platform window has been created, so call it here.
-    QSurfaceFormat::setDefaultFormat(getDefaultOpenGLSurfaceFormat());
-
-    _glWidget = new GLCanvas();
-    getApplicationCompositor().setRenderingWidget(_glWidget);
-    _window->setCentralWidget(_glWidget);
+    UserInputMapper::registerControllerTypes(scriptEngine.get());
 
-    _window->restoreGeometry();
-    _window->setVisible(true);
+    auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
+    scriptEngine->registerGlobalObject("Recording", recordingInterface.data());
 
-    _glWidget->setFocusPolicy(Qt::StrongFocus);
-    _glWidget->setFocus();
+    auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
+    scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());
+    scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
+    scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("AddressManager", DependencyManager::get<AddressManager>().data());
+    scriptEngine->registerGlobalObject("About", AboutUtil::getInstance());
+    scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance());  // Deprecated.
+    scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
 
-    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
+    // connect this script engines printedMessage signal to the global ScriptEngines these various messages
+    auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
+    connect(scriptManager.get(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage);
+    connect(scriptManager.get(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage);
+    connect(scriptManager.get(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage);
+    connect(scriptManager.get(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage);
+    connect(scriptManager.get(), &ScriptManager::clearDebugWindow, scriptEngines, &ScriptEngines::onClearDebugWindow);
+}
 
-    // enable mouse tracking; otherwise, we only get drag events
-    _glWidget->setMouseTracking(true);
-    // Make sure the window is set to the correct size by processing the pending events
-    QCoreApplication::processEvents();
+// Snapshots
+void Application::addSnapshotOperator(const SnapshotOperator& snapshotOperator) {
+    std::lock_guard<std::mutex> lock(_snapshotMutex);
+    _snapshotOperators.push(snapshotOperator);
+    _hasPrimarySnapshot = _hasPrimarySnapshot || std::get<2>(snapshotOperator);
+}
 
-    // Create the main thread context, the GPU backend
-    initializeGL();
-    qCDebug(interfaceapp, "Initialized GL");
+bool Application::takeSnapshotOperators(std::queue<SnapshotOperator>& snapshotOperators) {
+    std::lock_guard<std::mutex> lock(_snapshotMutex);
+    bool hasPrimarySnapshot = _hasPrimarySnapshot;
+    _hasPrimarySnapshot = false;
+    _snapshotOperators.swap(snapshotOperators);
+    return hasPrimarySnapshot;
+}
 
-    // Initialize the display plugin architecture
-    initializeDisplayPlugins();
-    qCDebug(interfaceapp, "Initialized Display");
+void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio, const QString& filename) {
+    addSnapshotOperator(std::make_tuple([notify, includeAnimated, aspectRatio, filename](const QImage& snapshot) {
+        qApp->postLambdaEvent([snapshot, notify, includeAnimated, aspectRatio, filename] {
+            QString path = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation());
 
-    if (_displayPlugin && !_displayPlugin->isHmd()) {
-        showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
-    }
-    // An audio device changed signal received before the display plugins are set up will cause a crash,
-    // so we defer the setup of the `scripting::Audio` class until this point
-    {
-        auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>();
-        auto audioIO = DependencyManager::get<AudioClient>().data();
-        connect(audioIO, &AudioClient::mutedByMixer, audioScriptingInterface.data(), &AudioScriptingInterface::mutedByMixer);
-        connect(audioIO, &AudioClient::receivedFirstPacket, audioScriptingInterface.data(), &AudioScriptingInterface::receivedFirstPacket);
-        connect(audioIO, &AudioClient::disconnected, audioScriptingInterface.data(), &AudioScriptingInterface::disconnected);
-        connect(audioIO, &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) {
-            auto audioClient = DependencyManager::get<AudioClient>();
-            auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
-            auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldPosition();
-            float distance = glm::distance(myAvatarPosition, position);
-
-            if (distance < radius) {
-                audioClient->setMuted(true);
-                audioScriptingInterface->environmentMuted();
+            // If we're not doing an animated snapshot as well...
+            if (!includeAnimated) {
+                if (!path.isEmpty()) {
+                    // Tell the dependency manager that the capture of the still snapshot has taken place.
+                    emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(path, notify);
+                }
+            } else if (!SnapshotAnimated::isAlreadyTakingSnapshotAnimated()) {
+                // Get an animated GIF snapshot and save it
+                SnapshotAnimated::saveSnapshotAnimated(path, aspectRatio, DependencyManager::get<WindowScriptingInterface>());
             }
         });
-        QSharedPointer<scripting::Audio> scriptingAudioSharedPointer = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
-        if (scriptingAudioSharedPointer) {
-            connect(this, &Application::activeDisplayPluginChanged,
-                scriptingAudioSharedPointer.data(), &scripting::Audio::onContextChanged);
-        }
-    }
+    }, aspectRatio, true));
+}
 
-    // Create the rendering engine.  This can be slow on some machines due to lots of
-    // GPU pipeline creation.
-    initializeRenderEngine();
-    qCDebug(interfaceapp, "Initialized Render Engine.");
+void Application::takeSecondaryCameraSnapshot(const bool& notify, const QString& filename) {
+    addSnapshotOperator(std::make_tuple([notify, filename](const QImage& snapshot) {
+        qApp->postLambdaEvent([snapshot, notify, filename] {
+            QString snapshotPath = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation());
 
-    // Overlays need to exist before we set the ContextOverlayInterface dependency
-    _overlays.init(); // do this before scripts load
+            emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(snapshotPath, notify);
+        });
+    }, 0.0f, false));
+}
 
-    auto offscreenUi = getOffscreenUI();
-    connect(offscreenUi.data(), &OffscreenUi::desktopReady, []() {
-        // Now that we've loaded the menu and thus switched to the previous display plugin
-        // we can unlock the desktop repositioning code, since all the positions will be
-        // relative to the desktop size for this plugin
-        auto offscreenUi = getOffscreenUI();
-        auto desktop = offscreenUi->getDesktop();
-        if (desktop) {
-            desktop->setProperty("repositionLocked", false);
-        }
+void Application::takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition, const bool& cubemapOutputFormat, const bool& notify, const QString& filename) {
+    postLambdaEvent([notify, filename, cubemapOutputFormat, cameraPosition] {
+        DependencyManager::get<Snapshot>()->save360Snapshot(cameraPosition, cubemapOutputFormat, notify, filename);
     });
+}
 
-#if defined(Q_OS_ANDROID) || defined(DISABLE_QML)
-    connect(offscreenUi.data(), &OffscreenUi::keyboardFocusActive, [this]() {
-        resumeAfterLoginDialogActionTaken();
+void Application::shareSnapshot(const QString& path, const QUrl& href) {
+    postLambdaEvent([path, href] {
+        // not much to do here, everything is done in snapshot code...
+        DependencyManager::get<Snapshot>()->uploadSnapshot(path, href);
     });
-#else
-    // Do not show login dialog if requested not to on the command line
-    if (_disableLoginScreen || parser.isSet("no-login-suggestion")) {
-        connect(offscreenUi.data(), &OffscreenUi::keyboardFocusActive, [this]() {
-            resumeAfterLoginDialogActionTaken();
-        });
-    } else {
-        connect(offscreenUi.data(), &OffscreenUi::keyboardFocusActive, [this]() {
-            showLoginScreen();
-            resumeAfterLoginDialogActionTaken();
-        });
-    }
-#endif
-
-    // Initialize the user interface and menu system
-    // Needs to happen AFTER the render engine initialization to access its configuration
-    initializeUi();
-
-    init();
-    qCDebug(interfaceapp, "init() complete.");
-
-    // create thread for parsing of octree data independent of the main network and rendering threads
-    _octreeProcessor->initialize(_enableProcessOctreeThread);
-    connect(_octreeProcessor.get(), &OctreePacketProcessor::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);
-    _entityEditSender->initialize(_enableProcessOctreeThread);
-
-    _idleLoopStdev.reset();
-
-    // update before the first render
-    update(0);
-
-    // Make sure we don't time out during slow operations at startup
-    updateHeartbeat();
+}
 
-    static const QString TESTER = "HIFI_TESTER";
-     bool isTester = false;
-#if defined (Q_OS_ANDROID)
-    // Since we cannot set environment variables in Android we use a file presence
-    // to denote that this is a testing device
-    QFileInfo check_tester_file(TESTER_FILE);
-    isTester = check_tester_file.exists() && check_tester_file.isFile();
-#endif
+#if defined(Q_OS_ANDROID)
+void Application::beforeEnterBackground() {
+    auto nodeList = DependencyManager::get<NodeList>();
+    nodeList->setSendDomainServerCheckInEnabled(false);
+    nodeList->reset("Entering background", true);
+    clearDomainOctreeDetails();
+}
 
-    constexpr auto INSTALLER_INI_NAME = "installer.ini";
-    auto iniPath = QDir(applicationDirPath()).filePath(INSTALLER_INI_NAME);
-    QFile installerFile { iniPath };
-    std::unordered_map<QString, QString> installerKeyValues;
-    if (installerFile.open(QIODevice::ReadOnly)) {
-        while (!installerFile.atEnd()) {
-            auto line = installerFile.readLine();
-            if (!line.isEmpty()) {
-                auto index = line.indexOf("=");
-                if (index >= 0) {
-                    installerKeyValues[line.mid(0, index).trimmed()] = line.mid(index + 1).trimmed();
-                }
-            }
-        }
+void Application::enterBackground() {
+    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
+                              "stop", Qt::BlockingQueuedConnection);
+// Quest only supports one plugin which can't be deactivated currently
+#if !defined(ANDROID_APP_QUEST_INTERFACE)
+    if (getActiveDisplayPlugin()->isActive()) {
+        getActiveDisplayPlugin()->deactivate();
     }
+#endif
+}
 
-    // In practice we shouldn't run across installs that don't have a known installer type.
-    // Client or Client+Server installs should always have the installer.ini next to their
-    // respective interface.exe, and Steam installs will be detected as such. If a user were
-    // to delete the installer.ini, though, and as an example, we won't know the context of the
-    // original install.
-    constexpr auto INSTALLER_KEY_TYPE = "type";
-    constexpr auto INSTALLER_KEY_CAMPAIGN = "campaign";
-    constexpr auto INSTALLER_TYPE_UNKNOWN = "unknown";
-    constexpr auto INSTALLER_TYPE_STEAM = "steam";
-
-    auto typeIt = installerKeyValues.find(INSTALLER_KEY_TYPE);
-    QString installerType = INSTALLER_TYPE_UNKNOWN;
-    if (typeIt == installerKeyValues.end()) {
-        if (property(hifi::properties::STEAM).toBool()) {
-            installerType = INSTALLER_TYPE_STEAM;
-        }
-    } else {
-        installerType = typeIt->second;
+void Application::enterForeground() {
+    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
+                                  "start", Qt::BlockingQueuedConnection);
+// 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);
+}
 
-    auto campaignIt = installerKeyValues.find(INSTALLER_KEY_CAMPAIGN);
-    QString installerCampaign = campaignIt != installerKeyValues.end() ? campaignIt->second : "";
-
-    qDebug() << "Detected installer type:" << installerType;
-    qDebug() << "Detected installer campaign:" << installerCampaign;
-
-    auto& userActivityLogger = UserActivityLogger::getInstance();
-    if (userActivityLogger.isEnabled()) {
-        // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
-        // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.
-        static const QString TESTER = "HIFI_TESTER";
-        auto gpuIdent = GPUIdent::getInstance();
-        auto glContextData = gl::ContextInfo::get();
-        QJsonObject properties = {
-            { "version", applicationVersion() },
-            { "tester", QProcessEnvironment::systemEnvironment().contains(TESTER) || isTester },
-            { "installer_campaign", installerCampaign },
-            { "installer_type", installerType },
-            { "build_type", BuildInfo::BUILD_TYPE_STRING },
-            { "previousSessionCrashed", _previousSessionCrashed },
-            { "previousSessionRuntime", sessionRunTime.get() },
-            { "cpu_architecture", QSysInfo::currentCpuArchitecture() },
-            { "kernel_type", QSysInfo::kernelType() },
-            { "kernel_version", QSysInfo::kernelVersion() },
-            { "os_type", QSysInfo::productType() },
-            { "os_version", QSysInfo::productVersion() },
-            { "gpu_name", gpuIdent->getName() },
-            { "gpu_driver", gpuIdent->getDriver() },
-            { "gpu_memory", static_cast<qint64>(gpuIdent->getMemory()) },
-            { "gl_version_int", glVersionToInteger(glContextData.version.c_str()) },
-            { "gl_version", glContextData.version.c_str() },
-            { "gl_vender", glContextData.vendor.c_str() },
-            { "gl_sl_version", glContextData.shadingLanguageVersion.c_str() },
-            { "gl_renderer", glContextData.renderer.c_str() },
-            { "ideal_thread_count", QThread::idealThreadCount() }
-        };
-        auto macVersion = QSysInfo::macVersion();
-        if (macVersion != QSysInfo::MV_None) {
-            properties["os_osx_version"] = QSysInfo::macVersion();
-        }
-        auto windowsVersion = QSysInfo::windowsVersion();
-        if (windowsVersion != QSysInfo::WV_None) {
-            properties["os_win_version"] = QSysInfo::windowsVersion();
-        }
-
-        ProcessorInfo procInfo;
-        if (getProcessorInfo(procInfo)) {
-            properties["processor_core_count"] = procInfo.numProcessorCores;
-            properties["logical_processor_count"] = procInfo.numLogicalProcessors;
-            properties["processor_l1_cache_count"] = procInfo.numProcessorCachesL1;
-            properties["processor_l2_cache_count"] = procInfo.numProcessorCachesL2;
-            properties["processor_l3_cache_count"] = procInfo.numProcessorCachesL3;
-        }
+void Application::toggleAwayMode(){
+    QKeyEvent event = QKeyEvent (QEvent::KeyPress, Qt::Key_Escape, Qt::NoModifier);
+    QCoreApplication::sendEvent (this, &event);
+}
+#endif
 
-        properties["first_run"] = _firstRun.get();
+// FIXME?  perhaps two, one for the main thread and one for the offscreen UI rendering thread?
+static const int UI_RESERVED_THREADS = 1;
+// Windows won't let you have all the cores
+static const int OS_RESERVED_THREADS = 1;
+void Application::updateThreadPoolCount() const {
+    auto reservedThreads = UI_RESERVED_THREADS + OS_RESERVED_THREADS + _displayPlugin->getRequiredThreadCount();
+    auto availableThreads = QThread::idealThreadCount() - reservedThreads;
+    auto threadPoolSize = std::max(MIN_PROCESSING_THREAD_POOL_SIZE, availableThreads);
+    qCDebug(interfaceapp) << "Ideal Thread Count " << QThread::idealThreadCount();
+    qCDebug(interfaceapp) << "Reserved threads " << reservedThreads;
+    qCDebug(interfaceapp) << "Setting thread pool size to " << threadPoolSize;
+    QThreadPool::globalInstance()->setMaxThreadCount(threadPoolSize);
+}
 
-        // add the user's machine ID to the launch event
-        QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
-        properties["machine_fingerprint"] = machineFingerPrint;
+void Application::gotoTutorial() {
+    const QString TUTORIAL_ADDRESS = "file:///~/serverless/tutorial.json";
+    DependencyManager::get<AddressManager>()->handleLookupString(TUTORIAL_ADDRESS);
+}
 
-        userActivityLogger.logAction("launch", properties);
+void Application::goToErrorDomainURL(QUrl errorDomainURL) {
+    // disable physics until we have enough information about our new location to not cause craziness.
+    setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_OVERTE);
+    if (isServerlessMode()) {
+        loadErrorDomain(errorDomainURL);
     }
+    updateWindowTitle();
+}
 
-    _entityEditSender->setMyAvatar(myAvatar.get());
-
-    // The entity octree will have to know about MyAvatar for the parentJointName import
-    getEntities()->getTree()->setMyAvatar(myAvatar);
-    _entityClipboard->setMyAvatar(myAvatar);
-
-    // For now we're going to set the PPS for outbound packets to be super high, this is
-    // probably not the right long term solution. But for now, we're going to do this to
-    // allow you to move an entity around in your hand
-    _entityEditSender->setPacketsPerSecond(3000); // super high!!
-
-    // Make sure we don't time out during slow operations at startup
-    updateHeartbeat();
-
-    connect(this, SIGNAL(aboutToQuit()), this, SLOT(onAboutToQuit()));
-
-    // FIXME -- I'm a little concerned about this.
-    connect(myAvatar->getSkeletonModel().get(), &SkeletonModel::skeletonLoaded,
-        this, &Application::checkSkeleton, Qt::QueuedConnection);
+void Application::handleLocalServerConnection() const {
+    auto server = qobject_cast<QLocalServer*>(sender());
+    Q_ASSERT(server != nullptr);
 
-    // Setup the userInputMapper with the actions
-    auto userInputMapper = DependencyManager::get<UserInputMapper>();
-    connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
-        using namespace controller;
-        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-        QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
-        {
-            auto actionEnum = static_cast<Action>(action);
-            int key = Qt::Key_unknown;
-            static int lastKey = Qt::Key_unknown;
-            bool navAxis = false;
-            switch (actionEnum) {
-                case Action::TOGGLE_PUSHTOTALK:
-                    if (audioScriptingInterface) {
-                        if (state > 0.0f) {
-                            audioScriptingInterface->setPushingToTalk(true);
-                        } else if (state <= 0.0f) {
-                            audioScriptingInterface->setPushingToTalk(false);
-                        }
-                    }
-                    break;
+    qCDebug(interfaceapp) << "Got connection on local server from additional instance - waiting for parameters";
 
-                case Action::UI_NAV_VERTICAL:
-                    navAxis = true;
-                    if (state > 0.0f) {
-                        key = Qt::Key_Up;
-                    } else if (state < 0.0f) {
-                        key = Qt::Key_Down;
-                    }
-                    break;
+    auto socket = server->nextPendingConnection();
 
-                case Action::UI_NAV_LATERAL:
-                    navAxis = true;
-                    if (state > 0.0f) {
-                        key = Qt::Key_Right;
-                    } else if (state < 0.0f) {
-                        key = Qt::Key_Left;
-                    }
-                    break;
+    connect(socket, &QLocalSocket::readyRead, this, &Application::readArgumentsFromLocalSocket);
 
-                case Action::UI_NAV_GROUP:
-                    navAxis = true;
-                    if (state > 0.0f) {
-                        key = Qt::Key_Tab;
-                    } else if (state < 0.0f) {
-                        key = Qt::Key_Backtab;
-                    }
-                    break;
+    qApp->getWindow()->raise();
+    qApp->getWindow()->activateWindow();
+}
 
-                case Action::UI_NAV_BACK:
-                    key = Qt::Key_Escape;
-                    break;
+void Application::readArgumentsFromLocalSocket() const {
+    auto socket = qobject_cast<QLocalSocket*>(sender());
+    Q_ASSERT(socket != nullptr);
 
-                case Action::UI_NAV_SELECT:
-                    key = Qt::Key_Return;
-                    break;
-                default:
-                    break;
-            }
+    auto message = socket->readAll();
+    socket->deleteLater();
 
-            auto window = tabletScriptingInterface->getTabletWindow();
-            if (navAxis && window) {
-                if (lastKey != Qt::Key_unknown) {
-                    QKeyEvent event(QEvent::KeyRelease, lastKey, Qt::NoModifier);
-                    sendEvent(window, &event);
-                    lastKey = Qt::Key_unknown;
-                }
+    qCDebug(interfaceapp) << "Read from connection: " << message;
 
-                if (key != Qt::Key_unknown) {
-                    QKeyEvent event(QEvent::KeyPress, key, Qt::NoModifier);
-                    sendEvent(window, &event);
-                    tabletScriptingInterface->processEvent(&event);
-                    lastKey = key;
-                }
-            } else if (key != Qt::Key_unknown && window) {
-                if (state) {
-                    QKeyEvent event(QEvent::KeyPress, key, Qt::NoModifier);
-                    sendEvent(window, &event);
-                    tabletScriptingInterface->processEvent(&event);
-                } else {
-                    QKeyEvent event(QEvent::KeyRelease, key, Qt::NoModifier);
-                    sendEvent(window, &event);
-                }
-                return;
-            }
-        }
+    // If we received a message, try to open it as a URL
+    if (message.length() > 0) {
+        DependencyManager::get<AddressManager>()->handleLookupString(QString::fromUtf8(message));
+    }
+}
 
-        if (action == controller::toInt(controller::Action::RETICLE_CLICK)) {
-            auto reticlePos = getApplicationCompositor().getReticlePosition();
-            QPoint localPos(reticlePos.x, reticlePos.y); // both hmd and desktop already handle this in our coordinates.
-            if (state) {
-                QMouseEvent mousePress(QEvent::MouseButtonPress, localPos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-                sendEvent(_glWidget, &mousePress);
-                _reticleClickPressed = true;
-            } else {
-                QMouseEvent mouseRelease(QEvent::MouseButtonRelease, localPos, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-                sendEvent(_glWidget, &mouseRelease);
-                _reticleClickPressed = false;
-            }
-            return; // nothing else to do
-        }
+void Application::showUrlHandler(const QUrl& url) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "showUrlHandler", Q_ARG(const QUrl&, url));
+        return;
+    }
 
-        if (state) {
-            if (action == controller::toInt(controller::Action::TOGGLE_MUTE)) {
-                auto audioClient = DependencyManager::get<AudioClient>();
-                audioClient->setMuted(!audioClient->isMuted());
-            } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) {
-                cycleCamera();
-            } else if (action == controller::toInt(controller::Action::CONTEXT_MENU) && !isInterstitialMode()) {
-                toggleTabletUI();
-            } else if (action == controller::toInt(controller::Action::RETICLE_X)) {
-                auto oldPos = getApplicationCompositor().getReticlePosition();
-                getApplicationCompositor().setReticlePosition({ oldPos.x + state, oldPos.y });
-            } else if (action == controller::toInt(controller::Action::RETICLE_Y)) {
-                auto oldPos = getApplicationCompositor().getReticlePosition();
-                getApplicationCompositor().setReticlePosition({ oldPos.x, oldPos.y + state });
-            } else if (action == controller::toInt(controller::Action::TOGGLE_OVERLAY)) {
-                toggleOverlays();
-            }
+    ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Confirm openUrl", "Do you recognize this path or code and want to open or execute it: " + url.toDisplayString());
+    QObject::connect(dlg, &ModalDialogListener::response, this, [=](QVariant answer) {
+        QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {
+            // Unset the handler, open the URL, and the reset the handler
+            QDesktopServices::unsetUrlHandler(url.scheme());
+            QDesktopServices::openUrl(url);
+            QDesktopServices::setUrlHandler(url.scheme(), this, "showUrlHandler");
         }
     });
+}
 
-    _applicationStateDevice = userInputMapper->getStateDevice();
-
-    _applicationStateDevice->setInputVariant(STATE_IN_HMD, []() -> float {
-        return qApp->isHMDMode() ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_FULL_SCREEN_MIRROR, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_MIRROR ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_FIRST_PERSON, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_FIRST_PERSON ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_FIRST_PERSON_LOOK_AT, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_FIRST_PERSON_LOOK_AT ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_THIRD_PERSON ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_LOOK_AT, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_SELFIE, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_SELFIE ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_ENTITY, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_ENTITY ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float {
-        return qApp->getCamera().getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_CAPTURE_MOUSE, []() -> float {
-        return qApp->getCamera().getCaptureMouse() ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float {
-        return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_ADVANCED_MOVEMENT_CONTROLS, []() -> float {
-        return qApp->getMyAvatar()->useAdvancedMovementControls() ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_LEFT_HAND_DOMINANT, []() -> float {
-        return qApp->getMyAvatar()->getDominantHand() == "left" ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_RIGHT_HAND_DOMINANT, []() -> float {
-        return qApp->getMyAvatar()->getDominantHand() == "right" ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_STRAFE_ENABLED, []() -> float {
-        return qApp->getMyAvatar()->getStrafeEnabled() ? 1 : 0;
-    });
-
-    _applicationStateDevice->setInputVariant(STATE_GROUNDED, []() -> float {
-        return qApp->getMyAvatar()->getCharacterController()->onGround() ? 1 : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_NAV_FOCUSED, []() -> float {
-        auto offscreenUi = getOffscreenUI();
-        return offscreenUi ? (offscreenUi->navigationFocused() ? 1 : 0) : 0;
-    });
-    _applicationStateDevice->setInputVariant(STATE_PLATFORM_WINDOWS, []() -> float {
-#if defined(Q_OS_WIN)
-        return 1;
-#else
-        return 0;
-#endif
-    });
-    _applicationStateDevice->setInputVariant(STATE_PLATFORM_MAC, []() -> float {
-#if defined(Q_OS_MAC)
-        return 1;
-#else
-        return 0;
-#endif
-    });
-    _applicationStateDevice->setInputVariant(STATE_PLATFORM_ANDROID, []() -> float {
-#if defined(Q_OS_ANDROID)
-        return 1 ;
-#else
-        return 0;
+void Application::hmdVisibleChanged(bool visible) {
+    // TODO
+    // calling start and stop will change audio input and ouput to default audio devices.
+    // we need to add a pause/unpause functionality to AudioClient for this to work properly
+#if 0
+    if (visible) {
+        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "start", Qt::QueuedConnection);
+    } else {
+        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "stop", Qt::QueuedConnection);
+    }
 #endif
-    });
+}
 
+void Application::reloadResourceCaches() {
+    resetPhysicsReadyInformation();
 
-    getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::STARTUP);
+    // Query the octree to refresh everything in view
+    _queryExpiry = SteadyClock::now();
+    _octreeQuery.incrementConnectionID();
 
-    // Setup the _keyboardMouseDevice, _touchscreenDevice, _touchscreenVirtualPadDevice and the user input mapper with the default bindings
-    userInputMapper->registerDevice(_keyboardMouseDevice->getInputDevice());
-    // if the _touchscreenDevice is not supported it will not be registered
-    if (_touchscreenDevice) {
-        userInputMapper->registerDevice(_touchscreenDevice->getInputDevice());
-    }
-    if (_touchscreenVirtualPadDevice) {
-        userInputMapper->registerDevice(_touchscreenVirtualPadDevice->getInputDevice());
-    }
+    queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
 
-    if (parser.isSet("scripts")) {
-        _defaultScriptsLocation.setPath(parser.value("scripts")); // Might need to be done in "main.cpp".
-        _overrideDefaultScriptsLocation = true;
-    } else {
-        _overrideDefaultScriptsLocation = false;
-    }
+    getMyAvatar()->prepareAvatarEntityDataForReload();
+    // Clear the entities and their renderables
+    getEntities()->clear();
 
-    // Make sure we don't time out during slow operations at startup
-    updateHeartbeat();
+    DependencyManager::get<AssetClient>()->clearCache();
+    //It's already cleared in reloadAllScripts so I'm not sure this is necessary.
+    //DependencyManager::get<ScriptCache>()->clearCache();
 
-    loadSettings(parser);
+    // Clear all the resource caches
+    DependencyManager::get<ResourceCacheSharedItems>()->clear();
+    DependencyManager::get<AnimationCache>()->refreshAll();
+    DependencyManager::get<SoundCache>()->refreshAll();
+    DependencyManager::get<MaterialCache>()->refreshAll();
+    DependencyManager::get<ModelCache>()->refreshAll();
+    ShaderCache::instance().refreshAll();
+    DependencyManager::get<TextureCache>()->refreshAll();
+    DependencyManager::get<recording::ClipCache>()->refreshAll();
 
-    updateVerboseLogging();
+    DependencyManager::get<NodeList>()->reset("Reloading resources");  // Force redownload of .fst models
 
-    setCachebustRequire();
+    DependencyManager::get<ScriptEngines>()->reloadAllScripts();
+    getOffscreenUI()->clearCache();
 
-    // Make sure we don't time out during slow operations at startup
-    updateHeartbeat();
+    DependencyManager::get<Keyboard>()->createKeyboard();
 
+    getMyAvatar()->resetFullAvatarURL();
+}
 
-    QTimer* settingsTimer = new QTimer();
-    int SAVE_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND; // Let's save every seconds for now
-    settingsTimer->setSingleShot(false);
-    settingsTimer->setInterval(SAVE_SETTINGS_INTERVAL); // 10s, Qt::CoarseTimer acceptable
-    QObject::connect(settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
-    settingsTimer->start();
+void Application::updateHeartbeat() const {
+    DeadlockWatchdogThread::updateHeartbeat();
+}
 
-    if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPersonLookAt)) {
-        getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);  // So that camera doesn't auto-switch to third person.
+void Application::deadlockApplication() {
+    qCDebug(interfaceapp) << "Intentionally deadlocked Interface";
+    // Using a loop that will *technically* eventually exit (in ~600 billion years)
+    // to avoid compiler warnings about a loop that will never exit
+    for (uint64_t i = 1; i != 0; ++i) {
+        QThread::sleep(1);
     }
+}
 
-    {
-        auto audioIO = DependencyManager::get<AudioClient>().data();
-        // set the local loopback interface for local sounds
-        AudioInjector::setLocalAudioInterface(audioIO);
-        auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
-        audioScriptingInterface->setLocalAudioInterface(audioIO);
-        connect(audioIO, &AudioClient::noiseGateOpened, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateOpened);
-        connect(audioIO, &AudioClient::noiseGateClosed, audioScriptingInterface.data(), &AudioScriptingInterface::noiseGateClosed);
-        connect(audioIO, &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived);
+// cause main thread to be unresponsive for 35 seconds
+void Application::unresponsiveApplication() {
+    // to avoid compiler warnings about a loop that will never exit
+    uint64_t start = usecTimestampNow();
+    uint64_t UNRESPONSIVE_FOR_SECONDS = 35;
+    uint64_t UNRESPONSIVE_FOR_USECS = UNRESPONSIVE_FOR_SECONDS * USECS_PER_SECOND;
+    qCDebug(interfaceapp) << "Intentionally cause Interface to be unresponsive for " << UNRESPONSIVE_FOR_SECONDS << " seconds";
+    while (usecTimestampNow() - start < UNRESPONSIVE_FOR_USECS) {
+        QThread::sleep(1);
     }
+}
 
-    this->installEventFilter(this);
-
-
-    // If launched from Steam, let it handle updates
-    bool buildCanUpdate = BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable
-        || BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Master;
-    if (!parser.isSet("no-updater") && buildCanUpdate) {
-        constexpr auto INSTALLER_TYPE_CLIENT_ONLY = "client_only";
-
-        auto applicationUpdater = DependencyManager::set<AutoUpdater>();
-
-        AutoUpdater::InstallerType type = installerType == INSTALLER_TYPE_CLIENT_ONLY
-            ? AutoUpdater::InstallerType::CLIENT_ONLY : AutoUpdater::InstallerType::FULL;
+// used to test "shutdown" crash annotation.
+void Application::crashOnShutdown() {
+    qDebug() << "crashOnShutdown(), ON PURPOSE!";
+    _crashOnShutdown = true;
+    quit();
+}
 
-        applicationUpdater->setInstallerType(type);
-        applicationUpdater->setInstallerCampaign(installerCampaign);
-        connect(applicationUpdater.data(), &AutoUpdater::newVersionIsAvailable, dialogsManager.data(), &DialogsManager::showUpdateDialog);
-        applicationUpdater->checkForUpdate();
+void Application::rotationModeChanged() const {
+    if (!Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
+        getMyAvatar()->setHeadPitch(0);
     }
+}
 
-    Menu::getInstance()->setIsOptionChecked(MenuOption::ActionMotorControl, true);
-
-// FIXME spacemouse code still needs cleanup
-#if 0
-    // the 3Dconnexion device wants to be initialized after a window is displayed.
-    SpacemouseManager::getInstance().init();
-#endif
-
-    // If the user clicks on an object, we will check that it's a web surface, and if so, set the focus to it
-    auto pointerManager = DependencyManager::get<PointerManager>();
-    auto keyboardFocusOperator = [this](const QUuid& id, const PointerEvent& event) {
-        if (event.shouldFocus()) {
-            auto keyboard = DependencyManager::get<Keyboard>();
-            if (getEntities()->wantsKeyboardFocus(id)) {
-                setKeyboardFocusEntity(id);
-            } else if (!keyboard->containsID(id)) { // FIXME: this is a hack to make the keyboard work for now, since the keys would otherwise steal focus
-                setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-            }
-        }
-    };
-    connect(pointerManager.data(), &PointerManager::triggerBeginEntity, keyboardFocusOperator);
-    connect(pointerManager.data(), &PointerManager::triggerBeginOverlay, keyboardFocusOperator);
-
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityItemID) {
-        if (entityItemID == _keyboardFocusedEntity.get()) {
-            setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-        }
-    }, Qt::QueuedConnection);
-
-    EntityTreeRenderer::setAddMaterialToEntityOperator([this](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
-        if (_aboutToQuit) {
-            return false;
-        }
-
-        auto renderable = getEntities()->renderableForEntityId(entityID);
-        if (renderable) {
-            renderable->addMaterial(material, parentMaterialName);
-            return true;
-        }
-
-        return false;
-    });
-    EntityTreeRenderer::setRemoveMaterialFromEntityOperator([this](const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
-        if (_aboutToQuit) {
-            return false;
-        }
-
-        auto renderable = getEntities()->renderableForEntityId(entityID);
-        if (renderable) {
-            renderable->removeMaterial(material, parentMaterialName);
-            return true;
-        }
-
-        return false;
-    });
-
-    EntityTreeRenderer::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        auto avatar = static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(avatarID));
-        if (avatar) {
-            avatar->addMaterial(material, parentMaterialName);
-            return true;
-        }
-        return false;
-    });
-    EntityTreeRenderer::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        auto avatar = static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(avatarID));
-        if (avatar) {
-            avatar->removeMaterial(material, parentMaterialName);
-            return true;
-        }
-        return false;
-    });
-    EntityTree::setGetUnscaledDimensionsForIDOperator([this](const QUuid& id) {
-        if (_aboutToQuit) {
-            return glm::vec3(1.0f);
-        }
-
-        auto entity = getEntities()->getEntity(id);
-        if (entity) {
-            return entity->getUnscaledDimensions();
-        }
-
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        auto avatar = static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(id));
-        if (avatar) {
-            return avatar->getSNScale();
-        }
-        return glm::vec3(1.0f);
-    });
-    Procedural::opaqueStencil = [](gpu::StatePointer state) { PrepareStencil::testMaskDrawShape(*state); };
-    Procedural::transparentStencil = [](gpu::StatePointer state) { PrepareStencil::testMask(*state); };
-
-    EntityTree::setGetEntityObjectOperator([this](const QUuid& id) -> QObject* {
-        auto entities = getEntities();
-        if (auto entity = entities->renderableForEntityId(id)) {
-            return qobject_cast<QObject*>(entity.get());
-        }
-        return nullptr;
-    });
-
-    EntityTree::setEmitScriptEventOperator([this](const QUuid& id, const QVariant& message) {
-        auto entities = getEntities();
-        if (auto entity = entities->renderableForEntityId(id)) {
-            entity->emitScriptEvent(message);
-        }
-    });
-
-    EntityTree::setTextSizeOperator([this](const QUuid& id, const QString& text) {
-        auto entities = getEntities();
-        if (auto entity = entities->renderableForEntityId(id)) {
-            if (auto renderable = std::dynamic_pointer_cast<render::entities::TextEntityRenderer>(entity)) {
-                return renderable->textSize(text);
-            }
-        }
-        return QSizeF(0.0f, 0.0f);
-    });
-
-    Texture::setUnboundTextureForUUIDOperator([this](const QUuid& entityID) -> gpu::TexturePointer {
-        if (_aboutToQuit) {
-            return nullptr;
-        }
-
-        auto renderable = getEntities()->renderableForEntityId(entityID);
-        if (renderable) {
-            return renderable->getTexture();
-        }
-
-        return nullptr;
-    });
-
-    ReferenceMaterial::setMaterialForUUIDOperator([this](const QUuid& entityID) -> graphics::MaterialPointer {
-        if (_aboutToQuit) {
-            return nullptr;
-        }
-
-        auto renderable = getEntities()->renderableForEntityId(entityID);
-        if (renderable) {
-            return renderable->getTopMaterial();
-        }
-
-        return nullptr;
-    });
-
-    connect(this, &Application::aboutToQuit, [this]() {
-        setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-    });
-
-    // Add periodic checks to send user activity data
-    static int CHECK_NEARBY_AVATARS_INTERVAL_MS = 10000;
-    static int NEARBY_AVATAR_RADIUS_METERS = 10;
-
-    // setup the stats interval depending on if the 1s faster hearbeat was requested
-    static int SEND_STATS_INTERVAL_MS;
-    if (parser.isSet("fast-heartbeat")) {
-        SEND_STATS_INTERVAL_MS = 1000;
-    } else {
-        SEND_STATS_INTERVAL_MS = 10000;
+void Application::setIsServerlessMode(bool serverlessDomain) {
+    DependencyManager::get<NodeList>()->setSendDomainServerCheckInEnabled(!serverlessDomain);
+    auto tree = getEntities()->getTree();
+    if (tree) {
+        tree->setIsServerlessMode(serverlessDomain);
     }
+}
 
-    static glm::vec3 lastAvatarPosition = myAvatar->getWorldPosition();
-    static glm::mat4 lastHMDHeadPose = getHMDSensorPose();
-    static controller::Pose lastLeftHandPose = myAvatar->getLeftHandPose();
-    static controller::Pose lastRightHandPose = myAvatar->getRightHandPose();
-
-    // Periodically send fps as a user activity event
-    QTimer* sendStatsTimer = new QTimer(this);
-    sendStatsTimer->setInterval(SEND_STATS_INTERVAL_MS);  // 10s, Qt::CoarseTimer acceptable
-    connect(sendStatsTimer, &QTimer::timeout, this, [this]() {
-
-        QJsonObject properties = {};
-        MemoryInfo memInfo;
-        if (getMemoryInfo(memInfo)) {
-            properties["system_memory_total"] = static_cast<qint64>(memInfo.totalMemoryBytes);
-            properties["system_memory_used"] = static_cast<qint64>(memInfo.usedMemoryBytes);
-            properties["process_memory_used"] = static_cast<qint64>(memInfo.processUsedMemoryBytes);
-        }
-
-        // content location and build info - useful for filtering stats
-        auto addressManager = DependencyManager::get<AddressManager>();
-        auto currentDomain = addressManager->currentShareableAddress(true).toString(); // domain only
-        auto currentPath = addressManager->currentPath(true); // with orientation
-        properties["current_domain"] = currentDomain;
-        properties["current_path"] = currentPath;
-        properties["build_version"] = BuildInfo::VERSION;
-
-        auto displayPlugin = qApp->getActiveDisplayPlugin();
-
-        properties["render_rate"] = getRenderLoopRate();
-        properties["target_render_rate"] = getTargetRenderFrameRate();
-        properties["present_rate"] = displayPlugin->presentRate();
-        properties["new_frame_present_rate"] = displayPlugin->newFramePresentRate();
-        properties["dropped_frame_rate"] = displayPlugin->droppedFrameRate();
-        properties["stutter_rate"] = displayPlugin->stutterRate();
-        properties["game_rate"] = getGameLoopRate();
-        properties["has_async_reprojection"] = displayPlugin->hasAsyncReprojection();
-        properties["hardware_stats"] = displayPlugin->getHardwareStats();
-
-        // deadlock watchdog related stats
-        properties["deadlock_watchdog_maxElapsed"] = (int)DeadlockWatchdogThread::_maxElapsed;
-        properties["deadlock_watchdog_maxElapsedAverage"] = (int)DeadlockWatchdogThread::_maxElapsedAverage;
-
-        auto nodeList = DependencyManager::get<NodeList>();
-        properties["packet_rate_in"] = nodeList->getInboundPPS();
-        properties["packet_rate_out"] = nodeList->getOutboundPPS();
-        properties["kbps_in"] = nodeList->getInboundKbps();
-        properties["kbps_out"] = nodeList->getOutboundKbps();
-
-        SharedNodePointer entityServerNode = nodeList->soloNodeOfType(NodeType::EntityServer);
-        SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NodeType::AudioMixer);
-        SharedNodePointer avatarMixerNode = nodeList->soloNodeOfType(NodeType::AvatarMixer);
-        SharedNodePointer assetServerNode = nodeList->soloNodeOfType(NodeType::AssetServer);
-        SharedNodePointer messagesMixerNode = nodeList->soloNodeOfType(NodeType::MessagesMixer);
-        properties["entity_ping"] = entityServerNode ? entityServerNode->getPingMs() : -1;
-        properties["audio_ping"] = audioMixerNode ? audioMixerNode->getPingMs() : -1;
-        properties["avatar_ping"] = avatarMixerNode ? avatarMixerNode->getPingMs() : -1;
-        properties["asset_ping"] = assetServerNode ? assetServerNode->getPingMs() : -1;
-        properties["messages_ping"] = messagesMixerNode ? messagesMixerNode->getPingMs() : -1;
-        properties["atp_in_kbps"] = assetServerNode ? assetServerNode->getInboundKbps() : 0.0f;
-
-        auto loadingRequests = ResourceCache::getLoadingRequests();
-
-        QJsonArray loadingRequestsStats;
-        for (const auto& request : loadingRequests) {
-            QJsonObject requestStats;
-            requestStats["filename"] = request->getURL().fileName();
-            requestStats["received"] = request->getBytesReceived();
-            requestStats["total"] = request->getBytesTotal();
-            requestStats["attempts"] = (int)request->getDownloadAttempts();
-            loadingRequestsStats.append(requestStats);
-        }
-
-        properties["active_downloads"] = loadingRequests.size();
-        properties["pending_downloads"] = (int)ResourceCache::getPendingRequestCount();
-        properties["active_downloads_details"] = loadingRequestsStats;
-
-        auto statTracker = DependencyManager::get<StatTracker>();
-
-        properties["processing_resources"] = statTracker->getStat("Processing").toInt();
-        properties["pending_processing_resources"] = statTracker->getStat("PendingProcessing").toInt();
-
-        QJsonObject startedRequests;
-        startedRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_STARTED).toInt();
-        startedRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_STARTED).toInt();
-        startedRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_STARTED).toInt();
-        startedRequests["total"] = startedRequests["atp"].toInt() + startedRequests["http"].toInt()
-            + startedRequests["file"].toInt();
-        properties["started_requests"] = startedRequests;
-
-        QJsonObject successfulRequests;
-        successfulRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_SUCCESS).toInt();
-        successfulRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_SUCCESS).toInt();
-        successfulRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_SUCCESS).toInt();
-        successfulRequests["total"] = successfulRequests["atp"].toInt() + successfulRequests["http"].toInt()
-            + successfulRequests["file"].toInt();
-        properties["successful_requests"] = successfulRequests;
-
-        QJsonObject failedRequests;
-        failedRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_FAILED).toInt();
-        failedRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_FAILED).toInt();
-        failedRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_FAILED).toInt();
-        failedRequests["total"] = failedRequests["atp"].toInt() + failedRequests["http"].toInt()
-            + failedRequests["file"].toInt();
-        properties["failed_requests"] = failedRequests;
-
-        QJsonObject cacheRequests;
-        cacheRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_CACHE).toInt();
-        cacheRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_CACHE).toInt();
-        cacheRequests["total"] = cacheRequests["atp"].toInt() + cacheRequests["http"].toInt();
-        properties["cache_requests"] = cacheRequests;
-
-        QJsonObject atpMappingRequests;
-        atpMappingRequests["started"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_STARTED).toInt();
-        atpMappingRequests["failed"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_FAILED).toInt();
-        atpMappingRequests["successful"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_SUCCESS).toInt();
-        properties["atp_mapping_requests"] = atpMappingRequests;
-
-        properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false;
-
-        QJsonObject bytesDownloaded;
-        auto atpBytes = statTracker->getStat(STAT_ATP_RESOURCE_TOTAL_BYTES).toLongLong();
-        auto httpBytes = statTracker->getStat(STAT_HTTP_RESOURCE_TOTAL_BYTES).toLongLong();
-        auto fileBytes = statTracker->getStat(STAT_FILE_RESOURCE_TOTAL_BYTES).toLongLong();
-        bytesDownloaded["atp"] = atpBytes;
-        bytesDownloaded["http"] = httpBytes;
-        bytesDownloaded["file"] = fileBytes;
-        bytesDownloaded["total"] = atpBytes + httpBytes + fileBytes;
-        properties["bytes_downloaded"] = bytesDownloaded;
-
-        auto myAvatar = getMyAvatar();
-        glm::vec3 avatarPosition = myAvatar->getWorldPosition();
-        properties["avatar_has_moved"] = lastAvatarPosition != avatarPosition;
-        lastAvatarPosition = avatarPosition;
-
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        auto entityActivityTracking = entityScriptingInterface->getActivityTracking();
-        entityScriptingInterface->resetActivityTracking();
-        properties["added_entity_cnt"] = entityActivityTracking.addedEntityCount;
-        properties["deleted_entity_cnt"] = entityActivityTracking.deletedEntityCount;
-        properties["edited_entity_cnt"] = entityActivityTracking.editedEntityCount;
-
-        NodeToOctreeSceneStats* octreeServerSceneStats = getOcteeSceneStats();
-        unsigned long totalServerOctreeElements = 0;
-        for (NodeToOctreeSceneStatsIterator i = octreeServerSceneStats->begin(); i != octreeServerSceneStats->end(); i++) {
-            totalServerOctreeElements += i->second.getTotalElements();
-        }
-
-        properties["local_octree_elements"] = (qint64) OctreeElement::getInternalNodeCount();
-        properties["server_octree_elements"] = (qint64) totalServerOctreeElements;
-
-        properties["active_display_plugin"] = getActiveDisplayPlugin()->getName();
-        properties["using_hmd"] = isHMDMode();
-
-        auto contextInfo = gl::ContextInfo::get();
-        properties["gl_info"] = QJsonObject{
-            { "version", contextInfo.version.c_str() },
-            { "sl_version", contextInfo.shadingLanguageVersion.c_str() },
-            { "vendor", contextInfo.vendor.c_str() },
-            { "renderer", contextInfo.renderer.c_str() },
-        };
-        properties["gpu_used_memory"] = (int)BYTES_TO_MB(gpu::Context::getUsedGPUMemSize());
-        properties["gpu_free_memory"] = (int)BYTES_TO_MB(gpu::Context::getFreeGPUMemSize());
-        properties["gpu_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerGPUAverage());
-        properties["batch_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerBatchAverage());
-        properties["ideal_thread_count"] = QThread::idealThreadCount();
-
-        auto hmdHeadPose = getHMDSensorPose();
-        properties["hmd_head_pose_changed"] = isHMDMode() && (hmdHeadPose != lastHMDHeadPose);
-        lastHMDHeadPose = hmdHeadPose;
-
-        auto leftHandPose = myAvatar->getLeftHandPose();
-        auto rightHandPose = myAvatar->getRightHandPose();
-        // controller::Pose considers two poses to be different if either are invalid. In our case, we actually
-        // want to consider the pose to be unchanged if it was invalid and still is invalid, so we check that first.
-        properties["hand_pose_changed"] =
-            ((leftHandPose.valid || lastLeftHandPose.valid) && (leftHandPose != lastLeftHandPose))
-            || ((rightHandPose.valid || lastRightHandPose.valid) && (rightHandPose != lastRightHandPose));
-        lastLeftHandPose = leftHandPose;
-        lastRightHandPose = rightHandPose;
-
-        UserActivityLogger::getInstance().logAction("stats", properties);
-    });
-    sendStatsTimer->start();
-
-    // Periodically check for count of nearby avatars
-    static int lastCountOfNearbyAvatars = -1;
-    QTimer* checkNearbyAvatarsTimer = new QTimer(this);
-    checkNearbyAvatarsTimer->setInterval(CHECK_NEARBY_AVATARS_INTERVAL_MS); // 10 seconds, Qt::CoarseTimer ok
-    connect(checkNearbyAvatarsTimer, &QTimer::timeout, this, []() {
-        auto avatarManager = DependencyManager::get<AvatarManager>();
-        int nearbyAvatars = avatarManager->numberOfAvatarsInRange(avatarManager->getMyAvatar()->getWorldPosition(),
-                                                                  NEARBY_AVATAR_RADIUS_METERS) - 1;
-        if (nearbyAvatars != lastCountOfNearbyAvatars) {
-            lastCountOfNearbyAvatars = nearbyAvatars;
-            UserActivityLogger::getInstance().logAction("nearby_avatars", { { "count", nearbyAvatars } });
-        }
-    });
-    checkNearbyAvatarsTimer->start();
+std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl domainURL, QByteArray data) {
+    QUuid serverlessSessionID = QUuid::createUuid();
+    getMyAvatar()->setSessionUUID(serverlessSessionID);
+    auto nodeList = DependencyManager::get<NodeList>();
+    nodeList->setSessionUUID(serverlessSessionID);
 
-    // Track user activity event when we receive a mute packet
-    auto onMutedByMixer = []() {
-        UserActivityLogger::getInstance().logAction("received_mute_packet");
-    };
-    connect(DependencyManager::get<AudioClient>().data(), &AudioClient::mutedByMixer, this, onMutedByMixer);
+    // there is no domain-server to tell us our permissions, so enable all
+    NodePermissions permissions;
+    permissions.setAll(true);
+    nodeList->setPermissions(permissions);
 
-    // Track when the address bar is opened
-    auto onAddressBarShown = [this]() {
-        // Record time
-        UserActivityLogger::getInstance().logAction("opened_address_bar", { { "uptime_ms", _sessionRunTimer.elapsed() } });
-    };
-    connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::addressBarShown, this, onAddressBarShown);
+    // FIXME: Lock the main tree and import directly into it.
+    EntityTreePointer tmpTree(std::make_shared<EntityTree>());
+    tmpTree->setIsServerlessMode(true);
+    tmpTree->createRootElement();
+    auto myAvatar = getMyAvatar();
+    tmpTree->setMyAvatar(myAvatar);
+    bool success = tmpTree->readFromByteArray(domainURL.toString(), data);
+    if (success) {
+        tmpTree->reaverageOctreeElements();
+        tmpTree->sendEntities(_entityEditSender.get(), getEntities()->getTree(), "domain", 0, 0, 0);
+    }
+    std::map<QString, QString> namedPaths = tmpTree->getNamedPaths();
 
-    // Make sure we don't time out during slow operations at startup
-    updateHeartbeat();
+    // we must manually eraseAllOctreeElements(false) else the tmpTree will mem-leak
+    tmpTree->eraseAllOctreeElements(false);
 
-    OctreeEditPacketSender* packetSender = entityScriptingInterface->getPacketSender();
-    EntityEditPacketSender* entityPacketSender = static_cast<EntityEditPacketSender*>(packetSender);
-    entityPacketSender->setMyAvatar(myAvatar.get());
+    return namedPaths;
+}
 
-    connect(this, &Application::applicationStateChanged, this, &Application::activeChanged);
-    connect(_window, SIGNAL(windowMinimizedChanged(bool)), this, SLOT(windowMinimizedChanged(bool)));
-    qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)_sessionRunTimer.elapsed() / 1000.0);
+void Application::loadServerlessDomain(QUrl domainURL) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "loadServerlessDomain", Q_ARG(QUrl, domainURL));
+        return;
+    }
 
-    EntityTreeRenderer::setEntitiesShouldFadeFunction([this]() {
-        SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
-        return entityServerNode && !isPhysicsEnabled();
-    });
+    if (domainURL.isEmpty()) {
+        return;
+    }
 
-    _snapshotSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/snapshot/snap.wav"));
-
-    // Monitor model assets (e.g., from Clara.io) added to the world that may need resizing.
-    static const int ADD_ASSET_TO_WORLD_TIMER_INTERVAL_MS = 1000;
-    _addAssetToWorldResizeTimer.setInterval(ADD_ASSET_TO_WORLD_TIMER_INTERVAL_MS); // 1s, Qt::CoarseTimer acceptable
-    connect(&_addAssetToWorldResizeTimer, &QTimer::timeout, this, &Application::addAssetToWorldCheckModelSize);
-
-    // Auto-update and close adding asset to world info message box.
-    static const int ADD_ASSET_TO_WORLD_INFO_TIMEOUT_MS = 5000;
-    _addAssetToWorldInfoTimer.setInterval(ADD_ASSET_TO_WORLD_INFO_TIMEOUT_MS); // 5s, Qt::CoarseTimer acceptable
-    _addAssetToWorldInfoTimer.setSingleShot(true);
-    connect(&_addAssetToWorldInfoTimer, &QTimer::timeout, this, &Application::addAssetToWorldInfoTimeout);
-    static const int ADD_ASSET_TO_WORLD_ERROR_TIMEOUT_MS = 8000;
-    _addAssetToWorldErrorTimer.setInterval(ADD_ASSET_TO_WORLD_ERROR_TIMEOUT_MS); // 8s, Qt::CoarseTimer acceptable
-    _addAssetToWorldErrorTimer.setSingleShot(true);
-    connect(&_addAssetToWorldErrorTimer, &QTimer::timeout, this, &Application::addAssetToWorldErrorTimeout);
-
-    connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose);
-    connect(&domainHandler, &DomainHandler::domainURLChanged, this, &Application::addAssetToWorldMessageClose);
-    connect(&domainHandler, &DomainHandler::redirectToErrorDomainURL, this, &Application::addAssetToWorldMessageClose);
-
-    updateSystemTabletMode();
-
-    connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
-    connect(&_myCamera, &Camera::captureMouseChanged, this, &Application::captureMouseChanged);
-
-    DependencyManager::get<PickManager>()->setShouldPickHUDOperator([]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
-    DependencyManager::get<PickManager>()->setCalculatePos2DFromHUDOperator([this](const glm::vec3& intersection) {
-        const glm::vec2 MARGIN(25.0f);
-        glm::vec2 maxPos = _controllerScriptingInterface->getViewportDimensions() - MARGIN;
-        glm::vec2 pos2D = DependencyManager::get<HMDScriptingInterface>()->overlayFromWorldPoint(intersection);
-        return glm::max(MARGIN, glm::min(pos2D, maxPos));
-    });
+    QString trimmedUrl = domainURL.toString().trimmed();
+    bool DEFAULT_IS_OBSERVABLE = true;
+    const qint64 DEFAULT_CALLER_ID = -1;
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
+        this, trimmedUrl, DEFAULT_IS_OBSERVABLE, DEFAULT_CALLER_ID, "Application::loadServerlessDomain");
 
-    // Setup the mouse ray pick and related operators
-    {
-        auto mouseRayPick = std::make_shared<RayPick>(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::getPickEntities() | PickScriptingInterface::getPickLocalEntities()), 0.0f, true);
-        mouseRayPick->parentTransform = std::make_shared<MouseTransformNode>();
-        mouseRayPick->setJointState(PickQuery::JOINT_STATE_MOUSE);
-        auto mouseRayPickID = DependencyManager::get<PickManager>()->addPick(PickQuery::Ray, mouseRayPick);
-        DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickID(mouseRayPickID);
+    if (!request) {
+        return;
     }
-    DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickResultOperator([](unsigned int rayPickID) {
-        RayToEntityIntersectionResult entityResult;
-        entityResult.intersects = false;
-        auto pickResult = DependencyManager::get<PickManager>()->getPrevPickResultTyped<RayPickResult>(rayPickID);
-        if (pickResult) {
-            entityResult.intersects = pickResult->type != IntersectionType::NONE;
-            if (entityResult.intersects) {
-                entityResult.intersection = pickResult->intersection;
-                entityResult.distance = pickResult->distance;
-                entityResult.surfaceNormal = pickResult->surfaceNormal;
-                entityResult.entityID = pickResult->objectID;
-                entityResult.extraInfo = pickResult->extraInfo;
-            }
-        }
-        return entityResult;
-    });
-    DependencyManager::get<EntityTreeRenderer>()->setSetPrecisionPickingOperator([](unsigned int rayPickID, bool value) {
-        DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value);
-    });
 
-    BillboardModeHelpers::setBillboardRotationOperator([](const glm::vec3& position, const glm::quat& rotation,
-                                                          BillboardMode billboardMode, const glm::vec3& frustumPos, bool rotate90x) {
-        const glm::quat ROTATE_90X = glm::angleAxis(-(float)M_PI_2, Vectors::RIGHT);
-        if (billboardMode == BillboardMode::YAW) {
-            //rotate about vertical to face the camera
-            glm::vec3 dPosition = frustumPos - position;
-            // If x and z are 0, atan(x, z) is undefined, so default to 0 degrees
-            float yawRotation = dPosition.x == 0.0f && dPosition.z == 0.0f ? 0.0f : glm::atan(dPosition.x, dPosition.z);
-            glm::quat result = glm::quat(glm::vec3(0.0f, yawRotation, 0.0f)) * rotation;
-            if (rotate90x) {
-                result *= ROTATE_90X;
-            }
-            return result;
-        } else if (billboardMode == BillboardMode::FULL) {
-            // use the referencial from the avatar, y isn't always up
-            glm::vec3 avatarUP = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldOrientation() * Vectors::UP;
-            // check to see if glm::lookAt will work / using glm::lookAt variable name
-            glm::highp_vec3 s(glm::cross(position - frustumPos, avatarUP));
-
-            // make sure s is not NaN for any component
-            if (glm::length2(s) > 0.0f) {
-                glm::quat result = glm::conjugate(glm::toQuat(glm::lookAt(frustumPos, position, avatarUP))) * rotation;
-                if (rotate90x) {
-                    result *= ROTATE_90X;
-                }
-                return result;
-            }
+    connect(request, &ResourceRequest::finished, this, [=]() {
+        if (request->getResult() == ResourceRequest::Success) {
+            auto namedPaths = prepareServerlessDomainContents(domainURL, request->getData());
+            auto nodeList = DependencyManager::get<NodeList>();
+            nodeList->getDomainHandler().connectedToServerless(namedPaths);
+            _octreeProcessor->getFullSceneReceivedCounter()++;
         }
-        return rotation;
-    });
-    BillboardModeHelpers::setPrimaryViewFrustumPositionOperator([this]() {
-        ViewFrustum viewFrustum;
-        copyViewFrustum(viewFrustum);
-        return viewFrustum.getPosition();
+        request->deleteLater();
     });
+    request->send();
+}
 
-    DependencyManager::get<UsersScriptingInterface>()->setKickConfirmationOperator([this] (const QUuid& nodeID, unsigned int banFlags) { userKickConfirmation(nodeID, banFlags); });
+void Application::loadErrorDomain(QUrl domainURL) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "loadErrorDomain", Q_ARG(QUrl, domainURL));
+        return;
+    }
 
-    render::entities::WebEntityRenderer::setAcquireWebSurfaceOperator([=](const QString& url, bool htmlContent, QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface) {
-        bool isTablet = url == TabletScriptingInterface::QML;
-        if (htmlContent) {
-            webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(render::entities::WebEntityRenderer::QML);
-            cachedWebSurface = true;
-            auto rootItemLoadedFunctor = [url, webSurface] {
-                webSurface->getRootItem()->setProperty(render::entities::WebEntityRenderer::URL_PROPERTY, url);
-            };
-            if (webSurface->getRootItem()) {
-                rootItemLoadedFunctor();
-            } else {
-                QObject::connect(webSurface.data(), &hifi::qml::OffscreenSurface::rootContextCreated, rootItemLoadedFunctor);
-            }
-            auto surfaceContext = webSurface->getSurfaceContext();
-            surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
-        } else {
-            // FIXME: the tablet should use the OffscreenQmlSurfaceCache
-            webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), [](OffscreenQmlSurface* webSurface) {
-                AbstractViewStateInterface::instance()->sendLambdaEvent([webSurface] {
-                    // WebEngineView may run other threads (wasapi), so they must be deleted for a clean shutdown
-                    // if the application has already stopped its event loop, delete must be explicit
-                    delete webSurface;
-                });
-            });
-            auto rootItemLoadedFunctor = [webSurface, url, isTablet] {
-                Application::setupQmlSurface(webSurface->getSurfaceContext(), isTablet || url == LOGIN_DIALOG.toString() || url == AVATAR_INPUTS_BAR_QML.toString() ||
-                   url == BUBBLE_ICON_QML.toString());
-            };
-            if (webSurface->getRootItem()) {
-                rootItemLoadedFunctor();
-            } else {
-                QObject::connect(webSurface.data(), &hifi::qml::OffscreenSurface::rootContextCreated, rootItemLoadedFunctor);
-            }
-            webSurface->load(url);
-            cachedWebSurface = false;
-        }
-        const uint8_t DEFAULT_MAX_FPS = 10;
-        const uint8_t TABLET_FPS = 90;
-        webSurface->setMaxFps(isTablet ? TABLET_FPS : DEFAULT_MAX_FPS);
-    });
-    render::entities::WebEntityRenderer::setReleaseWebSurfaceOperator([=](QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface, std::vector<QMetaObject::Connection>& connections) {
-        QQuickItem* rootItem = webSurface->getRootItem();
-
-        // Fix for crash in QtWebEngineCore when rapidly switching domains
-        // Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
-        if (rootItem && !cachedWebSurface) {
-            // stop loading
-            QMetaObject::invokeMethod(rootItem, "stop");
-        }
+    loadServerlessDomain(domainURL);
+}
 
-        webSurface->pause();
+void Application::setIsInterstitialMode(bool interstitialMode) {
+    bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
+    if (enableInterstitial) {
+        if (_interstitialMode != interstitialMode) {
+            _interstitialMode = interstitialMode;
+            emit interstitialModeChanged(_interstitialMode);
 
-        for (auto& connection : connections) {
-            QObject::disconnect(connection);
-        }
-        connections.clear();
-
-        // If the web surface was fetched out of the cache, release it back into the cache
-        if (cachedWebSurface) {
-            // If it's going back into the cache make sure to explicitly set the URL to a blank page
-            // in order to stop any resource consumption or audio related to the page.
-            if (rootItem) {
-                rootItem->setProperty("url", "about:blank");
-            }
-            auto offscreenCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
-            if (offscreenCache) {
-                offscreenCache->release(render::entities::WebEntityRenderer::QML, webSurface);
-            }
-            cachedWebSurface = false;
+            DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);
+            DependencyManager::get<AvatarManager>()->setMyAvatarDataPacketsPaused(_interstitialMode);
         }
-        webSurface.reset();
-    });
-
-    // Preload Tablet sounds
-    DependencyManager::get<EntityScriptingInterface>()->setEntityTree(qApp->getEntities()->getTree());
-    DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
-    DependencyManager::get<Keyboard>()->createKeyboard();
-
-    // Initialize Discord rich presence
-    _discordPresence = new DiscordPresence();
-
-    FileDialogHelper::setOpenDirectoryOperator([this](const QString& path) { openDirectory(path); });
-    QDesktopServices::setUrlHandler("file", this, "showUrlHandler");
-    QDesktopServices::setUrlHandler("", this, "showUrlHandler");
-    auto drives = QDir::drives();
-    for (auto drive : drives) {
-        QDesktopServices::setUrlHandler(QUrl(drive.absolutePath()).scheme(), this, "showUrlHandler");
     }
-
-    _pendingIdleEvent = false;
-    _graphicsEngine->startup();
-
-    qCDebug(interfaceapp) << "Directory Service session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
-
-#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);
-    connect(&AndroidHelper::instance(), &AndroidHelper::toggleAwayMode, this, &Application::toggleAwayMode);
-    AndroidHelper::instance().notifyLoadComplete();
-#endif
-    pauseUntilLoginDetermined();
-}
-
-void Application::setFailedToConnectToEntityServer() {
-    _failedToConnectToEntityServer = true;
 }
 
 void Application::updateVerboseLogging() {
@@ -2667,6 +1053,7 @@ void Application::updateVerboseLogging() {
     QLoggingCategory::setFilterRules(rules);
 }
 
+static const QString CACHEBUST_SCRIPT_REQUIRE_SETTING_NAME = "cachebustScriptRequire";
 void Application::setCachebustRequire() {
     auto menu = Menu::getInstance();
     if (!menu) {
@@ -2677,122 +1064,56 @@ void Application::setCachebustRequire() {
     Setting::Handle<bool>{ CACHEBUST_SCRIPT_REQUIRE_SETTING_NAME, false }.set(enable);
 }
 
-void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
-    DomainHandler::ConnectionRefusedReason reasonCode = static_cast<DomainHandler::ConnectionRefusedReason>(reasonCodeInt);
+QString Application::getGraphicsCardType() {
+    return GPUIdent::getInstance()->getName();
+}
 
-    if (reasonCode == DomainHandler::ConnectionRefusedReason::TooManyUsers && !extraInfo.isEmpty()) {
-        DependencyManager::get<AddressManager>()->handleLookupString(extraInfo);
-        return;
+bool Application::gpuTextureMemSizeStable() {
+    auto renderConfig = qApp->getRenderEngine()->getConfiguration();
+    auto renderStats = renderConfig->getConfig<render::EngineStats>("Stats");
+
+    qint64 textureResourceGPUMemSize = renderStats->textureResourceGPUMemSize;
+    qint64 texturePopulatedGPUMemSize = renderStats->textureResourcePopulatedGPUMemSize;
+    qint64 textureTransferSize = renderStats->texturePendingGPUTransferSize;
+
+    if (_gpuTextureMemSizeAtLastCheck == textureResourceGPUMemSize) {
+        _gpuTextureMemSizeStabilityCount++;
+    } else {
+        _gpuTextureMemSizeStabilityCount = 0;
     }
+    _gpuTextureMemSizeAtLastCheck = textureResourceGPUMemSize;
 
-    switch (reasonCode) {
-        case DomainHandler::ConnectionRefusedReason::ProtocolMismatch:
-        case DomainHandler::ConnectionRefusedReason::TooManyUsers:
-        case DomainHandler::ConnectionRefusedReason::Unknown: {
-            QString message = "Unable to connect to the location you are visiting.\n";
-            message += reasonMessage;
-            OffscreenUi::asyncWarning("", message);
-            getMyAvatar()->setWorldVelocity(glm::vec3(0.0f));
-            break;
-        }
-        default:
-            // nothing to do.
-            break;
+    if (_gpuTextureMemSizeStabilityCount >= _minimumGPUTextureMemSizeStabilityCount) {
+        return (textureResourceGPUMemSize == texturePopulatedGPUMemSize) && (textureTransferSize == 0);
     }
+    return false;
 }
 
-QString Application::getUserAgent() {
-    if (QThread::currentThread() != thread()) {
-        QString userAgent;
+void Application::runTests() {
+    runTimingTests();
+    runUnitTests();
+}
 
-        BLOCKING_INVOKE_METHOD(this, "getUserAgent", Q_RETURN_ARG(QString, userAgent));
+void Application::resetPhysicsReadyInformation() {
+    // we've changed domains or cleared out caches or something.  we no longer know enough about the
+    // collision information of nearby entities to make running bullet be safe.
+    _octreeProcessor->getFullSceneReceivedCounter() = 0;
+    _fullSceneCounterAtLastPhysicsCheck = 0;
+    _gpuTextureMemSizeStabilityCount = 0;
+    _gpuTextureMemSizeAtLastCheck = 0;
+    _physicsEnabled = false;
+    _octreeProcessor->stopSafeLanding();
+}
 
-        return userAgent;
-    }
+static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin";
+void Application::onAboutToQuit() {
+    auto &ch = CrashHandler::getInstance();
+    ch.setAnnotation("shutdown", "1");
 
-    QString userAgent = NetworkingConstants::OVERTE_USER_AGENT + "/" + BuildInfo::VERSION + "; "
-        + QSysInfo::productType() + " " + QSysInfo::productVersion() + ")";
+    // quickly save AvatarEntityData before the EntityTree is dismantled
+    getMyAvatar()->saveAvatarEntityDataToSettings();
 
-    auto formatPluginName = [](QString name) -> QString { return name.trimmed().replace(" ", "-");  };
-
-    // For each plugin, add to userAgent
-    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
-    for (const auto& dp : displayPlugins) {
-        if (dp->isActive() && dp->isHmd()) {
-            userAgent += " " + formatPluginName(dp->getName());
-        }
-    }
-    const auto& inputPlugins = PluginManager::getInstance()->getInputPlugins();
-    for (const auto& ip : inputPlugins) {
-        if (ip->isActive()) {
-            userAgent += " " + formatPluginName(ip->getName());
-        }
-    }
-    // for codecs, we include all of them, even if not active
-    const auto& codecPlugins = PluginManager::getInstance()->getCodecPlugins();
-    for (const auto& cp : codecPlugins) {
-        userAgent += " " + formatPluginName(cp->getName());
-    }
-
-    return userAgent;
-}
-
-void Application::toggleTabletUI(bool shouldOpen) const {
-    auto hmd = DependencyManager::get<HMDScriptingInterface>();
-    if (!(shouldOpen && hmd->getShouldShowTablet())) {
-        auto HMD = DependencyManager::get<HMDScriptingInterface>();
-        HMD->toggleShouldShowTablet();
-
-        if (!HMD->getShouldShowTablet()) {
-            DependencyManager::get<Keyboard>()->setRaised(false);
-            _window->activateWindow();
-            auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet(SYSTEM_TABLET);
-            tablet->unfocus();
-        }
-    }
-}
-
-void Application::checkChangeCursor() {
-    QMutexLocker locker(&_changeCursorLock);
-    if (_cursorNeedsChanging) {
-#ifdef Q_OS_MAC
-        auto cursorTarget = _window; // OSX doesn't seem to provide for hiding the cursor only on the GL widget
-#else
-        // On windows and linux, hiding the top level cursor also means it's invisible when hovering over the
-        // window menu, which is a pain, so only hide it for the GL surface
-        auto cursorTarget = _glWidget;
-#endif
-        cursorTarget->setCursor(_desiredCursor);
-
-        _cursorNeedsChanging = false;
-    }
-}
-
-void Application::showCursor(const Cursor::Icon& cursor) {
-    QMutexLocker locker(&_changeCursorLock);
-
-    auto managedCursor = Cursor::Manager::instance().getCursor();
-    auto curIcon = managedCursor->getIcon();
-    if (curIcon != cursor) {
-        managedCursor->setIcon(cursor);
-        curIcon = cursor;
-    }
-    _desiredCursor = cursor == Cursor::Icon::SYSTEM ? Qt::ArrowCursor : Qt::BlankCursor;
-    _cursorNeedsChanging = true;
-}
-
-void Application::updateHeartbeat() const {
-    DeadlockWatchdogThread::updateHeartbeat();
-}
-
-void Application::onAboutToQuit() {
-    auto &ch = CrashHandler::getInstance();
-    ch.setAnnotation("shutdown", "1");
-
-    // quickly save AvatarEntityData before the EntityTree is dismantled
-    getMyAvatar()->saveAvatarEntityDataToSettings();
-
-    emit beforeAboutToQuit();
+    emit beforeAboutToQuit();
 
     if (getLoginDialogPoppedUp() && _firstRun.get()) {
         _firstRun.set(false);
@@ -2808,8 +1129,6 @@ void Application::onAboutToQuit() {
     // so its persisted explicitly here
     Setting::Handle<QString>{ ACTIVE_DISPLAY_PLUGIN_SETTING_NAME }.set(getActiveDisplayPlugin()->getName());
 
-    loginDialogPoppedUp.set(false);
-
     getActiveDisplayPlugin()->deactivate();
     if (_autoSwitchDisplayModeSupportedHMDPlugin
         && _autoSwitchDisplayModeSupportedHMDPlugin->isSessionActive()) {
@@ -2835,1134 +1154,381 @@ void Application::onAboutToQuit() {
     getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::SHUTDOWN);
 }
 
-void Application::cleanupBeforeQuit() {
-    // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not
-    QString webengineRemoteDebugging = QProcessEnvironment::systemEnvironment().value("QTWEBENGINE_REMOTE_DEBUGGING", "false");
-    qCDebug(interfaceapp) << "QTWEBENGINE_REMOTE_DEBUGGING =" << webengineRemoteDebugging;
+void Application::loadSettings(const QCommandLineParser& parser) {
 
-    DependencyManager::prepareToExit();
+    sessionRunTime.set(0); // Just clean living. We're about to saveSettings, which will update value.
+    DependencyManager::get<AudioClient>()->loadSettings();
+    DependencyManager::get<LODManager>()->loadSettings();
 
-    if (tracing::enabled()) {
-        auto tracer = DependencyManager::get<tracing::Tracer>();
-        tracer->stopTracing();
-        auto outputFile = property(hifi::properties::TRACING).toString();
-        tracer->serialize(outputFile);
-    }
+    // DONT CHECK IN
+    //DependencyManager::get<LODManager>()->setAutomaticLODAdjust(false);
 
-    // Stop third party processes so that they're not left running in the event of a subsequent shutdown crash.
-    AnimDebugDraw::getInstance().shutdown();
+    auto menu = Menu::getInstance();
+    menu->loadSettings();
 
-    // FIXME: once we move to shared pointer for the INputDevice we shoud remove this naked delete:
-    _applicationStateDevice.reset();
+    // override the menu option show overlays to always be true on startup
+    menu->setIsOptionChecked(MenuOption::Overlays, true);
 
-    {
-        if (_keyboardFocusHighlightID != UNKNOWN_ENTITY_ID) {
-            DependencyManager::get<EntityScriptingInterface>()->deleteEntity(_keyboardFocusHighlightID);
-            _keyboardFocusHighlightID = UNKNOWN_ENTITY_ID;
+    // If there is a preferred plugin, we probably messed it up with the menu settings, so fix it.
+    auto pluginManager = PluginManager::getInstance();
+    auto plugins = pluginManager->getPreferredDisplayPlugins();
+    if (plugins.size() > 0) {
+        for (auto plugin : plugins) {
+            if (auto action = menu->getActionForOption(plugin->getName())) {
+                action->setChecked(true);
+                action->trigger();
+                // Find and activated highest priority plugin, bail for the rest
+                break;
+            }
         }
     }
 
-    {
-        auto nodeList = DependencyManager::get<NodeList>();
-
-        // send the domain a disconnect packet, force stoppage of domain-server check-ins
-        nodeList->getDomainHandler().disconnect("Quitting");
-        nodeList->setIsShuttingDown(true);
-
-        // tell the packet receiver we're shutting down, so it can drop packets
-        nodeList->getPacketReceiver().setShouldDropPackets(true);
+    bool isFirstPerson = false;
+    if (parser.isSet("no-launcher")) {
+        const auto& displayPlugins = pluginManager->getDisplayPlugins();
+        for (const auto& plugin : displayPlugins) {
+            if (!plugin->isHmd()) {
+                if (auto action = menu->getActionForOption(plugin->getName())) {
+                    action->setChecked(true);
+                    action->trigger();
+                    break;
+                }
+            }
+        }
+        isFirstPerson = (qApp->isHMDMode());
+    } else {
+        if (_firstRun.get()) {
+            // If this is our first run, and no preferred devices were set, default to
+            // an HMD device if available.
+            const auto& displayPlugins = pluginManager->getDisplayPlugins();
+            for (const auto& plugin : displayPlugins) {
+                if (plugin->isHmd()) {
+                    if (auto action = menu->getActionForOption(plugin->getName())) {
+                        action->setChecked(true);
+                        action->trigger();
+                        break;
+                    }
+                }
+            }
+            isFirstPerson = (qApp->isHMDMode());
+        } else {
+            // if this is not the first run, the camera will be initialized differently depending on user settings
+            if (qApp->isHMDMode()) {
+                // if the HMD is active, use first-person camera, unless the appropriate setting is checked
+                isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonHMD);
+            } else {
+                // if HMD is not active, only use first person if the menu option is checked
+                isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonLookAt);
+            }
+        }
     }
 
-    getEntities()->shutdown(); // tell the entities system we're shutting down, so it will stop running scripts
+    // Load settings of the RenderScritpingInterface
+    // Do that explicitely before being used
+    RenderScriptingInterface::getInstance()->loadSettings();
 
-    // Clear any queued processing (I/O, FBX/OBJ/Texture parsing)
-    QThreadPool::globalInstance()->clear();
-    QThreadPool::globalInstance()->waitForDone();
+    // Setup the PerformanceManager which will enforce the several settings to match the Preset
+    // On the first run, the Preset is evaluated from the
+    getPerformanceManager().setupPerformancePresetSettings(_firstRun.get());
 
-    DependencyManager::destroy<RecordingScriptingInterface>();
+    // finish initializing the camera, based on everything we checked above. Third person camera will be used if no settings
+    // dictated that we should be in first person
+    Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, isFirstPerson);
+    Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !isFirstPerson);
+    _myCamera.setMode((isFirstPerson) ? CAMERA_MODE_FIRST_PERSON_LOOK_AT : CAMERA_MODE_LOOK_AT);
+    cameraMenuChanged();
 
-    // FIXME: Something is still holding on to the ScriptEnginePointers contained in ScriptEngines, and they hold backpointers to ScriptEngines,
-    // so this doesn't shut down properly
-    DependencyManager::get<ScriptEngines>()->shutdownScripting(); // stop all currently running global scripts
-    // These classes hold ScriptEnginePointers, so they must be destroyed before ScriptEngines
-    // Must be done after shutdownScripting in case any scripts try to access these things
-    {
-        DependencyManager::destroy<StandAloneJSConsole>();
-        EntityTreePointer tree = getEntities()->getTree();
-        tree->setSimulation(nullptr);
-        DependencyManager::destroy<EntityTreeRenderer>();
+    const auto& inputs = pluginManager->getInputPlugins();
+    for (const auto& plugin : inputs) {
+        if (!plugin->isActive()) {
+            plugin->activate();
+        }
     }
-    DependencyManager::destroy<ScriptEngines>();
 
-    bool keepMeLoggedIn = Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, false).get();
-    if (!keepMeLoggedIn) {
-        DependencyManager::get<AccountManager>()->removeAccountFromFile();
+    QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
+    if (audioScriptingInterface) {
+        audioScriptingInterface->loadData();
     }
-    // ####### TODO
 
-    _displayPlugin.reset();
-    PluginManager::getInstance()->shutdown();
+    getMyAvatar()->loadData();
 
-    // Cleanup all overlays after the scripts, as scripts might add more
-    _overlays.cleanupAllOverlays();
+    auto bucketEnum = QMetaEnum::fromType<ExternalResource::Bucket>();
+    auto externalResource = ExternalResource::getInstance();
 
-    // first stop all timers directly or by invokeMethod
-    // depending on what thread they run in
-    locationUpdateTimer.stop();
-    identityPacketTimer.stop();
-    pingTimer.stop();
-    _window->saveGeometry();
+    for (int i = 0; i < bucketEnum.keyCount(); i++) {
+        const char* keyName = bucketEnum.key(i);
+        QString setting("ExternalResource/");
+        setting += keyName;
+        auto bucket = static_cast<ExternalResource::Bucket>(bucketEnum.keyToValue(keyName));
+        Setting::Handle<QString> url(setting, externalResource->getBase(bucket));
+        externalResource->setBase(bucket, url.get());
+    }
 
-    // stop QML
-    DependencyManager::destroy<TabletScriptingInterface>();
-    DependencyManager::destroy<ToolbarScriptingInterface>();
-    DependencyManager::destroy<OffscreenUi>();
+    _settingsLoaded = true;
+}
 
-    DependencyManager::destroy<OffscreenQmlSurfaceCache>();
+void Application::saveSettings() const {
+    sessionRunTime.set(_sessionRunTimer.elapsed() / MSECS_PER_SECOND);
+    DependencyManager::get<AudioClient>()->saveSettings();
+    DependencyManager::get<LODManager>()->saveSettings();
 
-    _snapshotSoundInjector = nullptr;
+    QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
+    if (audioScriptingInterface) {
+        audioScriptingInterface->saveData();
+    }
 
-    // destroy Audio so it and its threads have a chance to go down safely
-    // this must happen after QML, as there are unexplained audio crashes originating in qtwebengine
-    AudioInjector::setLocalAudioInterface(nullptr);
-    DependencyManager::destroy<AudioClient>();
-    DependencyManager::destroy<AudioScriptingInterface>();
+    Menu::getInstance()->saveSettings();
+    getMyAvatar()->saveData();
+    PluginManager::getInstance()->saveSettings();
 
-    // The PointerManager must be destroyed before the PickManager because when a Pointer is deleted,
-    // it accesses the PickManager to delete its associated Pick
-    DependencyManager::destroy<PointerManager>();
-    DependencyManager::destroy<PickManager>();
-    DependencyManager::destroy<KeyboardScriptingInterface>();
-    DependencyManager::destroy<Keyboard>();
-    DependencyManager::destroy<AvatarPackager>();
+    // Don't save external resource paths until such time as there's UI to select or set alternatives. Otherwise new default
+    // values won't be used unless Interface.json entries are manually remove or Interface.json is deleted.
+    /*
+    auto bucketEnum = QMetaEnum::fromType<ExternalResource::Bucket>();
+    auto externalResource = ExternalResource::getInstance();
 
-    qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete";
+    for (int i = 0; i < bucketEnum.keyCount(); i++) {
+        const char* keyName = bucketEnum.key(i);
+        QString setting("ExternalResource/");
+        setting += keyName;
+        auto bucket = static_cast<ExternalResource::Bucket>(bucketEnum.keyToValue(keyName));
+        Setting::Handle<QString> url(setting, externalResource->getBase(bucket));
+        url.set(externalResource->getBase(bucket));
+    }
+    */
 }
 
-Application::~Application() {
-    // remove avatars from physics engine
-    if (auto avatarManager = DependencyManager::get<AvatarManager>()) {
-        // AvatarManager may not yet exist in case of an early exit
-
-        avatarManager->clearOtherAvatars();
-        auto myCharacterController = getMyAvatar()->getCharacterController();
-        myCharacterController->clearDetailedMotionStates();
+// This is currently not used, but could be invoked if the user wants to go to the place embedded in an
+// Interface-taken snapshot. (It was developed for drag and drop, before we had asset-server loading or in-world browsers.)
+bool Application::acceptSnapshot(const QString& urlString) {
+    QUrl url(urlString);
+    QString snapshotPath = url.toLocalFile();
 
-        PhysicsEngine::Transaction transaction;
-        avatarManager->buildPhysicsTransaction(transaction);
-        _physicsEngine->processTransaction(transaction);
-        avatarManager->handleProcessedPhysicsTransaction(transaction);
-        avatarManager->deleteAllAvatars();
-    }
-
-    if (_physicsEngine) {
-        _physicsEngine->setCharacterController(nullptr);
-    }
-
-    // the _shapeManager should have zero references
-    _shapeManager.collectGarbage();
-    assert(_shapeManager.getNumShapes() == 0);
-
-    if (_graphicsEngine) {
-        // shutdown graphics engine
-        _graphicsEngine->shutdown();
+    SnapshotMetaData* snapshotData = DependencyManager::get<Snapshot>()->parseSnapshotData(snapshotPath);
+    if (snapshotData) {
+        if (!snapshotData->getURL().toString().isEmpty()) {
+            DependencyManager::get<AddressManager>()->handleLookupString(snapshotData->getURL().toString());
+        }
+    } else {
+        OffscreenUi::asyncWarning("", "No location details were found in the file\n" +
+                             snapshotPath + "\nTry dragging in an authentic Hifi snapshot.");
     }
+    return true;
+}
 
-    _gameWorkload.shutdown();
-
-    DependencyManager::destroy<Preferences>();
-    PlatformHelper::shutdown();
+void Application::setSessionUUID(const QUuid& sessionUUID) const {
+    Physics::setSessionUUID(sessionUUID);
+}
 
-    if (_entityClipboard) {
-        _entityClipboard->eraseAllOctreeElements();
-        _entityClipboard.reset();
+void Application::domainURLChanged(QUrl domainURL) {
+    // disable physics until we have enough information about our new location to not cause craziness.
+    setIsServerlessMode(domainURL.scheme() != URL_SCHEME_OVERTE);
+    if (isServerlessMode()) {
+        loadServerlessDomain(domainURL);
     }
+    updateWindowTitle();
+}
 
-    if (_octreeProcessor) {
-        _octreeProcessor->terminate();
-    }
+void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) {
+    DomainHandler::ConnectionRefusedReason reasonCode = static_cast<DomainHandler::ConnectionRefusedReason>(reasonCodeInt);
 
-    if (_entityEditSender) {
-        _entityEditSender->terminate();
+    if (reasonCode == DomainHandler::ConnectionRefusedReason::TooManyUsers && !extraInfo.isEmpty()) {
+        DependencyManager::get<AddressManager>()->handleLookupString(extraInfo);
+        return;
     }
 
-    if (auto pluginManager = PluginManager::getInstance()) {
-        if (auto steamClient = pluginManager->getSteamClientPlugin()) {
-            steamClient->shutdown();
-        }
-
-        if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
-            oculusPlatform->shutdown();
+    switch (reasonCode) {
+        case DomainHandler::ConnectionRefusedReason::ProtocolMismatch:
+        case DomainHandler::ConnectionRefusedReason::TooManyUsers:
+        case DomainHandler::ConnectionRefusedReason::Unknown: {
+            QString message = "Unable to connect to the location you are visiting.\n";
+            message += reasonMessage;
+            OffscreenUi::asyncWarning("", message);
+            getMyAvatar()->setWorldVelocity(glm::vec3(0.0f));
+            break;
         }
+        default:
+            // nothing to do.
+            break;
     }
+}
 
-    DependencyManager::destroy<PluginManager>();
-
-    DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache
-
-    DependencyManager::destroy<SoundCacheScriptingInterface>();
+void Application::updateWindowTitle() const {
+    auto nodeList = DependencyManager::get<NodeList>();
+    auto accountManager = DependencyManager::get<AccountManager>();
+    auto domainAccountManager = DependencyManager::get<DomainAccountManager>();
+    auto isInErrorState = nodeList->getDomainHandler().isInErrorState();
+    bool isMetaverseLoggedIn = accountManager->isLoggedIn();
+    bool hasDomainLogIn = domainAccountManager->hasLogIn();
+    bool isDomainLoggedIn = domainAccountManager->isLoggedIn();
+    QString authedDomainName = domainAccountManager->getAuthedDomainName();
 
-    DependencyManager::destroy<AudioInjectorManager>();
-    DependencyManager::destroy<AvatarManager>();
-    DependencyManager::destroy<AnimationCacheScriptingInterface>();
-    DependencyManager::destroy<AnimationCache>();
-    DependencyManager::destroy<FramebufferCache>();
-    DependencyManager::destroy<MaterialCacheScriptingInterface>();
-    DependencyManager::destroy<MaterialCache>();
-    DependencyManager::destroy<TextureCacheScriptingInterface>();
-    DependencyManager::destroy<TextureCache>();
-    DependencyManager::destroy<ModelCacheScriptingInterface>();
-    DependencyManager::destroy<ModelCache>();
-    DependencyManager::destroy<ModelFormatRegistry>();
-    DependencyManager::destroy<ScriptCache>();
-    DependencyManager::destroy<SoundCacheScriptingInterface>();
-    DependencyManager::destroy<SoundCache>();
-    DependencyManager::destroy<OctreeStatsProvider>();
-    DependencyManager::destroy<GeometryCache>();
-    DependencyManager::destroy<ScreenshareScriptingInterface>();
+    QString buildVersion = " - Overte - " +
+                           (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build")) +
+                           " " + applicationVersion();
 
-    if (auto resourceManager = DependencyManager::get<ResourceManager>()) {
-        resourceManager->cleanup();
+    if (BuildInfo::RELEASE_NAME != "") {
+        buildVersion += " - " + BuildInfo::RELEASE_NAME;
     }
 
-    // remove the NodeList from the DependencyManager
-    DependencyManager::destroy<NodeList>();
+    QString connectionStatus = isInErrorState                               ? " (ERROR CONNECTING)"
+                               : nodeList->getDomainHandler().isConnected() ? ""
+                                                                            : " (NOT CONNECTED)";
 
-#if 0
-    ConnexionClient::getInstance().destroy();
-#endif
-    // The window takes ownership of the menu, so this has the side effect of destroying it.
-    _window->setMenuBar(nullptr);
+    QString metaverseUsername = accountManager->getAccountInfo().getUsername();
+    QString domainUsername = domainAccountManager->getUsername();
 
-    _window->deleteLater();
+    auto& ch = CrashHandler::getInstance();
+    ch.setAnnotation("sentry[user][username]", metaverseUsername.toStdString());
 
-    // make sure that the quit event has finished sending before we take the application down
-    if (auto closeEventSender = DependencyManager::get<CloseEventSender>()) {
-        while (!closeEventSender->hasFinishedQuitEvent() && !closeEventSender->hasTimedOutQuitEvent()) {
-            // sleep a little so we're not spinning at 100%
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    QString currentPlaceName;
+    if (isServerlessMode()) {
+        if (isInErrorState) {
+            currentPlaceName = "Serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
+        } else {
+            currentPlaceName = "Serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
+        }
+    } else {
+        currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host();
+        if (currentPlaceName.isEmpty()) {
+            currentPlaceName = nodeList->getDomainHandler().getHostname();
         }
-        // quit the thread used by the closure event sender
-        closeEventSender->thread()->quit();
     }
 
-    // Can't log to file past this point, FileLogger about to be deleted
-    qInstallMessageHandler(LogHandler::verboseMessageHandler);
-
-#ifdef Q_OS_MAC
-    // 26 Feb 2021 - Tried re-enabling this call but OSX still crashes on exit.
-    //
-    // 10/16/2019 - Disabling this call. This causes known crashes (A), and it is not
-    // fully understood whether it might cause other unknown crashes (B).
-    //
-    // (A) Although we try to shutdown the ScriptEngine threads in onAboutToQuit, there is
-    // currently no guarantee that they have stopped. Waiting on them to stop has so far appeared to
-    // never return on Mac, causing the application to hang on shutdown. Because ScriptEngines
-    // may still be running, they may end up receiving events that are triggered from this processEvents call,
-    // and then try to access resources that are no longer available at this point in time.
-    // If the ScriptEngine threads were fully destroyed before getting here, this would
-    // not be an issue.
-    //
-    // (B) It seems likely that a bunch of potential event handlers are dependent on Application
-    // and other common dependencies to be available and not destroyed or in the middle of being
-    // destroyed.
-
-
-    // Clear the event queue before application is totally destructed.
-    // This will drain the messasge queue of pending "deleteLaters" queued up
-    // during shutdown of the script engines.
-    // We do this here because there is a possiblty that [NSApplication terminate:]
-    // will be called during processEvents which will invoke all static destructors.
-    // We want to postpone this utill the last possible moment.
-    //QCoreApplication::processEvents();
-#endif
-}
-
-void Application::initializeGL() {
-    qCDebug(interfaceapp) << "Created Display Window.";
-
-#ifdef DISABLE_QML
-    setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
-#endif
-
-    // initialize glut for shape drawing; Qt apparently initializes it on OS X
-    if (_isGLInitialized) {
-        return;
+    QString metaverseDetails;
+    if (isMetaverseLoggedIn) {
+        metaverseDetails = " (Directory Services: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() +
+                           " as " + metaverseUsername + ")";
     } else {
-        _isGLInitialized = true;
+        metaverseDetails = " (Directory Services: Not Logged In)";
     }
 
-    _glWidget->windowHandle()->setFormat(getDefaultOpenGLSurfaceFormat());
-
-    // When loading QtWebEngineWidgets, it creates a global share context on startup.
-    // We have to account for this possibility by checking here for an existing
-    // global share context
-    auto globalShareContext = qt_gl_global_share_context();
-
-#if !defined(DISABLE_QML)
-    // Build a shared canvas / context for the Chromium processes
-    if (!globalShareContext) {
-        // Chromium rendering uses some GL functions that prevent nSight from capturing
-        // frames, so we only create the shared context if nsight is NOT active.
-        if (!nsightActive()) {
-            _chromiumShareContext = new OffscreenGLCanvas();
-            _chromiumShareContext->setObjectName("ChromiumShareContext");
-            auto format =QSurfaceFormat::defaultFormat();
-#ifdef Q_OS_MAC
-            // On mac, the primary shared OpenGL context must be a 3.2 core context,
-            // or chromium flips out and spews error spam (but renders fine)
-            format.setMajorVersion(3);
-            format.setMinorVersion(2);
-#endif
-            _chromiumShareContext->setFormat(format);
-            _chromiumShareContext->create();
-            if (!_chromiumShareContext->makeCurrent()) {
-                qCWarning(interfaceapp, "Unable to make chromium shared context current");
-            }
-            globalShareContext = _chromiumShareContext->getContext();
-            qt_gl_set_global_share_context(globalShareContext);
-            _chromiumShareContext->doneCurrent();
+    QString domainDetails;
+    if (hasDomainLogIn) {
+        if (currentPlaceName == authedDomainName && isDomainLoggedIn) {
+            domainDetails = " (Domain: Logged in as " + domainUsername + ")";
+        } else {
+            domainDetails = " (Domain: Not Logged In)";
         }
+    } else {
+        domainDetails = "";
     }
-#endif
-
-
-    _glWidget->createContext(globalShareContext);
-
-    if (!_glWidget->makeCurrent()) {
-        qCWarning(interfaceapp, "Unable to make window context current");
-    }
-
-    // Populate the global OpenGL context based on the information for the primary window GL context
-    gl::ContextInfo::get(true);
 
-#if !defined(DISABLE_QML)
-    QStringList chromiumFlags;
-    // HACK: re-expose mic and camera to prevent crash on domain-change in chromium's media::FakeAudioInputStream::ReadAudioFromSource()
-    // Bug 21993: disable microphone and camera input
-    //chromiumFlags << "--use-fake-device-for-media-stream";
-
-    // Disable signed distance field font rendering on ATI/AMD GPUs, due to
-    // https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app
-    std::string vendor{ (const char*)glGetString(GL_VENDOR) };
-    if ((vendor.find("AMD") != std::string::npos) || (vendor.find("ATI") != std::string::npos)) {
-        chromiumFlags << "--disable-distance-field-text";
-    }
+    QString title = currentPlaceName + connectionStatus + metaverseDetails + domainDetails + buildVersion;
 
-    // Ensure all Qt webengine processes launched from us have the appropriate command line flags
-    if (!chromiumFlags.empty()) {
-        qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromiumFlags.join(' ').toLocal8Bit());
-    }
+#ifndef WIN32
+    // crashes with vs2013/win32
+    qCDebug(interfaceapp, "Application title set to: %s", title.toStdString().c_str());
 #endif
+    _window->setWindowTitle(title);
 
-    if (!globalShareContext) {
-        globalShareContext = _glWidget->qglContext();
-        qt_gl_set_global_share_context(globalShareContext);
-    }
+    // updateTitleWindow gets called whenever there's a change regarding the domain, so rather
+    // than placing this within domainURLChanged, it's placed here to cover the other potential cases.
+    DependencyManager::get<MessagesClient>()->sendLocalMessage("Toolbar-DomainChanged", "");
+}
 
-    // Build a shared canvas / context for the QML rendering
-#if !defined(DISABLE_QML)
-    {
-        _qmlShareContext = new OffscreenGLCanvas();
-        _qmlShareContext->setObjectName("QmlShareContext");
-        _qmlShareContext->create(globalShareContext);
-        if (!_qmlShareContext->makeCurrent()) {
-            qCWarning(interfaceapp, "Unable to make QML shared context current");
-        }
-        OffscreenQmlSurface::setSharedContext(_qmlShareContext->getContext());
-        _qmlShareContext->doneCurrent();
-        if (!_glWidget->makeCurrent()) {
-            qCWarning(interfaceapp, "Unable to make window context current");
+void Application::nodeAdded(SharedNodePointer node) {
+    if (node->getType() == NodeType::EntityServer) {
+        if (_failedToConnectToEntityServer && !_entityServerConnectionTimer.isActive()) {
+            _octreeProcessor->stopSafeLanding();
+            _failedToConnectToEntityServer = false;
+        } else if (_entityServerConnectionTimer.isActive()) {
+            _entityServerConnectionTimer.stop();
         }
+        _octreeProcessor->startSafeLanding();
+        _entityServerConnectionTimer.setInterval(ENTITY_SERVER_CONNECTION_TIMEOUT);
+        _entityServerConnectionTimer.start();
     }
-#endif
-
-
-    // Build an offscreen GL context for the main thread.
-    _glWidget->makeCurrent();
-    glClearColor(0.2f, 0.2f, 0.2f, 1);
-    glClear(GL_COLOR_BUFFER_BIT);
-    _glWidget->swapBuffers();
-
-    _graphicsEngine->initializeGPU(_glWidget);
 }
 
-void Application::initializeDisplayPlugins() {
-    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
-    Setting::Handle<QString> activeDisplayPluginSetting{ ACTIVE_DISPLAY_PLUGIN_SETTING_NAME, displayPlugins.at(0)->getName() };
-    auto lastActiveDisplayPluginName = activeDisplayPluginSetting.get();
-
-    auto defaultDisplayPlugin = displayPlugins.at(0);
-    // Once time initialization code
-    DisplayPluginPointer targetDisplayPlugin;
-    for(const auto& displayPlugin : displayPlugins) {
-        displayPlugin->setContext(_graphicsEngine->getGPUContext());
-        if (displayPlugin->getName() == lastActiveDisplayPluginName) {
-            targetDisplayPlugin = displayPlugin;
-        }
+void Application::nodeActivated(SharedNodePointer node) {
+    if (node->getType() == NodeType::AssetServer) {
+        // asset server just connected - check if we have the asset browser showing
+
+#if !defined(DISABLE_QML)
+        auto offscreenUi = getOffscreenUI();
+        if (offscreenUi) {
+            auto nodeList = DependencyManager::get<NodeList>();
 
-        if (!_autoSwitchDisplayModeSupportedHMDPlugin) {
-            if (displayPlugin->isHmd() && displayPlugin->getSupportsAutoSwitch()) {
-                _autoSwitchDisplayModeSupportedHMDPlugin = displayPlugin;
-                _autoSwitchDisplayModeSupportedHMDPluginName = _autoSwitchDisplayModeSupportedHMDPlugin->getName();
-                _previousHMDWornStatus = _autoSwitchDisplayModeSupportedHMDPlugin->isDisplayVisible() && _autoSwitchDisplayModeSupportedHMDPlugin->isActive();
+            if (nodeList->getThisNodeCanWriteAssets()) {
+                // call reload on the shown asset browser dialog to get the mappings (if permissions allow)
+                auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
+                if (assetDialog) {
+                    QMetaObject::invokeMethod(assetDialog, "reload");
+                }
+            } else {
+                // we switched to an Asset Server that we can't modify, hide the Asset Browser
+                offscreenUi->hide("AssetServer");
             }
         }
+#endif
+    }
 
-        QObject::connect(displayPlugin.get(), &DisplayPlugin::recommendedFramebufferSizeChanged,
-            [this](const QSize& size) { resizeGL(); });
-        QObject::connect(displayPlugin.get(), &DisplayPlugin::resetSensorsRequested, this, &Application::requestReset);
+    // If we get a new EntityServer activated, reset lastQueried time
+    // so we will do a proper query during update
+    if (node->getType() == NodeType::EntityServer) {
+        _queryExpiry = SteadyClock::now();
+        _octreeQuery.incrementConnectionID();
 
-        if (displayPlugin->isHmd()) {
-            auto hmdDisplayPlugin = dynamic_cast<HmdDisplayPlugin*>(displayPlugin.get());
-            QObject::connect(hmdDisplayPlugin, &HmdDisplayPlugin::hmdMountedChanged,
-                DependencyManager::get<HMDScriptingInterface>().data(), &HMDScriptingInterface::mountedChanged);
-            QObject::connect(hmdDisplayPlugin, &HmdDisplayPlugin::hmdVisibleChanged, this, &Application::hmdVisibleChanged);
+        if  (!_failedToConnectToEntityServer) {
+            _entityServerConnectionTimer.stop();
         }
     }
 
-    // The default display plugin needs to be activated first, otherwise the display plugin thread
-    // may be launched by an external plugin, which is bad
-    setDisplayPlugin(defaultDisplayPlugin);
-
-    // Now set the desired plugin if it's not the same as the default plugin
-    if (targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
-        setDisplayPlugin(targetDisplayPlugin);
+    if (node->getType() == NodeType::AudioMixer && !isInterstitialMode()) {
+        DependencyManager::get<AudioClient>()->negotiateAudioFormat();
     }
 
-    if (_autoSwitchDisplayModeSupportedHMDPlugin) {
-        if (getActiveDisplayPlugin() != _autoSwitchDisplayModeSupportedHMDPlugin && !_autoSwitchDisplayModeSupportedHMDPlugin->isSessionActive()) {
-            startHMDStandBySession();
-        }
-        // Poll periodically to check whether the user has worn HMD or not. Switch Display mode accordingly.
-        // If the user wears HMD then switch to VR mode. If the user removes HMD then switch to Desktop mode.
-        QTimer* autoSwitchDisplayModeTimer = new QTimer(this);
-        connect(autoSwitchDisplayModeTimer, SIGNAL(timeout()), this, SLOT(switchDisplayMode()));
-        autoSwitchDisplayModeTimer->start(INTERVAL_TO_CHECK_HMD_WORN_STATUS);
-    }
-
-    // Submit a default frame to render until the engine starts up
-    updateRenderArgs(0.0f);
-}
-
-void Application::initializeRenderEngine() {
-    // FIXME: on low end systems os the shaders take up to 1 minute to compile, so we pause the deadlock watchdog thread.
-    DeadlockWatchdogThread::withPause([&] {
-        _graphicsEngine->initializeRender();
-        DependencyManager::get<Keyboard>()->registerKeyboardHighlighting();
-    });
-}
-
-extern void setupPreferences();
-#if !defined(DISABLE_QML)
-static void addDisplayPluginToMenu(const DisplayPluginPointer& displayPlugin, int index, bool active = false);
-#endif
-
-// ####### TODO
-void Application::showLoginScreen() {
-#if !defined(DISABLE_QML)
-    auto accountManager = DependencyManager::get<AccountManager>();
-    auto dialogsManager = DependencyManager::get<DialogsManager>();
-    if (!accountManager->isLoggedIn()) {
-        if (!isHMDMode()) {
-            auto toolbar =  DependencyManager::get<ToolbarScriptingInterface>()->getToolbar("com.highfidelity.interface.toolbar.system");
-            toolbar->writeProperty("visible", false);
-        }
-        _loginDialogPoppedUp = true;
-        dialogsManager->showLoginDialog();
-        emit loginDialogFocusEnabled();
-        QJsonObject loginData = {};
-        loginData["action"] = "login dialog popped up";
-        UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
-        _window->setWindowTitle("Overte");
-    } else {
-        resumeAfterLoginDialogActionTaken();
-    }
-    _loginDialogPoppedUp = !accountManager->isLoggedIn();
-    loginDialogPoppedUp.set(_loginDialogPoppedUp);
-#else
-    resumeAfterLoginDialogActionTaken();
-#endif
-}
-
-static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://more.overte.org/applications" };
-
-void Application::initializeUi() {
-
-    // Allow remote QML content from trusted sources ONLY
-    {
-        auto defaultUrlValidator = OffscreenQmlSurface::getUrlValidator();
-        auto newValidator = [=](const QUrl& url) -> bool {
-            QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]";
-            QList<QString> safeURLS = { "" };
-            safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), Qt::SkipEmptyParts);
-
-            // PULL SAFEURLS FROM INTERFACE.JSON Settings
-
-            QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
-            QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), Qt::SkipEmptyParts);
-            safeURLS += settingsSafeURLS;
-
-            // END PULL SAFEURLS FROM INTERFACE.JSON Settings
-
-            if (AUTHORIZED_EXTERNAL_QML_SOURCE.isParentOf(url)) {
-                return true;
-            } else {
-                for (const auto& str : safeURLS) {
-                    if (!str.isEmpty() && url.toString().endsWith(".qml") &&
-                        url.toString().startsWith(str)) {
-                        qCDebug(interfaceapp) << "Found matching url!" << url.host();
-                        return true;
-                    }
-                }
-            }
-
-            qCDebug(interfaceapp) << "No matching url" << url.host();
-            return defaultUrlValidator(url);
-        };
-        OffscreenQmlSurface::setUrlValidator(newValidator);
-    }
-
-    AddressBarDialog::registerType();
-    ErrorDialog::registerType();
-    LoginDialog::registerType();
-    Tooltip::registerType();
-    UpdateDialog::registerType();
-
-    QmlContextCallback platformInfoCallback = [](QQmlContext* context) {
-        context->setContextProperty("PlatformInfo", new PlatformInfoScriptingInterface());
-    };
-    OffscreenQmlSurface::addWhitelistContextHandler({
-        QUrl{ "hifi/tablet/TabletAddressDialog.qml" },
-        QUrl{ "hifi/Card.qml" },
-        QUrl{ "hifi/Pal.qml" },
-        QUrl{ "hifi/NameCard.qml" },
-        }, platformInfoCallback);
-
-    QmlContextCallback ttsCallback = [](QQmlContext* context) {
-        context->setContextProperty("TextToSpeech", DependencyManager::get<TTSScriptingInterface>().data());
-    };
-    OffscreenQmlSurface::addWhitelistContextHandler({
-        QUrl{ "hifi/tts/TTS.qml" }
-    }, ttsCallback);
-    qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem");
-    qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
-    qmlRegisterType<WebBrowserSuggestionsEngine>("HifiWeb", 1, 0, "WebBrowserSuggestionsEngine");
-
-    {
-        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-        tabletScriptingInterface->getTablet(SYSTEM_TABLET);
-    }
-
-    auto offscreenUi = getOffscreenUI();
-    connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated,
-        this, &Application::onDesktopRootContextCreated);
-    connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated,
-        this, &Application::onDesktopRootItemCreated);
-
-#if !defined(DISABLE_QML)
-    offscreenUi->setProxyWindow(_window->windowHandle());
-    // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
-    // support the window management and scripting proxies for VR use
-    DeadlockWatchdogThread::withPause([&] {
-        offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
-    });
-    // FIXME either expose so that dialogs can set this themselves or
-    // do better detection in the offscreen UI of what has focus
-    offscreenUi->setNavigationFocused(false);
-#else
-    _window->setMenuBar(new Menu());
-#endif
-
-    setupPreferences();
-
-#if !defined(DISABLE_QML)
-    _glWidget->installEventFilter(offscreenUi.data());
-    offscreenUi->setMouseTranslator([=](const QPointF& pt) {
-        QPointF result = pt;
-        auto displayPlugin = getActiveDisplayPlugin();
-        if (displayPlugin->isHmd()) {
-            getApplicationCompositor().handleRealMouseMoveEvent(false);
-            auto resultVec = getApplicationCompositor().getReticlePosition();
-            result = QPointF(resultVec.x, resultVec.y);
-        }
-        return result.toPoint();
-    });
-
-    // BUGZ-1365 - the root context should explicitly default to being unable to load local HTML content
-    ContextAwareProfile::restrictContext(offscreenUi->getSurfaceContext(), true);
-    offscreenUi->resume();
-#endif
-    connect(_window, &MainWindow::windowGeometryChanged, [this](const QRect& r){
-        resizeGL();
-        if (_touchscreenVirtualPadDevice) {
-            _touchscreenVirtualPadDevice->resize();
-        }
-    });
-
-    // This will set up the input plugins UI
-    _activeInputPlugins.clear();
-    for(const auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
-        if (KeyboardMouseDevice::NAME == inputPlugin->getName()) {
-            _keyboardMouseDevice = std::dynamic_pointer_cast<KeyboardMouseDevice>(inputPlugin);
-        }
-        if (TouchscreenDevice::NAME == inputPlugin->getName()) {
-            _touchscreenDevice = std::dynamic_pointer_cast<TouchscreenDevice>(inputPlugin);
-        }
-        if (TouchscreenVirtualPadDevice::NAME == inputPlugin->getName()) {
-            _touchscreenVirtualPadDevice = std::dynamic_pointer_cast<TouchscreenVirtualPadDevice>(inputPlugin);
-#if defined(ANDROID_APP_INTERFACE)
-            auto& virtualPadManager = VirtualPad::Manager::instance();
-            connect(&virtualPadManager, &VirtualPad::Manager::hapticFeedbackRequested,
-                    this, [](int duration) {
-                        AndroidHelper::instance().performHapticFeedback(duration);
-                    });
-#endif
-        }
-    }
-
-    auto compositorHelper = DependencyManager::get<CompositorHelper>();
-    connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
-        if (isHMDMode()) {
-            auto compositorHelper = DependencyManager::get<CompositorHelper>(); // don't capture outer smartpointer
-            showCursor(compositorHelper->getAllowMouseCapture() ?
-                       Cursor::Manager::lookupIcon(_preferredCursor.get()) :
-                       Cursor::Icon::SYSTEM);
-        }
-    });
-
-#if !defined(DISABLE_QML)
-    // Pre-create a couple of offscreen surfaces to speed up tablet UI
-    auto offscreenSurfaceCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
-    offscreenSurfaceCache->setOnRootContextCreated([&](const QString& rootObject, QQmlContext* surfaceContext) {
-        if (rootObject == TabletScriptingInterface::QML) {
-            // in Qt 5.10.0 there is already an "Audio" object in the QML context
-            // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
-            surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
-            surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-        }
-    });
-
-    offscreenSurfaceCache->reserve(TabletScriptingInterface::QML, 1);
-    offscreenSurfaceCache->reserve(render::entities::WebEntityRenderer::QML, 2);
-#endif
-
-    flushMenuUpdates();
-
-#if !defined(DISABLE_QML)
-    // Now that the menu is instantiated, ensure the display plugin menu is properly updated
-    {
-        DisplayPluginList displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
-        // first sort the plugins into groupings: standard, advanced, developer
-        std::stable_sort(displayPlugins.begin(), displayPlugins.end(),
-            [](const DisplayPluginPointer& a, const DisplayPluginPointer& b) -> bool { return a->getGrouping() < b->getGrouping(); });
-        int dpIndex = 1;
-        // concatenate the groupings into a single list in the order: standard, advanced, developer
-        for(const auto& displayPlugin : displayPlugins) {
-            addDisplayPluginToMenu(displayPlugin, dpIndex, _displayPlugin == displayPlugin);
-            dpIndex++;
-        }
-
-        // after all plugins have been added to the menu, add a separator to the menu
-        auto parent = getPrimaryMenu()->getMenu(MenuOption::OutputMenu);
-        parent->addSeparator();
-    }
-#endif
-
-
-    // The display plugins are created before the menu now, so we need to do this here to hide the menu bar
-    // now that it exists
-    if (_window && _window->isFullScreen()) {
-        setFullscreen(nullptr, true);
-    }
-
-
-    setIsInterstitialMode(true);
-
-#if defined(DISABLE_QML) && defined(Q_OS_LINUX)
-    resumeAfterLoginDialogActionTaken();
-#endif
-}
-
-
-void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
-    auto engine = surfaceContext->engine();
-    // in Qt 5.10.0 there is already an "Audio" object in the QML context
-    // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
-    surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
-
-    surfaceContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
-    surfaceContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data());
-
-    surfaceContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
-    surfaceContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
-    surfaceContext->setContextProperty("Performance", new PerformanceScriptingInterface());
-    _fileDownload = new ArchiveDownloadInterface(engine);
-    surfaceContext->setContextProperty("File", _fileDownload);
-    connect(_fileDownload, &ArchiveDownloadInterface::unzipResult, this, &Application::handleUnzip);
-    surfaceContext->setContextProperty("MyAvatar", getMyAvatar().get());
-    surfaceContext->setContextProperty("Messages", DependencyManager::get<MessagesClient>().data());
-    surfaceContext->setContextProperty("Recording", DependencyManager::get<RecordingScriptingInterface>().data());
-    surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
-    surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-    surfaceContext->setContextProperty("FrameTimings", &_graphicsEngine->_frameTimingsScriptingInterface);
-    surfaceContext->setContextProperty("Rates", new RatesScriptingInterface(this));
-
-    surfaceContext->setContextProperty("TREE_SCALE", TREE_SCALE);
-    // FIXME Quat and Vec3 won't work with QJSEngine used by QML
-    surfaceContext->setContextProperty("Quat", new Quat());
-    surfaceContext->setContextProperty("Vec3", new Vec3());
-    surfaceContext->setContextProperty("Uuid", new ScriptUUID());
-    surfaceContext->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
-    surfaceContext->setContextProperty("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data());
-
-    surfaceContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
-    surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
-
-    surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
-    surfaceContext->setContextProperty("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
-    surfaceContext->setContextProperty("Camera", &_myCamera);
-
-#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
-    surfaceContext->setContextProperty("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
-#endif
-
-    surfaceContext->setContextProperty("Overlays", &_overlays);
-    surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
-    surfaceContext->setContextProperty("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
-    surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
-    surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext));
-    surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
-    surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
-    surfaceContext->setContextProperty("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
-
-    // Caches
-    surfaceContext->setContextProperty("AnimationCache", DependencyManager::get<AnimationCacheScriptingInterface>().data());
-    surfaceContext->setContextProperty("TextureCache", DependencyManager::get<TextureCacheScriptingInterface>().data());
-    surfaceContext->setContextProperty("MaterialCache", DependencyManager::get<MaterialCacheScriptingInterface>().data());
-    surfaceContext->setContextProperty("ModelCache", DependencyManager::get<ModelCacheScriptingInterface>().data());
-    surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
-
-    surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
-
-    surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-    surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-    surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
-
-    surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface);
-    surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data());
-    surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
-    surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
-    surfaceContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
-    surfaceContext->setContextProperty("Render", RenderScriptingInterface::getInstance());
-    surfaceContext->setContextProperty("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
-    surfaceContext->setContextProperty("Workload", _gameWorkload._engine->getConfiguration().get());
-    surfaceContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface());
-    surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
-
-    surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());
-
-    surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
-    surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
-    surfaceContext->setContextProperty("About", AboutUtil::getInstance());
-    surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());  // Deprecated
-    surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
-    surfaceContext->setContextProperty("ExternalResource", ExternalResource::getInstance());
-
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
-    }
-
-    _window->setMenuBar(new Menu());
-}
-
-void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
-    Stats::show();
-    AnimStats::show();
-    auto surfaceContext = getOffscreenUI()->getSurfaceContext();
-    surfaceContext->setContextProperty("Stats", Stats::getInstance());
-    surfaceContext->setContextProperty("AnimStats", AnimStats::getInstance());
-
-#if !defined(Q_OS_ANDROID)
-    auto offscreenUi = getOffscreenUI();
-    auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
-    offscreenUi->show(qml, "AvatarInputsBar");
-#endif
-    _desktopRootItemCreated = true;
-}
-
-void Application::userKickConfirmation(const QUuid& nodeID, unsigned int banFlags) {
-    auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
-    auto avatar = avatarHashMap->getAvatarBySessionID(nodeID);
-
-    QString userName;
-
-    if (avatar) {
-        userName = avatar->getSessionDisplayName();
-    } else {
-        userName = nodeID.toString();
-    }
-
-    QString kickMessage = "Do you wish to kick " + userName + " from your domain";
-    ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Kick User", kickMessage,
-                                                          QMessageBox::Yes | QMessageBox::No);
-
-    if (dlg->getDialogItem()) {
-
-        QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
-            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-
-            bool yes = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
-            // ask the NodeList to kick the user with the given session ID
-
-            if (yes) {
-                DependencyManager::get<NodeList>()->kickNodeBySessionID(nodeID, banFlags);
-            }
-
-            DependencyManager::get<UsersScriptingInterface>()->setWaitForKickResponse(false);
-        });
-        DependencyManager::get<UsersScriptingInterface>()->setWaitForKickResponse(true);
-    }
-}
-
-void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditionalContextProperties) {
-    surfaceContext->setContextProperty("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
-    surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
-    surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
-    surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
-    surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
-    surfaceContext->setContextProperty("Vec3", new Vec3());
-    surfaceContext->setContextProperty("Quat", new Quat());
-    surfaceContext->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
-    surfaceContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
-    surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
-    surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
-
-    if (setAdditionalContextProperties) {
-        qDebug() << "setting additional context properties!";
-        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-        auto flags = tabletScriptingInterface->getFlags();
-
-        surfaceContext->setContextProperty("offscreenFlags", flags);
-        surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-
-        surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext));
-        surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
-        surfaceContext->setContextProperty("Performance", new PerformanceScriptingInterface());
-
-        surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-        surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-        surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
-
-        // in Qt 5.10.0 there is already an "Audio" object in the QML context
-        // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
-        surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
-
-        surfaceContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
-        surfaceContext->setContextProperty("fileDialogHelper", new FileDialogHelper());
-        surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
-        surfaceContext->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
-        surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
-        surfaceContext->setContextProperty("OctreeStats", DependencyManager::get<OctreeStatsProvider>().data());
-        surfaceContext->setContextProperty("DCModel", DependencyManager::get<DomainConnectionModel>().data());
-        surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
-        surfaceContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
-        surfaceContext->setContextProperty("DialogsManager", DialogsManagerScriptingInterface::getInstance());
-        surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
-        surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
-        surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
-        surfaceContext->setContextProperty("Render", RenderScriptingInterface::getInstance());
-        surfaceContext->setContextProperty("Workload", qApp->getGameWorkload()._engine->getConfiguration().get());
-        surfaceContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
-        surfaceContext->setContextProperty("Pointers", DependencyManager::get<PointerScriptingInterface>().data());
-        surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
-        surfaceContext->setContextProperty("Reticle", qApp->getApplicationCompositor().getReticleInterface());
-        surfaceContext->setContextProperty("About", AboutUtil::getInstance());
-        surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());  // Deprecated.
-        surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
-        surfaceContext->setContextProperty("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
-        surfaceContext->setContextProperty("ExternalResource", ExternalResource::getInstance());
-
-        // This `module` context property is blank for the QML scripting interface so that we don't get log errors when importing
-        // certain JS files from both scripts (in the JS context) and QML (in the QML context).
-        surfaceContext->setContextProperty("module", "");
-    }
-}
-
-void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
-    PROFILE_RANGE(render, __FUNCTION__);
-    PerformanceTimer perfTimer("updateCamera");
+    if (node->getType() == NodeType::AvatarMixer) {
+        _queryExpiry = SteadyClock::now();
 
-    glm::vec3 boomOffset;
-    auto myAvatar = getMyAvatar();
-    boomOffset = myAvatar->getModelScale() * myAvatar->getBoomLength() * -IDENTITY_FORWARD;
-
-    // The render mode is default or mirror if the camera is in mirror mode, assigned further below
-    renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
-
-    // Always use the default eye position, not the actual head eye position.
-    // Using the latter will cause the camera to wobble with idle animations,
-    // or with changes from the face tracker
-    CameraMode mode = _myCamera.getMode();
-    if (mode == CAMERA_MODE_FIRST_PERSON || mode == CAMERA_MODE_FIRST_PERSON_LOOK_AT) {
-        _thirdPersonHMDCameraBoomValid= false;
-        if (isHMDMode()) {
-            mat4 camMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
-            _myCamera.setPosition(extractTranslation(camMat));
-            _myCamera.setOrientation(glmExtractRotation(camMat));
-        } else if (mode == CAMERA_MODE_FIRST_PERSON) {
-            _myCamera.setPosition(myAvatar->getDefaultEyePosition());
-            _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation());
-        } else {
-            _myCamera.setPosition(myAvatar->getCameraEyesPosition(deltaTime));
-            _myCamera.setOrientation(myAvatar->getLookAtRotation());
+        // new avatar mixer, send off our identity packet on next update loop
+        // Reset skeletonModelUrl if the last server modified our choice.
+        // Override the avatar url (but not model name) here too.
+        if (_avatarOverrideUrl.isValid()) {
+            getMyAvatar()->useFullAvatarURL(_avatarOverrideUrl);
         }
-    } else if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) {
-        if (isHMDMode()) {
-            if (!_thirdPersonHMDCameraBoomValid) {
-                const glm::vec3 CAMERA_OFFSET = glm::vec3(0.0f, 0.0f, 0.7f);
-                _thirdPersonHMDCameraBoom = cancelOutRollAndPitch(myAvatar->getHMDSensorOrientation()) * CAMERA_OFFSET;
-                _thirdPersonHMDCameraBoomValid = true;
-            }
-
-            glm::mat4 thirdPersonCameraSensorToWorldMatrix = myAvatar->getSensorToWorldMatrix();
-
-            const glm::vec3 cameraPos = myAvatar->getHMDSensorPosition() + _thirdPersonHMDCameraBoom * myAvatar->getBoomLength();
-            glm::mat4 sensorCameraMat = createMatFromQuatAndPos(myAvatar->getHMDSensorOrientation(), cameraPos);
-            glm::mat4 worldCameraMat = thirdPersonCameraSensorToWorldMatrix * sensorCameraMat;
 
-            _myCamera.setOrientation(glm::normalize(glmExtractRotation(worldCameraMat)));
-            _myCamera.setPosition(extractTranslation(worldCameraMat));
-        } else {
-            _thirdPersonHMDCameraBoomValid = false;
-            if (mode == CAMERA_MODE_THIRD_PERSON) {
-                _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
-                if (isOptionChecked(MenuOption::CenterPlayerInView)) {
-                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                        + _myCamera.getOrientation() * boomOffset);
-                } else {
-                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                        + myAvatar->getWorldOrientation() * boomOffset);
-                }
-            } else {
-                glm::quat lookAtRotation = myAvatar->getLookAtRotation();
-                if (mode == CAMERA_MODE_SELFIE) {
-                    lookAtRotation = lookAtRotation * glm::angleAxis(PI, myAvatar->getWorldOrientation() * Vectors::UP);
-                }
-                _myCamera.setPosition(myAvatar->getLookAtPivotPoint()
-                    + lookAtRotation * boomOffset);
-                _myCamera.lookAt(myAvatar->getLookAtPivotPoint());
-            }
+        if (getMyAvatar()->getFullAvatarURLFromPreferences() != getMyAvatar()->getSkeletonModelURL()) {
+            getMyAvatar()->resetFullAvatarURL();
         }
-    } else if (mode == CAMERA_MODE_MIRROR) {
-        _thirdPersonHMDCameraBoomValid= false;
-
-        if (isHMDMode()) {
-            auto mirrorBodyOrientation = myAvatar->getWorldOrientation() * glm::quat(glm::vec3(0.0f, PI + _mirrorYawOffset, 0.0f));
-
-            glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
-            // Mirror HMD yaw and roll
-            glm::vec3 mirrorHmdEulers = glm::eulerAngles(hmdRotation);
-            mirrorHmdEulers.y = -mirrorHmdEulers.y;
-            mirrorHmdEulers.z = -mirrorHmdEulers.z;
-            glm::quat mirrorHmdRotation = glm::quat(mirrorHmdEulers);
-
-            glm::quat worldMirrorRotation = mirrorBodyOrientation * mirrorHmdRotation;
-
-            _myCamera.setOrientation(worldMirrorRotation);
-
-            glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
-            // Mirror HMD lateral offsets
-            hmdOffset.x = -hmdOffset.x;
+        getMyAvatar()->markIdentityDataChanged();
+        getMyAvatar()->resetLastSent();
 
-            _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                + glm::vec3(0, _raiseMirror * myAvatar->getModelScale(), 0)
-                + mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
-                + mirrorBodyOrientation * hmdOffset);
-        } else {
-            auto userInputMapper = DependencyManager::get<UserInputMapper>();
-            const float YAW_SPEED = TWO_PI / 5.0f;
-            float deltaYaw = userInputMapper->getActionState(controller::Action::YAW) * YAW_SPEED * deltaTime;
-            _mirrorYawOffset += deltaYaw;
-            _myCamera.setOrientation(myAvatar->getWorldOrientation() * glm::quat(glm::vec3(0.0f, PI + _mirrorYawOffset, 0.0f)));
-            _myCamera.setPosition(myAvatar->getDefaultEyePosition()
-                + glm::vec3(0, _raiseMirror * myAvatar->getModelScale(), 0)
-                + (myAvatar->getWorldOrientation() * glm::quat(glm::vec3(0.0f, _mirrorYawOffset, 0.0f))) *
-                glm::vec3(0.0f, 0.0f, -1.0f) * myAvatar->getBoomLength() * _scaleMirror);
-        }
-        renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
-    } else if (mode == CAMERA_MODE_ENTITY) {
-        _thirdPersonHMDCameraBoomValid= false;
-        EntityItemPointer cameraEntity = _myCamera.getCameraEntityPointer();
-        if (cameraEntity != nullptr) {
-            if (isHMDMode()) {
-                glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
-                _myCamera.setOrientation(cameraEntity->getWorldOrientation() * hmdRotation);
-                glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
-                _myCamera.setPosition(cameraEntity->getWorldPosition() + (hmdRotation * hmdOffset));
-            } else {
-                _myCamera.setOrientation(cameraEntity->getWorldOrientation());
-                _myCamera.setPosition(cameraEntity->getWorldPosition());
-            }
+        if (!isInterstitialMode()) {
+            // transmit a "sendAll" packet to the AvatarMixer we just connected to.
+            getMyAvatar()->sendAvatarDataPacket(true);
         }
     }
-    // Update camera position
-    if (!isHMDMode()) {
-        _myCamera.update();
-    }
-
-    renderArgs._cameraMode = (int8_t)_myCamera.getMode();
-}
-
-void Application::runTests() {
-    runTimingTests();
-    runUnitTests();
-}
-
-void Application::setFieldOfView(float fov) {
-    if (fov != _fieldOfView.get()) {
-        _fieldOfView.set(fov);
-        resizeGL();
-    }
-}
-
-void Application::setHMDTabletScale(float hmdTabletScale) {
-    _hmdTabletScale.set(hmdTabletScale);
-}
-
-void Application::setDesktopTabletScale(float desktopTabletScale) {
-    _desktopTabletScale.set(desktopTabletScale);
-}
-
-void Application::setDesktopTabletBecomesToolbarSetting(bool value) {
-    _desktopTabletBecomesToolbarSetting.set(value);
-    updateSystemTabletMode();
-}
-
-void Application::setHmdTabletBecomesToolbarSetting(bool value) {
-    _hmdTabletBecomesToolbarSetting.set(value);
-    updateSystemTabletMode();
-}
-
-void Application::setPreferStylusOverLaser(bool value) {
-    _preferStylusOverLaserSetting.set(value);
-}
-
-void Application::setPreferAvatarFingerOverStylus(bool value) {
-    _preferAvatarFingerOverStylusSetting.set(value);
 }
 
-void Application::setPreferredCursor(const QString& cursorName) {
-    qCDebug(interfaceapp) << "setPreferredCursor" << cursorName;
-
-    if (_displayPlugin && _displayPlugin->isHmd()) {
-        _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
-    } else {
-        _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
-    }
+void Application::nodeKilled(SharedNodePointer node) {
+    // These are here because connecting NodeList::nodeKilled to OctreePacketProcessor::nodeKilled doesn't work:
+    // OctreePacketProcessor::nodeKilled is not being called when NodeList::nodeKilled is emitted.
+    // This may have to do with GenericThread::threadRoutine() blocking the QThread event loop
 
-    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
-}
+    _octreeProcessor->nodeKilled(node);
 
-void Application::setSettingConstrainToolbarPosition(bool setting) {
-    _constrainToolbarPosition.set(setting);
-    getOffscreenUI()->setConstrainToolbarToCenterX(setting);
-}
+    _entityEditSender->nodeKilled(node);
 
-void Application::setAwayStateWhenFocusLostInVREnabled(bool enabled) {
-    _awayStateWhenFocusLostInVREnabled.set(enabled);
-    emit awayStateWhenFocusLostInVRChanged(enabled);
-}
+    if (node->getType() == NodeType::AudioMixer) {
+        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "audioMixerKilled");
+    } else if (node->getType() == NodeType::EntityServer) {
+        // we lost an entity server, clear all of the domain octree details
+        clearDomainOctreeDetails(false);
+    } else if (node->getType() == NodeType::AssetServer) {
+        // asset server going away - check if we have the asset browser showing
 
-void Application::setMiniTabletEnabled(bool enabled) {
-    _miniTabletEnabledSetting.set(enabled);
-    emit miniTabletEnabledChanged(enabled);
-}
+#if !defined(DISABLE_QML)
+        auto offscreenUi = getOffscreenUI();
+        auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
 
-void Application::showHelp() {
-    static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
-    static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
-    static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR";
-
-    static const QString VIVE_PLUGIN_NAME = "HTC Vive";
-    static const QString OCULUS_RIFT_PLUGIN_NAME = "Oculus Rift";
-    static const QString WINDOWS_MR_PLUGIN_NAME = "WindowsMR";
-
-    static const QString TAB_KEYBOARD_MOUSE = "kbm";
-    static const QString TAB_GAMEPAD = "gamepad";
-    static const QString TAB_HAND_CONTROLLERS = "handControllers";
-
-    QString handControllerName;
-    QString defaultTab = TAB_KEYBOARD_MOUSE;
-
-    if (PluginUtils::isHMDAvailable(WINDOWS_MR_PLUGIN_NAME)) {
-        defaultTab = TAB_HAND_CONTROLLERS;
-        handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR;
-    } else if (PluginUtils::isHMDAvailable(VIVE_PLUGIN_NAME)) {
-        defaultTab = TAB_HAND_CONTROLLERS;
-        handControllerName = HAND_CONTROLLER_NAME_VIVE;
-    } else if (PluginUtils::isHMDAvailable(OCULUS_RIFT_PLUGIN_NAME)) {
-        if (PluginUtils::isOculusTouchControllerAvailable()) {
-            defaultTab = TAB_HAND_CONTROLLERS;
-            handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
-        } else if (PluginUtils::isXboxControllerAvailable()) {
-            defaultTab = TAB_GAMEPAD;
-        } else {
-            defaultTab = TAB_KEYBOARD_MOUSE;
+        if (assetDialog) {
+            // call reload on the shown asset browser dialog
+            QMetaObject::invokeMethod(assetDialog, "clear");
         }
-    } else if (PluginUtils::isXboxControllerAvailable()) {
-        defaultTab = TAB_GAMEPAD;
-    } else {
-        defaultTab = TAB_KEYBOARD_MOUSE;
-    }
-
-    QUrlQuery queryString;
-    queryString.addQueryItem("handControllerName", handControllerName);
-    queryString.addQueryItem("defaultTab", defaultTab);
-    TabletProxy* tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet(SYSTEM_TABLET));
-    tablet->gotoWebScreen(PathUtils::resourcesUrl() + INFO_HELP_PATH + "?" + queryString.toString());
-    DependencyManager::get<HMDScriptingInterface>()->openTablet();
-    //InfoView::show(INFO_HELP_PATH, false, queryString.toString());
-}
-
-void Application::gotoTutorial() {
-    const QString TUTORIAL_ADDRESS = "file:///~/serverless/tutorial.json";
-    DependencyManager::get<AddressManager>()->handleLookupString(TUTORIAL_ADDRESS);
-}
-
-void Application::resizeEvent(QResizeEvent* event) {
-    resizeGL();
-}
-
-void Application::resizeGL() {
-    PROFILE_RANGE(render, __FUNCTION__);
-    if (nullptr == _displayPlugin) {
-        return;
-    }
-
-    auto displayPlugin = getActiveDisplayPlugin();
-    // Set the desired FBO texture size. If it hasn't changed, this does nothing.
-    // Otherwise, it must rebuild the FBOs
-    uvec2 framebufferSize = displayPlugin->getRecommendedRenderSize();
-    uvec2 renderSize = uvec2(framebufferSize);
-    if (_renderResolution != renderSize) {
-        _renderResolution = renderSize;
-        DependencyManager::get<FramebufferCache>()->setFrameBufferSize(fromGlm(renderSize));
-    }
-
-    // FIXME the aspect ratio for stereo displays is incorrect based on this.
-    float aspectRatio = displayPlugin->getRecommendedAspectRatio();
-    _myCamera.setProjection(glm::perspective(glm::radians(_fieldOfView.get()), aspectRatio,
-                                             DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP));
-    // Possible change in aspect ratio
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        _myCamera.loadViewFrustum(_viewFrustum);
-    }
-
-#if !defined(DISABLE_QML)
-    getOffscreenUI()->resize(fromGlm(displayPlugin->getRecommendedUiSize()));
 #endif
+    }
 }
 
 void Application::handleSandboxStatus(QNetworkReply* reply) {
@@ -4067,5604 +1633,891 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
     _connectionMonitor.init();
 }
 
-bool Application::importJSONFromURL(const QString& urlString) {
-    // we only load files that terminate in just .json (not .svo.json and not .ava.json)
-    QUrl jsonURL { urlString };
-
-    emit svoImportRequested(urlString);
-    return true;
-}
+void Application::cleanupBeforeQuit() {
+    // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not
+    QString webengineRemoteDebugging = QProcessEnvironment::systemEnvironment().value("QTWEBENGINE_REMOTE_DEBUGGING", "false");
+    qCDebug(interfaceapp) << "QTWEBENGINE_REMOTE_DEBUGGING =" << webengineRemoteDebugging;
 
-bool Application::importSVOFromURL(const QString& urlString) {
-    emit svoImportRequested(urlString);
-    return true;
-}
+    DependencyManager::prepareToExit();
 
-bool Application::importFromZIP(const QString& filePath) {
-    qDebug() << "A zip file has been dropped in: " << filePath;
-    QUrl empty;
-    // handle Blocks download from Marketplace
-    if (filePath.contains("poly.google.com/downloads")) {
-        addAssetToWorldFromURL(filePath);
-    } else {
-        qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false);
+    if (tracing::enabled()) {
+        auto tracer = DependencyManager::get<tracing::Tracer>();
+        tracer->stopTracing();
+        auto outputFile = property(hifi::properties::TRACING).toString();
+        tracer->serialize(outputFile);
     }
-    return true;
-}
 
-bool Application::isServerlessMode() const {
-    auto tree = getEntities()->getTree();
-    if (tree) {
-        return tree->isServerlessMode();
-    }
-    return false;
-}
+    // Stop third party processes so that they're not left running in the event of a subsequent shutdown crash.
+    AnimDebugDraw::getInstance().shutdown();
 
-void Application::setIsInterstitialMode(bool interstitialMode) {
-    bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
-    if (enableInterstitial) {
-        if (_interstitialMode != interstitialMode) {
-            _interstitialMode = interstitialMode;
-            emit interstitialModeChanged(_interstitialMode);
+    // FIXME: once we move to shared pointer for the INputDevice we shoud remove this naked delete:
+    _applicationStateDevice.reset();
 
-            DependencyManager::get<AudioClient>()->setAudioPaused(_interstitialMode);
-            DependencyManager::get<AvatarManager>()->setMyAvatarDataPacketsPaused(_interstitialMode);
+    {
+        if (_keyboardFocusHighlightID != UNKNOWN_ENTITY_ID) {
+            DependencyManager::get<EntityScriptingInterface>()->deleteEntity(_keyboardFocusHighlightID);
+            _keyboardFocusHighlightID = UNKNOWN_ENTITY_ID;
         }
     }
-}
-
-void Application::setIsServerlessMode(bool serverlessDomain) {
-    DependencyManager::get<NodeList>()->setSendDomainServerCheckInEnabled(!serverlessDomain);
-    auto tree = getEntities()->getTree();
-    if (tree) {
-        tree->setIsServerlessMode(serverlessDomain);
-    }
-}
 
-std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl domainURL, QByteArray data) {
-    QUuid serverlessSessionID = QUuid::createUuid();
-    getMyAvatar()->setSessionUUID(serverlessSessionID);
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->setSessionUUID(serverlessSessionID);
+    {
+        auto nodeList = DependencyManager::get<NodeList>();
 
-    // there is no domain-server to tell us our permissions, so enable all
-    NodePermissions permissions;
-    permissions.setAll(true);
-    nodeList->setPermissions(permissions);
+        // send the domain a disconnect packet, force stoppage of domain-server check-ins
+        nodeList->getDomainHandler().disconnect("Quitting");
+        nodeList->setIsShuttingDown(true);
 
-    // FIXME: Lock the main tree and import directly into it.
-    EntityTreePointer tmpTree(std::make_shared<EntityTree>());
-    tmpTree->setIsServerlessMode(true);
-    tmpTree->createRootElement();
-    auto myAvatar = getMyAvatar();
-    tmpTree->setMyAvatar(myAvatar);
-    bool success = tmpTree->readFromByteArray(domainURL.toString(), data);
-    if (success) {
-        tmpTree->reaverageOctreeElements();
-        tmpTree->sendEntities(_entityEditSender.get(), getEntities()->getTree(), "domain", 0, 0, 0);
+        // tell the packet receiver we're shutting down, so it can drop packets
+        nodeList->getPacketReceiver().setShouldDropPackets(true);
     }
-    std::map<QString, QString> namedPaths = tmpTree->getNamedPaths();
 
-    // we must manually eraseAllOctreeElements(false) else the tmpTree will mem-leak
-    tmpTree->eraseAllOctreeElements(false);
+    getEntities()->shutdown(); // tell the entities system we're shutting down, so it will stop running scripts
 
-    return namedPaths;
-}
+    // Clear any queued processing (I/O, FBX/OBJ/Texture parsing)
+    QThreadPool::globalInstance()->clear();
+    QThreadPool::globalInstance()->waitForDone();
 
-void Application::loadServerlessDomain(QUrl domainURL) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadServerlessDomain", Q_ARG(QUrl, domainURL));
-        return;
+    DependencyManager::destroy<RecordingScriptingInterface>();
+
+    // FIXME: Something is still holding on to the ScriptEnginePointers contained in ScriptEngines, and they hold backpointers to ScriptEngines,
+    // so this doesn't shut down properly
+    DependencyManager::get<ScriptEngines>()->shutdownScripting(); // stop all currently running global scripts
+    // These classes hold ScriptEnginePointers, so they must be destroyed before ScriptEngines
+    // Must be done after shutdownScripting in case any scripts try to access these things
+    {
+        DependencyManager::destroy<StandAloneJSConsole>();
+        EntityTreePointer tree = getEntities()->getTree();
+        tree->setSimulation(nullptr);
+        DependencyManager::destroy<EntityTreeRenderer>();
     }
+    DependencyManager::destroy<ScriptEngines>();
 
-    if (domainURL.isEmpty()) {
-        return;
+    bool keepMeLoggedIn = Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, false).get();
+    if (!keepMeLoggedIn) {
+        DependencyManager::get<AccountManager>()->removeAccountFromFile();
     }
+    // ####### TODO
 
-    QString trimmedUrl = domainURL.toString().trimmed();
-    bool DEFAULT_IS_OBSERVABLE = true;
-    const qint64 DEFAULT_CALLER_ID = -1;
-    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
-        this, trimmedUrl, DEFAULT_IS_OBSERVABLE, DEFAULT_CALLER_ID, "Application::loadServerlessDomain");
+    _displayPlugin.reset();
+    PluginManager::getInstance()->shutdown();
 
-    if (!request) {
-        return;
-    }
+    // Cleanup all overlays after the scripts, as scripts might add more
+    _overlays.cleanupAllOverlays();
 
-    connect(request, &ResourceRequest::finished, this, [=]() {
-        if (request->getResult() == ResourceRequest::Success) {
-            auto namedPaths = prepareServerlessDomainContents(domainURL, request->getData());
-            auto nodeList = DependencyManager::get<NodeList>();
-            nodeList->getDomainHandler().connectedToServerless(namedPaths);
-            _fullSceneReceivedCounter++;
-        }
-        request->deleteLater();
-    });
-    request->send();
-}
+    // first stop all timers directly or by invokeMethod
+    // depending on what thread they run in
+    _locationUpdateTimer.stop();
+    _window->saveGeometry();
 
-void Application::loadErrorDomain(QUrl domainURL) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "loadErrorDomain", Q_ARG(QUrl, domainURL));
-        return;
-    }
+    // stop QML
+    DependencyManager::destroy<TabletScriptingInterface>();
+    DependencyManager::destroy<ToolbarScriptingInterface>();
+    DependencyManager::destroy<OffscreenUi>();
 
-    loadServerlessDomain(domainURL);
-}
+    DependencyManager::destroy<OffscreenQmlSurfaceCache>();
 
-bool Application::importImage(const QString& urlString) {
-    qCDebug(interfaceapp) << "An image file has been dropped in";
-    QString filepath(urlString);
-#if defined(Q_OS_WIN)
-    filepath.remove("file:///");
-#else
-    filepath.remove("file://");
-#endif
-    addAssetToWorld(filepath, "", false, false);
-    return true;
-}
+    // destroy Audio so it and its threads have a chance to go down safely
+    // this must happen after QML, as there are unexplained audio crashes originating in qtwebengine
+    AudioInjector::setLocalAudioInterface(nullptr);
+    DependencyManager::destroy<AudioClient>();
+    DependencyManager::destroy<AudioScriptingInterface>();
 
-// thread-safe
-void Application::onPresent(quint32 frameCount) {
-    bool expected = false;
-    if (_pendingIdleEvent.compare_exchange_strong(expected, true)) {
-        postEvent(this, new QEvent((QEvent::Type)ApplicationEvent::Idle), Qt::HighEventPriority);
-    }
-    expected = false;
-    if (_graphicsEngine->checkPendingRenderEvent() && !isAboutToQuit()) {
-        postEvent(_graphicsEngine->_renderEventHandler, new QEvent((QEvent::Type)ApplicationEvent::Render));
-    }
-}
+    // The PointerManager must be destroyed before the PickManager because when a Pointer is deleted,
+    // it accesses the PickManager to delete its associated Pick
+    DependencyManager::destroy<PointerManager>();
+    DependencyManager::destroy<PickManager>();
+    DependencyManager::destroy<KeyboardScriptingInterface>();
+    DependencyManager::destroy<Keyboard>();
+    DependencyManager::destroy<AvatarPackager>();
 
-static inline bool isKeyEvent(QEvent::Type type) {
-    return type == QEvent::KeyPress || type == QEvent::KeyRelease;
+    qCDebug(interfaceapp) << "Application::cleanupBeforeQuit() complete";
 }
 
-bool Application::handleInputMethodEventForFocusedEntity(QEvent* event) {
-    if (_keyboardFocusedEntity.get() != UNKNOWN_ENTITY_ID) {
-        switch (event->type()) {
-            case QEvent::InputMethod:
-            case QEvent::InputMethodQuery:
-            {
-                auto eventHandler = getEntities()->getEventHandler(_keyboardFocusedEntity.get());
-                if (eventHandler) {
-                    event->setAccepted(false);
-                    QCoreApplication::sendEvent(eventHandler, event);
-                    if (event->isAccepted()) {
-                        _lastAcceptedKeyPress = usecTimestampNow();
-                        return true;
-                    }
-                }
-                break;
-            }
-            default:
-                break;
-        }
-    }
 
-    return false;
-}
+static const float FOCUS_HIGHLIGHT_EXPANSION_FACTOR = 1.05f;
+void Application::idle() {
+    PerformanceTimer perfTimer("idle");
 
-bool Application::handleKeyEventForFocusedEntity(QEvent* event) {
-    if (_keyboardFocusedEntity.get() != UNKNOWN_ENTITY_ID) {
-        switch (event->type()) {
-            case QEvent::KeyPress:
-            case QEvent::KeyRelease:
-                {
-                    auto eventHandler = getEntities()->getEventHandler(_keyboardFocusedEntity.get());
-                    if (eventHandler) {
-                        event->setAccepted(false);
-                        QCoreApplication::sendEvent(eventHandler, event);
-                        if (event->isAccepted()) {
-                            _lastAcceptedKeyPress = usecTimestampNow();
-                            return true;
-                        }
-                    }
-                    break;
-                }
-            default:
-                break;
-        }
+#if !defined(DISABLE_QML)
+    auto offscreenUi = getOffscreenUI();
+
+    // These tasks need to be done on our first idle, because we don't want the showing of
+    // overlay subwindows to do a showDesktop() until after the first time through
+    static bool firstIdle = true;
+    if (firstIdle) {
+        firstIdle = false;
+        connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop);
     }
+#endif
 
-    return false;
-}
+#ifdef Q_OS_WIN
+    // If tracing is enabled then monitor the CPU in a separate thread
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        if (trace_app().isDebugEnabled()) {
+            QThread* cpuMonitorThread = new QThread(qApp);
+            cpuMonitorThread->setObjectName("cpuMonitorThread");
+            QObject::connect(cpuMonitorThread, &QThread::started, [this] { setupCpuMonitorThread(); });
+            QObject::connect(qApp, &QCoreApplication::aboutToQuit, cpuMonitorThread, &QThread::quit);
+            cpuMonitorThread->start();
+        }
+    });
+#endif
 
-bool Application::handleFileOpenEvent(QFileOpenEvent* fileEvent) {
-    QUrl url = fileEvent->url();
-    if (!url.isEmpty()) {
-        QString urlString = url.toString();
-        if (canAcceptURL(urlString)) {
-            return acceptURL(urlString);
+    auto displayPlugin = getActiveDisplayPlugin();
+#if !defined(DISABLE_QML)
+    if (displayPlugin) {
+        auto uiSize = displayPlugin->getRecommendedUiSize();
+        // Bit of a hack since there's no device pixel ratio change event I can find.
+        if (offscreenUi->size() != fromGlm(uiSize)) {
+            qCDebug(interfaceapp) << "Device pixel ratio changed, triggering resize to " << uiSize;
+            offscreenUi->resize(fromGlm(uiSize));
         }
     }
-    return false;
-}
+#endif
 
-bool Application::notify(QObject * object, QEvent * event) {
-    if (thread() == QThread::currentThread() && _profilingInitialized ) {
-        // _profilingInitialized gets set once we're reading for profiling.
-        // this prevents a deadlock due to profiling not working yet
-        PROFILE_RANGE_IF_LONGER(app, "notify", 2)
-        return QApplication::notify(object, event);
+    if (displayPlugin) {
+        PROFILE_COUNTER_IF_CHANGED(app, "present", float, displayPlugin->presentRate());
     }
+    PROFILE_COUNTER_IF_CHANGED(app, "renderLoopRate", float, getRenderLoopRate());
+    PROFILE_COUNTER_IF_CHANGED(app, "currentDownloads", uint32_t, ResourceCache::getLoadingRequests().length());
+    PROFILE_COUNTER_IF_CHANGED(app, "pendingDownloads", uint32_t, ResourceCache::getPendingRequestCount());
+    PROFILE_COUNTER_IF_CHANGED(app, "currentProcessing", int, DependencyManager::get<StatTracker>()->getStat("Processing").toInt());
+    PROFILE_COUNTER_IF_CHANGED(app, "pendingProcessing", int, DependencyManager::get<StatTracker>()->getStat("PendingProcessing").toInt());
+    auto renderConfig = _graphicsEngine->getRenderEngine()->getConfiguration();
+    PROFILE_COUNTER_IF_CHANGED(render, "gpuTime", float, (float)_graphicsEngine->getGPUContext()->getFrameTimerGPUAverage());
 
-    return QApplication::notify(object, event);
-}
-
-bool Application::event(QEvent* event) {
-
-    if (_aboutToQuit) {
-        return false;
-    }
+    PROFILE_RANGE(app, __FUNCTION__);
 
-    // This helps avoid deadlock issue early during Application initialization
-    if (!_isMenuInitialized) {
-        return QApplication::event(event);
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->runCallbacks();
     }
 
-    if (!Menu::getInstance()) {
-        return false;
+    if (auto oculusPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
+        oculusPlugin->handleOVREvents();
     }
 
-    if ((event->type() == QEvent::InputMethod || event->type() == QEvent::InputMethodQuery) && handleInputMethodEventForFocusedEntity(event)) {
-        return true;
-    }
+    float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;
+    _lastTimeUpdated.start();
 
-    // Allow focused Entities to handle keyboard input
-    if (isKeyEvent(event->type()) && handleKeyEventForFocusedEntity(event)) {
-        return true;
+#if !defined(DISABLE_QML)
+    // If the offscreen Ui has something active that is NOT the root, then assume it has keyboard focus.
+    if (offscreenUi && offscreenUi->getWindow()) {
+        auto activeFocusItem = offscreenUi->getWindow()->activeFocusItem();
+        if (_keyboardDeviceHasFocus && (activeFocusItem != NULL && activeFocusItem != offscreenUi->getRootItem())) {
+            _keyboardMouseDevice->pluginFocusOutEvent();
+            _keyboardDeviceHasFocus = false;
+            synthesizeKeyReleasEvents();
+        } else if (activeFocusItem == offscreenUi->getRootItem()) {
+            _keyboardDeviceHasFocus = true;
+        }
     }
+#endif
 
-    int type = event->type();
-    switch (type) {
-        case ApplicationEvent::Lambda:
-            static_cast<LambdaEvent*>(event)->call();
-            return true;
+    checkChangeCursor();
 
-        // Explicit idle keeps the idle running at a lower interval, but without any rendering
-        // see (windowMinimizedChanged)
-        case ApplicationEvent::Idle:
-            idle();
-
-#ifdef DEBUG_EVENT_QUEUE_DEPTH
-            // The event queue may very well grow beyond 400, so
-            // this code should only be enabled on local builds
-            {
-                int count = ::hifi::qt::getEventQueueSize(QThread::currentThread());
-                if (count > 400) {
-                    ::hifi::qt::dumpEventQueue(QThread::currentThread());
-                }
-            }
-#endif // DEBUG_EVENT_QUEUE_DEPTH
-
-            _pendingIdleEvent.store(false);
-
-            return true;
-
-        case QEvent::MouseMove:
-            mouseMoveEvent(static_cast<QMouseEvent*>(event));
-            return true;
-        case QEvent::MouseButtonPress:
-            mousePressEvent(static_cast<QMouseEvent*>(event));
-            return true;
-        case QEvent::MouseButtonDblClick:
-            mouseDoublePressEvent(static_cast<QMouseEvent*>(event));
-            return true;
-        case QEvent::MouseButtonRelease:
-            mouseReleaseEvent(static_cast<QMouseEvent*>(event));
-            return true;
-        case QEvent::KeyPress:
-            keyPressEvent(static_cast<QKeyEvent*>(event));
-            return true;
-        case QEvent::KeyRelease:
-            keyReleaseEvent(static_cast<QKeyEvent*>(event));
-            return true;
-        case QEvent::FocusOut:
-            focusOutEvent(static_cast<QFocusEvent*>(event));
-            return true;
-        case QEvent::FocusIn:
-        { //testing to see if we can set focus when focus is not set to root window.
-            _glWidget->activateWindow();
-            _glWidget->setFocus();
-            return true;
-        }
-
-        case QEvent::TouchBegin:
-            touchBeginEvent(static_cast<QTouchEvent*>(event));
-            event->accept();
-            return true;
-        case QEvent::TouchEnd:
-            touchEndEvent(static_cast<QTouchEvent*>(event));
-            return true;
-        case QEvent::TouchUpdate:
-            touchUpdateEvent(static_cast<QTouchEvent*>(event));
-            return true;
-        case QEvent::Gesture:
-            touchGestureEvent((QGestureEvent*)event);
-            return true;
-        case QEvent::Wheel:
-            wheelEvent(static_cast<QWheelEvent*>(event));
-            return true;
-        case QEvent::Drop:
-            dropEvent(static_cast<QDropEvent*>(event));
-            return true;
-
-        case QEvent::FileOpen:
-            if (handleFileOpenEvent(static_cast<QFileOpenEvent*>(event))) {
-                return true;
-            }
-            break;
-
-        default:
-            break;
+#if !defined(DISABLE_QML)
+    auto stats = Stats::getInstance();
+    if (stats) {
+        stats->updateStats();
     }
-
-    return QApplication::event(event);
-}
-
-bool Application::eventFilter(QObject* object, QEvent* event) {
-    auto eventType = event->type();
-
-    if (_aboutToQuit && eventType != QEvent::DeferredDelete && eventType != QEvent::Destroy) {
-        return true;
+    auto animStats = AnimStats::getInstance();
+    if (animStats) {
+        animStats->updateStats();
     }
+#endif
 
-#if defined(Q_OS_MAC)
-    // On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
-    // be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
-    // on Mac, the MouseButtonRelease event for these mouse presses is sent to the top
-    // level QWidgetWindow, but are not propagated further. This means that the Application
-    // will see a MouseButtonPress, but no MouseButtonRelease, causing the client to get
-    // stuck in "mouse-look." The cause of the problem is in the way QWidgetWindow processes
-    // events where QMouseEvent::button() is not equal to QMouseEvent::buttons(). In this case
-    // QMouseEvent::button() is Qt::RightButton, while QMouseEvent::buttons() is (correctly?)
-    // Qt::LeftButton.
-    //
-    // The change here gets around this problem by capturing these
-    // pseudo-RightClicks, and re-emitting them as "pure" RightClicks, where
-    // QMouseEvent::button() == QMouseEvent::buttons() == Qt::RightButton.
-    //
-    if (eventType == QEvent::MouseButtonPress) {
-        auto mouseEvent = static_cast<QMouseEvent*>(event);
-        if (mouseEvent->button() == Qt::RightButton
-            && mouseEvent->buttons() == Qt::LeftButton
-            && mouseEvent->modifiers() == Qt::MetaModifier) {
-
-            QMouseEvent* newEvent = new QMouseEvent(
-                    QEvent::MouseButtonPress, mouseEvent->localPos(), mouseEvent->windowPos(),
-                    mouseEvent->screenPos(), Qt::RightButton, Qt::MouseButtons(Qt::RightButton),
-                    mouseEvent->modifiers());
-            QApplication::postEvent(object, newEvent);
-            return true;
-        }
-    }
+    // 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.
+#ifdef Q_OS_ANDROID
+    bool showWarnings = false;
+#else
+    bool showWarnings = getLogger()->extraDebugging();
 #endif
+    PerformanceWarning warn(showWarnings, "idle()");
 
-    if (eventType == QEvent::KeyPress || eventType == QEvent::KeyRelease || eventType == QEvent::MouseMove) {
-        getRefreshRateManager().resetInactiveTimer();
+    {
+        _gameWorkload.updateViews(_viewFrustum, getMyAvatar()->getHeadPosition());
+        _gameWorkload._engine->run();
     }
-
-    if (event->type() == QEvent::Leave) {
-        getApplicationCompositor().handleLeaveEvent();
+    {
+        PerformanceTimer perfTimer("update");
+        PerformanceWarning warn(showWarnings, "Application::idle()... update()");
+        static const float BIGGEST_DELTA_TIME_SECS = 0.25f;
+        update(glm::clamp(secondsSinceLastUpdate, 0.0f, BIGGEST_DELTA_TIME_SECS));
     }
 
-    if (event->type() == QEvent::ShortcutOverride) {
-#if !defined(DISABLE_QML)
-        if (getOffscreenUI()->shouldSwallowShortcut(event)) {
-            event->accept();
-            return true;
+    { // Update keyboard focus highlight
+        if (!_keyboardFocusedEntity.get().isInvalidID()) {
+            const quint64 LOSE_FOCUS_AFTER_ELAPSED_TIME = 30 * USECS_PER_SECOND; // if idle for 30 seconds, drop focus
+            quint64 elapsedSinceAcceptedKeyPress = usecTimestampNow() - _lastAcceptedKeyPress;
+            if (elapsedSinceAcceptedKeyPress > LOSE_FOCUS_AFTER_ELAPSED_TIME) {
+                setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+            } else {
+                if (auto entity = getEntities()->getTree()->findEntityByID(_keyboardFocusedEntity.get())) {
+                    EntityItemProperties properties;
+                    properties.setPosition(entity->getWorldPosition());
+                    properties.setRotation(entity->getWorldOrientation());
+                    properties.setDimensions(entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR);
+                    DependencyManager::get<EntityScriptingInterface>()->editEntity(_keyboardFocusHighlightID, properties);
+                }
+            }
         }
-#endif
+    }
 
-        // Filter out captured keys before they're used for shortcut actions.
-        if (_controllerScriptingInterface->isKeyCaptured(static_cast<QKeyEvent*>(event))) {
-            event->accept();
-            return true;
+    {
+        if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_keyboardFocusedEntity.get())) {
+            QUuid entityId = _keyboardFocusedEntity.get();
+            setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+            _keyboardFocusWaitingOnRenderable = false;
+            setKeyboardFocusEntity(entityId);
         }
     }
 
-    if (event->type() == QEvent::WindowStateChange) {
-        if (getWindow()->windowState() & Qt::WindowMinimized) {
-            getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::MINIMIZED);
-        } else {
-            auto* windowStateChangeEvent = static_cast<QWindowStateChangeEvent*>(event);
-            if (windowStateChangeEvent->oldState() & Qt::WindowMinimized) {
-                getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::FOCUS_ACTIVE);
-                getRefreshRateManager().resetInactiveTimer();
+    {
+        PerformanceTimer perfTimer("pluginIdle");
+        PerformanceWarning warn(showWarnings, "Application::idle()... pluginIdle()");
+        getActiveDisplayPlugin()->idle();
+        const auto& inputPlugins = PluginManager::getInstance()->getInputPlugins();
+        for(const auto& inputPlugin : inputPlugins) {
+            if (inputPlugin->isActive()) {
+                inputPlugin->idle();
             }
         }
     }
 
-    return false;
-}
-
-static bool _altPressed{ false };
+    _overlayConductor.update(secondsSinceLastUpdate);
 
-void Application::keyPressEvent(QKeyEvent* event) {
-    _altPressed = event->key() == Qt::Key_Alt;
+    _gameLoopCounter.increment();
+}
 
-    if (!event->isAutoRepeat()) {
-        _keysPressed.insert(event->key(), *event);
-    }
+void Application::update(float deltaTime) {
+    PROFILE_RANGE_EX(app, __FUNCTION__, 0xffff0000, (uint64_t)_graphicsEngine->_renderFrameCount + 1);
 
-    _controllerScriptingInterface->emitKeyPressEvent(event); // send events to any registered scripts
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isKeyCaptured(event) || isInterstitialMode()) {
+    if (_aboutToQuit) {
         return;
     }
 
-    if (hasFocus() && getLoginDialogPoppedUp()) {
-        if (_keyboardMouseDevice->isActive()) {
-            _keyboardMouseDevice->keyReleaseEvent(event);
-        }
-
-        bool isControlOrCommand = event->modifiers().testFlag(Qt::ControlModifier);
-        bool isOption = event->modifiers().testFlag(Qt::AltModifier);
-        switch (event->key()) {
-            case Qt::Key_4:
-            case Qt::Key_5:
-            case Qt::Key_6:
-            case Qt::Key_7:
-                if (isControlOrCommand || isOption) {
-                    unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
-                    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
-                    if (index < displayPlugins.size()) {
-                        auto targetPlugin = displayPlugins.at(index);
-                        QString targetName = targetPlugin->getName();
-                        auto menu = Menu::getInstance();
-                        QAction* action = menu->getActionForOption(targetName);
-                        if (action && !action->isChecked()) {
-                            action->trigger();
-                        }
-                    }
-                }
-                break;
-        }
-    } else if (hasFocus()) {
-        if (_keyboardMouseDevice->isActive()) {
-            _keyboardMouseDevice->keyPressEvent(event);
+    if (!_physicsEnabled) {
+        if (!_domainLoadingInProgress) {
+            PROFILE_ASYNC_BEGIN(app, "Scene Loading", "");
+            _domainLoadingInProgress = true;
         }
 
-        bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
-        bool isControlOrCommand = event->modifiers().testFlag(Qt::ControlModifier);
-        bool isMetaOrMacControl = event->modifiers().testFlag(Qt::MetaModifier);
-        bool isOption = event->modifiers().testFlag(Qt::AltModifier);
-        switch (event->key()) {
-            case Qt::Key_Enter:
-            case Qt::Key_Return:
-                if (isOption) {
-                    if (_window->isFullScreen()) {
-                        unsetFullscreen();
-                    } else {
-                        setFullscreen(nullptr);
-                    }
-                }
-                break;
-
-            case Qt::Key_1: {
-                Menu* menu = Menu::getInstance();
-                menu->triggerOption(MenuOption::FirstPersonLookAt);
-                break;
-            }
-            case Qt::Key_2: {
-                Menu* menu = Menu::getInstance();
-                menu->triggerOption(MenuOption::SelfieCamera);
-                break;
-            }
-            case Qt::Key_3: {
-                Menu* menu = Menu::getInstance();
-                menu->triggerOption(MenuOption::LookAtCamera);
-                break;
-            }
-            case Qt::Key_4:
-            case Qt::Key_5:
-            case Qt::Key_6:
-            case Qt::Key_7:
-                if (isControlOrCommand || isOption) {
-                    unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
-                    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
-                    if (index < displayPlugins.size()) {
-                        auto targetPlugin = displayPlugins.at(index);
-                        QString targetName = targetPlugin->getName();
-                        auto menu = Menu::getInstance();
-                        QAction* action = menu->getActionForOption(targetName);
-                        if (action && !action->isChecked()) {
-                            action->trigger();
-                        }
-                    }
-                }
-                break;
-
-            case Qt::Key_G:
-                if (isShifted && isControlOrCommand && isOption && isMetaOrMacControl) {
-                    static const QString HIFI_FRAMES_FOLDER_VAR = "HIFI_FRAMES_FOLDER";
-                    static const QString GPU_FRAME_FOLDER = QProcessEnvironment::systemEnvironment().contains(HIFI_FRAMES_FOLDER_VAR)
-                        ? QProcessEnvironment::systemEnvironment().value(HIFI_FRAMES_FOLDER_VAR)
-                        : "hifiFrames";
-                    static QString GPU_FRAME_TEMPLATE = GPU_FRAME_FOLDER + "/{DATE}_{TIME}";
-                    QString fullPath = FileUtils::computeDocumentPath(FileUtils::replaceDateTimeTokens(GPU_FRAME_TEMPLATE));
-                    if (FileUtils::canCreateFile(fullPath)) {
-                        getActiveDisplayPlugin()->captureFrame(fullPath.toStdString());
-                    }
-                }
-                break;
-            case Qt::Key_X:
-                if (isShifted && isControlOrCommand) {
-                    auto offscreenUi = getOffscreenUI();
-                    offscreenUi->togglePinned();
-                    //offscreenUi->getSurfaceContext()->engine()->clearComponentCache();
-                    //OffscreenUi::information("Debugging", "Component cache cleared");
-                    // placeholder for dialogs being converted to QML.
-                }
-                break;
-
-            case Qt::Key_Y:
-                if (isShifted && isControlOrCommand) {
-                    getActiveDisplayPlugin()->cycleDebugOutput();
-                }
-                break;
-
-            case Qt::Key_B:
-                if (isOption) {
-                    controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
-                    inputRecorder->stopPlayback();
-                }
-                break;
-
-            case Qt::Key_L:
-                if (isShifted && isControlOrCommand) {
-                    Menu::getInstance()->triggerOption(MenuOption::Log);
-                } else if (isControlOrCommand) {
-                    auto dialogsManager = DependencyManager::get<DialogsManager>();
-                    dialogsManager->toggleAddressBar();
-                }
-                break;
-
-            case Qt::Key_R:
-                if (isControlOrCommand && !event->isAutoRepeat()) {
-                    DependencyManager::get<ScriptEngines>()->reloadAllScripts();
-                    getOffscreenUI()->clearCache();
-                }
-                break;
-
-            case Qt::Key_Asterisk:
-                Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox);
-                break;
-
-            case Qt::Key_M:
-                if (isControlOrCommand) {
-                    auto audioClient = DependencyManager::get<AudioClient>();
-                    audioClient->setMuted(!audioClient->isMuted());
-                    QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
-                    if (audioScriptingInterface && audioScriptingInterface->getPTT()) {
-                       audioScriptingInterface->setPushingToTalk(!audioClient->isMuted());
-                    }
-                }
-                break;
-
-            case Qt::Key_S:
-                if (isShifted && isControlOrCommand && !isOption) {
-                    Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings);
-                }
-                break;
-
-            case Qt::Key_Apostrophe: {
-                if (isControlOrCommand) {
-                    auto cursor = Cursor::Manager::instance().getCursor();
-                    auto curIcon = cursor->getIcon();
-                    if (curIcon == Cursor::Icon::DEFAULT) {
-                        showCursor(Cursor::Icon::RETICLE);
-                    } else if (curIcon == Cursor::Icon::RETICLE) {
-                        showCursor(Cursor::Icon::SYSTEM);
-                    } else if (curIcon == Cursor::Icon::SYSTEM) {
-                        showCursor(Cursor::Icon::LINK);
-                    } else {
-                        showCursor(Cursor::Icon::DEFAULT);
-                    }
-                } else if (!event->isAutoRepeat()){
-                    resetSensors(true);
-                }
-                break;
-            }
-
-            case Qt::Key_Backslash:
-                Menu::getInstance()->triggerOption(MenuOption::Chat);
-                break;
-
-            case Qt::Key_Slash:
-                Menu::getInstance()->triggerOption(MenuOption::Stats);
-                break;
-
-            case Qt::Key_Plus: {
-                if (isControlOrCommand && event->modifiers().testFlag(Qt::KeypadModifier)) {
-                    auto& cursorManager = Cursor::Manager::instance();
-                    cursorManager.setScale(cursorManager.getScale() * 1.1f);
-                } else {
-                    getMyAvatar()->increaseSize();
-                }
-                break;
-            }
-
-            case Qt::Key_Minus: {
-                if (isControlOrCommand && event->modifiers().testFlag(Qt::KeypadModifier)) {
-                    auto& cursorManager = Cursor::Manager::instance();
-                    cursorManager.setScale(cursorManager.getScale() / 1.1f);
-                } else {
-                    getMyAvatar()->decreaseSize();
-                }
-                break;
+        // we haven't yet enabled physics.  we wait until we think we have all the collision information
+        // for nearby entities before starting bullet up.
+        if (isServerlessMode()) {
+            tryToEnablePhysics();
+        } else if (_failedToConnectToEntityServer) {
+            if (_octreeProcessor->safeLandingIsActive()) {
+                _octreeProcessor->stopSafeLanding();
             }
-
-            case Qt::Key_Equal:
-                getMyAvatar()->resetSize();
-                break;
-            case Qt::Key_Escape: {
-                getActiveDisplayPlugin()->abandonCalibration();
-                break;
+        } else {
+            _octreeProcessor->updateSafeLanding();
+            if (_octreeProcessor->safeLandingIsComplete()) {
+                tryToEnablePhysics();
             }
-
-            default:
-                event->ignore();
-                break;
         }
-    }
-}
-
-void Application::keyReleaseEvent(QKeyEvent* event) {
-    if (!event->isAutoRepeat()) {
-        _keysPressed.remove(event->key());
-    }
-
-#if defined(Q_OS_ANDROID)
-    if (event->key() == Qt::Key_Back) {
-        event->accept();
-        AndroidHelper::instance().requestActivity("Home", false);
-    }
-#endif
-    _controllerScriptingInterface->emitKeyReleaseEvent(event); // send events to any registered scripts
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isKeyCaptured(event)) {
-        return;
+    } else if (_domainLoadingInProgress) {
+        _domainLoadingInProgress = false;
+        PROFILE_ASYNC_END(app, "Scene Loading", "");
     }
 
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->keyReleaseEvent(event);
+     if (shouldCaptureMouse()) {
+        QPoint point = _glWidget->mapToGlobal(_glWidget->geometry().center());
+        if (QCursor::pos() != point) {
+            _mouseCaptureTarget = point;
+            _ignoreMouseMove = true;
+            if (_captureMouse) {
+                _keyboardMouseDevice->updateMousePositionForCapture(QCursor::pos(), _mouseCaptureTarget);
+            }
+            QCursor::setPos(point);
+        }
     }
 
-}
+    auto myAvatar = getMyAvatar();
+    {
+        PerformanceTimer perfTimer("devices");
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
 
-void Application::focusOutEvent(QFocusEvent* event) {
-    const auto& inputPlugins = PluginManager::getInstance()->getInputPlugins();
-    for(const auto& inputPlugin : inputPlugins) {
-        if (inputPlugin->isActive()) {
-            inputPlugin->pluginFocusOutEvent();
+        controller::HmdAvatarAlignmentType hmdAvatarAlignmentType;
+        if (myAvatar->getHmdAvatarAlignmentType() == "eyes") {
+            hmdAvatarAlignmentType = controller::HmdAvatarAlignmentType::Eyes;
+        } else {
+            hmdAvatarAlignmentType = controller::HmdAvatarAlignmentType::Head;
         }
-    }
-// FIXME spacemouse code still needs cleanup
-#if 0
-    //SpacemouseDevice::getInstance().focusOutEvent();
-    //SpacemouseManager::getInstance().getDevice()->focusOutEvent();
-    SpacemouseManager::getInstance().ManagerFocusOutEvent();
-#endif
-
-    synthesizeKeyReleasEvents();
-}
 
-void Application::synthesizeKeyReleasEvents() {
-    // synthesize events for keys currently pressed, since we may not get their release events
-    // Because our key event handlers may manipulate _keysPressed, lets swap the keys pressed into a local copy,
-    // clearing the existing list.
-    QHash<int, QKeyEvent> keysPressed;
-    std::swap(keysPressed, _keysPressed);
-    for (auto& ev : keysPressed) {
-        QKeyEvent synthesizedEvent { QKeyEvent::KeyRelease, ev.key(), Qt::NoModifier, ev.text() };
-        keyReleaseEvent(&synthesizedEvent);
-    }
-}
+        controller::InputCalibrationData calibrationData = {
+            myAvatar->getSensorToWorldMatrix(),
+            createMatFromQuatAndPos(myAvatar->getWorldOrientation(), myAvatar->getWorldPosition()),
+            myAvatar->getHMDSensorMatrix(),
+            myAvatar->getCenterEyeCalibrationMat(),
+            myAvatar->getHeadCalibrationMat(),
+            myAvatar->getSpine2CalibrationMat(),
+            myAvatar->getHipsCalibrationMat(),
+            myAvatar->getLeftFootCalibrationMat(),
+            myAvatar->getRightFootCalibrationMat(),
+            myAvatar->getRightArmCalibrationMat(),
+            myAvatar->getLeftArmCalibrationMat(),
+            myAvatar->getRightHandCalibrationMat(),
+            myAvatar->getLeftHandCalibrationMat(),
+            hmdAvatarAlignmentType
+        };
 
-void Application::maybeToggleMenuVisible(QMouseEvent* event) const {
-#ifndef Q_OS_MAC
-    // If in full screen, and our main windows menu bar is hidden, and we're close to the top of the QMainWindow
-    // then show the menubar.
-    if (_window->isFullScreen()) {
-        QMenuBar* menuBar = _window->menuBar();
-        if (menuBar) {
-            static const int MENU_TOGGLE_AREA = 10;
-            if (!menuBar->isVisible()) {
-                if (event->pos().y() <= MENU_TOGGLE_AREA) {
-                    menuBar->setVisible(true);
-                }
-            }  else {
-                if (event->pos().y() > MENU_TOGGLE_AREA) {
-                    menuBar->setVisible(false);
-                }
+        InputPluginPointer keyboardMousePlugin;
+        for(const auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
+            if (inputPlugin->getName() == KeyboardMouseDevice::NAME) {
+                keyboardMousePlugin = inputPlugin;
+            } else if (inputPlugin->isActive()) {
+                inputPlugin->pluginUpdate(deltaTime, calibrationData);
             }
         }
-    }
-#endif
-}
 
-void Application::mouseMoveEvent(QMouseEvent* event) {
-    PROFILE_RANGE(app_input_mouse, __FUNCTION__);
-
-    if (_ignoreMouseMove) {
-        _ignoreMouseMove = false;
-        return;
-    }
-
-    maybeToggleMenuVisible(event);
-
-    auto& compositor = getApplicationCompositor();
-    // if this is a real mouse event, and we're in HMD mode, then we should use it to move the
-    // compositor reticle
-    // handleRealMouseMoveEvent() will return true, if we shouldn't process the event further
-    if (!compositor.fakeEventActive() && compositor.handleRealMouseMoveEvent()) {
-        return; // bail
-    }
+        userInputMapper->setInputCalibrationData(calibrationData);
+        userInputMapper->update(deltaTime);
 
-#if !defined(DISABLE_QML)
-    auto offscreenUi = getOffscreenUI();
-    auto eventPosition = compositor.getMouseEventPosition(event);
-    QPointF transformedPos = offscreenUi ? offscreenUi->mapToVirtualScreen(eventPosition) : QPointF();
-#else
-    QPointF transformedPos;
-#endif
-    auto button = event->button();
-    auto buttons = event->buttons();
-    // Determine if the ReticleClick Action is 1 and if so, fake include the LeftMouseButton
-    if (_reticleClickPressed) {
-        if (button == Qt::NoButton) {
-            button = Qt::LeftButton;
+        if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {
+            keyboardMousePlugin->pluginUpdate(deltaTime, calibrationData);
         }
-        buttons |= Qt::LeftButton;
-    }
-
-    QMouseEvent mappedEvent(event->type(),
-        transformedPos,
-        event->screenPos(), button,
-        buttons, event->modifiers());
-
-    if (compositor.getReticleVisible() || !isHMDMode() || !compositor.getReticleOverDesktop() ||
-        getOverlays().getOverlayAtPoint(glm::vec2(transformedPos.x(), transformedPos.y())) != UNKNOWN_ENTITY_ID) {
-        getEntities()->mouseMoveEvent(&mappedEvent);
-    }
-
-    _controllerScriptingInterface->emitMouseMoveEvent(&mappedEvent); // send events to any registered scripts
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isMouseCaptured()) {
-        return;
-    }
-
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->mouseMoveEvent(event, _captureMouse, _mouseCaptureTarget);
-    }
-}
-
-void Application::mousePressEvent(QMouseEvent* event) {
-    // Inhibit the menu if the user is using alt-mouse dragging
-    _altPressed = false;
-
-#if !defined(DISABLE_QML)
-    auto offscreenUi = getOffscreenUI();
-    // If we get a mouse press event it means it wasn't consumed by the offscreen UI,
-    // hence, we should defocus all of the offscreen UI windows, in order to allow
-    // keyboard shortcuts not to be swallowed by them.  In particular, WebEngineViews
-    // will consume all keyboard events.
-    offscreenUi->unfocusWindows();
-
-    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
-    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition);
-#else
-    QPointF transformedPos;
-#endif
-
-    QMouseEvent mappedEvent(event->type(), transformedPos, event->screenPos(), event->button(), event->buttons(), event->modifiers());
-    QUuid result = getEntities()->mousePressEvent(&mappedEvent);
-    setKeyboardFocusEntity(getEntities()->wantsKeyboardFocus(result) ? result : UNKNOWN_ENTITY_ID);
-
-    _controllerScriptingInterface->emitMousePressEvent(&mappedEvent); // send events to any registered scripts
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isMouseCaptured()) {
-        return;
-    }
-
-#if defined(Q_OS_MAC)
-    // Fix for OSX right click dragging on window when coming from a native window
-    bool isFocussed = hasFocus();
-    if (!isFocussed && event->button() == Qt::MouseButton::RightButton) {
-        setFocus();
-        isFocussed = true;
-    }
-
-    if (isFocussed) {
-#else
-    if (hasFocus()) {
-#endif
-        if (_keyboardMouseDevice->isActive()) {
-            _keyboardMouseDevice->mousePressEvent(event);
-        }
-    }
-}
-
-void Application::mouseDoublePressEvent(QMouseEvent* event) {
-#if !defined(DISABLE_QML)
-    auto offscreenUi = getOffscreenUI();
-    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
-    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition);
-#else
-    QPointF transformedPos;
-#endif
-    QMouseEvent mappedEvent(event->type(),
-        transformedPos,
-        event->screenPos(), event->button(),
-        event->buttons(), event->modifiers());
-    getEntities()->mouseDoublePressEvent(&mappedEvent);
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isMouseCaptured()) {
-        return;
-    }
-
-    _controllerScriptingInterface->emitMouseDoublePressEvent(event);
-}
-
-void Application::mouseReleaseEvent(QMouseEvent* event) {
-
-#if !defined(DISABLE_QML)
-    auto offscreenUi = getOffscreenUI();
-    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
-    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition);
-#else
-    QPointF transformedPos;
-#endif
-    QMouseEvent mappedEvent(event->type(),
-        transformedPos,
-        event->screenPos(), event->button(),
-        event->buttons(), event->modifiers());
-
-    getEntities()->mouseReleaseEvent(&mappedEvent);
-
-    _controllerScriptingInterface->emitMouseReleaseEvent(&mappedEvent); // send events to any registered scripts
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isMouseCaptured()) {
-        return;
-    }
-
-    if (hasFocus()) {
-        if (_keyboardMouseDevice->isActive()) {
-            _keyboardMouseDevice->mouseReleaseEvent(event);
-        }
-    }
-}
-
-void Application::touchUpdateEvent(QTouchEvent* event) {
-    _altPressed = false;
-
-    if (event->type() == QEvent::TouchUpdate) {
-        TouchEvent thisEvent(*event, _lastTouchEvent);
-        _controllerScriptingInterface->emitTouchUpdateEvent(thisEvent); // send events to any registered scripts
-        _lastTouchEvent = thisEvent;
-    }
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isTouchCaptured()) {
-        return;
-    }
-
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->touchUpdateEvent(event);
-    }
-    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
-        _touchscreenDevice->touchUpdateEvent(event);
-    }
-    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
-        _touchscreenVirtualPadDevice->touchUpdateEvent(event);
-    }
-}
-
-void Application::touchBeginEvent(QTouchEvent* event) {
-    _altPressed = false;
-    TouchEvent thisEvent(*event); // on touch begin, we don't compare to last event
-    _controllerScriptingInterface->emitTouchBeginEvent(thisEvent); // send events to any registered scripts
-
-    _lastTouchEvent = thisEvent; // and we reset our last event to this event before we call our update
-    touchUpdateEvent(event);
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isTouchCaptured()) {
-        return;
-    }
-
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->touchBeginEvent(event);
-    }
-    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
-        _touchscreenDevice->touchBeginEvent(event);
-    }
-    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
-        _touchscreenVirtualPadDevice->touchBeginEvent(event);
-    }
-
-}
-
-void Application::touchEndEvent(QTouchEvent* event) {
-    _altPressed = false;
-    TouchEvent thisEvent(*event, _lastTouchEvent);
-    _controllerScriptingInterface->emitTouchEndEvent(thisEvent); // send events to any registered scripts
-    _lastTouchEvent = thisEvent;
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isTouchCaptured()) {
-        return;
-    }
-
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->touchEndEvent(event);
-    }
-    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
-        _touchscreenDevice->touchEndEvent(event);
-    }
-    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
-        _touchscreenVirtualPadDevice->touchEndEvent(event);
-    }
-    // put any application specific touch behavior below here..
-}
-
-void Application::touchGestureEvent(QGestureEvent* event) {
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->touchGestureEvent(event);
-    }
-    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
-        _touchscreenDevice->touchGestureEvent(event);
-    }
-    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
-        _touchscreenVirtualPadDevice->touchGestureEvent(event);
-    }
-}
-
-void Application::wheelEvent(QWheelEvent* event) const {
-    _altPressed = false;
-    _controllerScriptingInterface->emitWheelEvent(event); // send events to any registered scripts
-
-    // if one of our scripts have asked to capture this event, then stop processing it
-    if (_controllerScriptingInterface->isWheelCaptured() || getLoginDialogPoppedUp()) {
-        return;
-    }
-
-    if (_keyboardMouseDevice->isActive()) {
-        _keyboardMouseDevice->wheelEvent(event);
-    }
-}
-
-void Application::dropEvent(QDropEvent *event) {
-    const QMimeData* mimeData = event->mimeData();
-    for (auto& url : mimeData->urls()) {
-        QString urlString = url.toString();
-        if (acceptURL(urlString, true)) {
-            event->acceptProposedAction();
-        }
-    }
-}
-
-void Application::dragEnterEvent(QDragEnterEvent* event) {
-    event->acceptProposedAction();
-}
-
-// This is currently not used, but could be invoked if the user wants to go to the place embedded in an
-// Interface-taken snapshot. (It was developed for drag and drop, before we had asset-server loading or in-world browsers.)
-bool Application::acceptSnapshot(const QString& urlString) {
-    QUrl url(urlString);
-    QString snapshotPath = url.toLocalFile();
-
-    SnapshotMetaData* snapshotData = DependencyManager::get<Snapshot>()->parseSnapshotData(snapshotPath);
-    if (snapshotData) {
-        if (!snapshotData->getURL().toString().isEmpty()) {
-            DependencyManager::get<AddressManager>()->handleLookupString(snapshotData->getURL().toString());
-        }
-    } else {
-        OffscreenUi::asyncWarning("", "No location details were found in the file\n" +
-                             snapshotPath + "\nTry dragging in an authentic Hifi snapshot.");
-    }
-    return true;
-}
-
-#ifdef Q_OS_WIN
-#include <Windows.h>
-#include <TCHAR.h>
-#include <pdh.h>
-#pragma comment(lib, "pdh.lib")
-#pragma comment(lib, "ntdll.lib")
-
-extern "C" {
-    enum SYSTEM_INFORMATION_CLASS {
-        SystemBasicInformation = 0,
-        SystemProcessorPerformanceInformation = 8,
-    };
-
-    struct SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
-        LARGE_INTEGER IdleTime;
-        LARGE_INTEGER KernelTime;
-        LARGE_INTEGER UserTime;
-        LARGE_INTEGER DpcTime;
-        LARGE_INTEGER InterruptTime;
-        ULONG InterruptCount;
-    };
-
-    struct SYSTEM_BASIC_INFORMATION {
-        ULONG Reserved;
-        ULONG TimerResolution;
-        ULONG PageSize;
-        ULONG NumberOfPhysicalPages;
-        ULONG LowestPhysicalPageNumber;
-        ULONG HighestPhysicalPageNumber;
-        ULONG AllocationGranularity;
-        ULONG_PTR MinimumUserModeAddress;
-        ULONG_PTR MaximumUserModeAddress;
-        ULONG_PTR ActiveProcessorsAffinityMask;
-        CCHAR NumberOfProcessors;
-    };
-
-    NTSYSCALLAPI LONG NTAPI NtQuerySystemInformation(
-        _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass,
-        _Out_writes_bytes_opt_(SystemInformationLength) PVOID SystemInformation,
-        _In_ ULONG SystemInformationLength,
-        _Out_opt_ PULONG ReturnLength
-    );
-
-}
-template <typename T>
-LONG NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, T& t) {
-    return NtQuerySystemInformation(SystemInformationClass, &t, (ULONG)sizeof(T), nullptr);
-}
-
-template <typename T>
-LONG NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, std::vector<T>& t) {
-    return NtQuerySystemInformation(SystemInformationClass, t.data(), (ULONG)(sizeof(T) * t.size()), nullptr);
-}
-
-
-template <typename T>
-void updateValueAndDelta(std::pair<T, T>& pair, T newValue) {
-    auto& value = pair.first;
-    auto& delta = pair.second;
-    delta = (value != 0) ? newValue - value : 0;
-    value = newValue;
-}
-
-struct MyCpuInfo {
-    using ValueAndDelta = std::pair<LONGLONG, LONGLONG>;
-    std::string name;
-    ValueAndDelta kernel { 0, 0 };
-    ValueAndDelta user { 0, 0 };
-    ValueAndDelta idle { 0, 0 };
-    float kernelUsage { 0.0f };
-    float userUsage { 0.0f };
-
-    void update(const SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION& cpuInfo) {
-        updateValueAndDelta(kernel, cpuInfo.KernelTime.QuadPart);
-        updateValueAndDelta(user, cpuInfo.UserTime.QuadPart);
-        updateValueAndDelta(idle, cpuInfo.IdleTime.QuadPart);
-        auto totalTime = kernel.second + user.second + idle.second;
-        if (totalTime != 0) {
-            kernelUsage = (FLOAT)kernel.second / totalTime;
-            userUsage = (FLOAT)user.second / totalTime;
-        } else {
-            kernelUsage = userUsage = 0.0f;
-        }
-    }
-};
-
-void updateCpuInformation() {
-    static std::once_flag once;
-    static SYSTEM_BASIC_INFORMATION systemInfo {};
-    static SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION cpuTotals;
-    static std::vector<SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION> cpuInfos;
-    static std::vector<MyCpuInfo> myCpuInfos;
-    static MyCpuInfo myCpuTotals;
-    std::call_once(once, [&] {
-        NtQuerySystemInformation( SystemBasicInformation, systemInfo);
-        cpuInfos.resize(systemInfo.NumberOfProcessors);
-        myCpuInfos.resize(systemInfo.NumberOfProcessors);
-        for (size_t i = 0; i < systemInfo.NumberOfProcessors; ++i) {
-            myCpuInfos[i].name = "cpu." + std::to_string(i);
-        }
-        myCpuTotals.name = "cpu.total";
-    });
-    NtQuerySystemInformation(SystemProcessorPerformanceInformation, cpuInfos);
-
-    // Zero the CPU totals.
-    memset(&cpuTotals, 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
-    for (size_t i = 0; i < systemInfo.NumberOfProcessors; ++i) {
-        auto& cpuInfo = cpuInfos[i];
-        // KernelTime includes IdleTime.
-        cpuInfo.KernelTime.QuadPart -= cpuInfo.IdleTime.QuadPart;
-
-        // Update totals
-        cpuTotals.IdleTime.QuadPart += cpuInfo.IdleTime.QuadPart;
-        cpuTotals.KernelTime.QuadPart += cpuInfo.KernelTime.QuadPart;
-        cpuTotals.UserTime.QuadPart += cpuInfo.UserTime.QuadPart;
-
-        // Update friendly structure
-        auto& myCpuInfo = myCpuInfos[i];
-        myCpuInfo.update(cpuInfo);
-        PROFILE_COUNTER(app, myCpuInfo.name.c_str(), {
-            { "kernel", myCpuInfo.kernelUsage },
-            { "user", myCpuInfo.userUsage }
-        });
-    }
-
-    myCpuTotals.update(cpuTotals);
-    PROFILE_COUNTER(app, myCpuTotals.name.c_str(), {
-        { "kernel", myCpuTotals.kernelUsage },
-        { "user", myCpuTotals.userUsage }
-    });
-}
-
-
-static ULARGE_INTEGER lastCPU, lastSysCPU, lastUserCPU;
-static int numProcessors;
-static HANDLE self;
-static PDH_HQUERY cpuQuery;
-static PDH_HCOUNTER cpuTotal;
-
-void initCpuUsage() {
-    SYSTEM_INFO sysInfo;
-    FILETIME ftime, fsys, fuser;
-
-    GetSystemInfo(&sysInfo);
-    numProcessors = sysInfo.dwNumberOfProcessors;
-
-    GetSystemTimeAsFileTime(&ftime);
-    memcpy(&lastCPU, &ftime, sizeof(FILETIME));
-
-    self = GetCurrentProcess();
-    GetProcessTimes(self, &ftime, &ftime, &fsys, &fuser);
-    memcpy(&lastSysCPU, &fsys, sizeof(FILETIME));
-    memcpy(&lastUserCPU, &fuser, sizeof(FILETIME));
-
-    PdhOpenQuery(NULL, NULL, &cpuQuery);
-    PdhAddCounter(cpuQuery, "\\Processor(_Total)\\% Processor Time", NULL, &cpuTotal);
-    PdhCollectQueryData(cpuQuery);
-}
-
-void getCpuUsage(vec3& systemAndUser) {
-    FILETIME ftime, fsys, fuser;
-    ULARGE_INTEGER now, sys, user;
-
-    GetSystemTimeAsFileTime(&ftime);
-    memcpy(&now, &ftime, sizeof(FILETIME));
-
-    GetProcessTimes(self, &ftime, &ftime, &fsys, &fuser);
-    memcpy(&sys, &fsys, sizeof(FILETIME));
-    memcpy(&user, &fuser, sizeof(FILETIME));
-    systemAndUser.x = (sys.QuadPart - lastSysCPU.QuadPart);
-    systemAndUser.y = (user.QuadPart - lastUserCPU.QuadPart);
-    systemAndUser /= (float)(now.QuadPart - lastCPU.QuadPart);
-    systemAndUser /= (float)numProcessors;
-    systemAndUser *= 100.0f;
-    lastCPU = now;
-    lastUserCPU = user;
-    lastSysCPU = sys;
-
-    PDH_FMT_COUNTERVALUE counterVal;
-    PdhCollectQueryData(cpuQuery);
-    PdhGetFormattedCounterValue(cpuTotal, PDH_FMT_DOUBLE, NULL, &counterVal);
-    systemAndUser.z = (float)counterVal.doubleValue;
-}
-
-void setupCpuMonitorThread() {
-    initCpuUsage();
-    auto cpuMonitorThread = QThread::currentThread();
-    setThreadName("CPU Monitor Thread");
-
-    QTimer* timer = new QTimer();
-    timer->setInterval(50);
-    QObject::connect(timer, &QTimer::timeout, [] {
-        updateCpuInformation();
-        vec3 kernelUserAndSystem;
-        getCpuUsage(kernelUserAndSystem);
-        PROFILE_COUNTER(app, "cpuProcess", { { "system", kernelUserAndSystem.x }, { "user", kernelUserAndSystem.y } });
-        PROFILE_COUNTER(app, "cpuSystem", { { "system", kernelUserAndSystem.z } });
-    });
-    QObject::connect(cpuMonitorThread, &QThread::finished, [=] {
-        timer->deleteLater();
-        cpuMonitorThread->deleteLater();
-    });
-    timer->start();
-}
-
-#endif
-
-void Application::idle() {
-    PerformanceTimer perfTimer("idle");
-
-#if !defined(DISABLE_QML)
-    auto offscreenUi = getOffscreenUI();
-
-    // These tasks need to be done on our first idle, because we don't want the showing of
-    // overlay subwindows to do a showDesktop() until after the first time through
-    static bool firstIdle = true;
-    if (firstIdle) {
-        firstIdle = false;
-        connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop);
-    }
-#endif
-
-#ifdef Q_OS_WIN
-    // If tracing is enabled then monitor the CPU in a separate thread
-    static std::once_flag once;
-    std::call_once(once, [&] {
-        if (trace_app().isDebugEnabled()) {
-            QThread* cpuMonitorThread = new QThread(qApp);
-            cpuMonitorThread->setObjectName("cpuMonitorThread");
-            QObject::connect(cpuMonitorThread, &QThread::started, [this] { setupCpuMonitorThread(); });
-            QObject::connect(qApp, &QCoreApplication::aboutToQuit, cpuMonitorThread, &QThread::quit);
-            cpuMonitorThread->start();
-        }
-    });
-#endif
-
-    auto displayPlugin = getActiveDisplayPlugin();
-#if !defined(DISABLE_QML)
-    if (displayPlugin) {
-        auto uiSize = displayPlugin->getRecommendedUiSize();
-        // Bit of a hack since there's no device pixel ratio change event I can find.
-        if (offscreenUi->size() != fromGlm(uiSize)) {
-            qCDebug(interfaceapp) << "Device pixel ratio changed, triggering resize to " << uiSize;
-            offscreenUi->resize(fromGlm(uiSize));
-        }
-    }
-#endif
-
-    if (displayPlugin) {
-        PROFILE_COUNTER_IF_CHANGED(app, "present", float, displayPlugin->presentRate());
-    }
-    PROFILE_COUNTER_IF_CHANGED(app, "renderLoopRate", float, getRenderLoopRate());
-    PROFILE_COUNTER_IF_CHANGED(app, "currentDownloads", uint32_t, ResourceCache::getLoadingRequests().length());
-    PROFILE_COUNTER_IF_CHANGED(app, "pendingDownloads", uint32_t, ResourceCache::getPendingRequestCount());
-    PROFILE_COUNTER_IF_CHANGED(app, "currentProcessing", int, DependencyManager::get<StatTracker>()->getStat("Processing").toInt());
-    PROFILE_COUNTER_IF_CHANGED(app, "pendingProcessing", int, DependencyManager::get<StatTracker>()->getStat("PendingProcessing").toInt());
-    auto renderConfig = _graphicsEngine->getRenderEngine()->getConfiguration();
-    PROFILE_COUNTER_IF_CHANGED(render, "gpuTime", float, (float)_graphicsEngine->getGPUContext()->getFrameTimerGPUAverage());
-
-    PROFILE_RANGE(app, __FUNCTION__);
-
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        steamClient->runCallbacks();
-    }
-
-    if (auto oculusPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
-        oculusPlugin->handleOVREvents();
-    }
-
-    float secondsSinceLastUpdate = (float)_lastTimeUpdated.nsecsElapsed() / NSECS_PER_MSEC / MSECS_PER_SECOND;
-    _lastTimeUpdated.start();
-
-#if !defined(DISABLE_QML)
-    // If the offscreen Ui has something active that is NOT the root, then assume it has keyboard focus.
-    if (offscreenUi && offscreenUi->getWindow()) {
-        auto activeFocusItem = offscreenUi->getWindow()->activeFocusItem();
-        if (_keyboardDeviceHasFocus && (activeFocusItem != NULL && activeFocusItem != offscreenUi->getRootItem())) {
-            _keyboardMouseDevice->pluginFocusOutEvent();
-            _keyboardDeviceHasFocus = false;
-            synthesizeKeyReleasEvents();
-        } else if (activeFocusItem == offscreenUi->getRootItem()) {
-            _keyboardDeviceHasFocus = true;
-        }
-    }
-#endif
-
-    checkChangeCursor();
-
-#if !defined(DISABLE_QML)
-    auto stats = Stats::getInstance();
-    if (stats) {
-        stats->updateStats();
-    }
-    auto animStats = AnimStats::getInstance();
-    if (animStats) {
-        animStats->updateStats();
-    }
-#endif
-
-    // 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.
-#ifdef Q_OS_ANDROID
-    bool showWarnings = false;
-#else
-    bool showWarnings = getLogger()->extraDebugging();
-#endif
-    PerformanceWarning warn(showWarnings, "idle()");
-
-    {
-        _gameWorkload.updateViews(_viewFrustum, getMyAvatar()->getHeadPosition());
-        _gameWorkload._engine->run();
-    }
-    {
-        PerformanceTimer perfTimer("update");
-        PerformanceWarning warn(showWarnings, "Application::idle()... update()");
-        static const float BIGGEST_DELTA_TIME_SECS = 0.25f;
-        update(glm::clamp(secondsSinceLastUpdate, 0.0f, BIGGEST_DELTA_TIME_SECS));
-    }
-
-    { // Update keyboard focus highlight
-        if (!_keyboardFocusedEntity.get().isInvalidID()) {
-            const quint64 LOSE_FOCUS_AFTER_ELAPSED_TIME = 30 * USECS_PER_SECOND; // if idle for 30 seconds, drop focus
-            quint64 elapsedSinceAcceptedKeyPress = usecTimestampNow() - _lastAcceptedKeyPress;
-            if (elapsedSinceAcceptedKeyPress > LOSE_FOCUS_AFTER_ELAPSED_TIME) {
-                setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-            } else {
-                if (auto entity = getEntities()->getTree()->findEntityByID(_keyboardFocusedEntity.get())) {
-                    EntityItemProperties properties;
-                    properties.setPosition(entity->getWorldPosition());
-                    properties.setRotation(entity->getWorldOrientation());
-                    properties.setDimensions(entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR);
-                    DependencyManager::get<EntityScriptingInterface>()->editEntity(_keyboardFocusHighlightID, properties);
-                }
-            }
-        }
-    }
-
-    {
-        if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_keyboardFocusedEntity.get())) {
-            QUuid entityId = _keyboardFocusedEntity.get();
-            setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
-            _keyboardFocusWaitingOnRenderable = false;
-            setKeyboardFocusEntity(entityId);
-        }
-    }
-
-    {
-        PerformanceTimer perfTimer("pluginIdle");
-        PerformanceWarning warn(showWarnings, "Application::idle()... pluginIdle()");
-        getActiveDisplayPlugin()->idle();
-        const auto& inputPlugins = PluginManager::getInstance()->getInputPlugins();
-        for(const auto& inputPlugin : inputPlugins) {
-            if (inputPlugin->isActive()) {
-                inputPlugin->idle();
-            }
-        }
-    }
-    {
-        PerformanceTimer perfTimer("rest");
-        PerformanceWarning warn(showWarnings, "Application::idle()... rest of it");
-        _idleLoopStdev.addValue(secondsSinceLastUpdate);
-
-        //  Record standard deviation and reset counter if needed
-        const int STDEV_SAMPLES = 500;
-        if (_idleLoopStdev.getSamples() > STDEV_SAMPLES) {
-            _idleLoopMeasuredJitter = _idleLoopStdev.getStDev();
-            _idleLoopStdev.reset();
-        }
-    }
-
-    _overlayConductor.update(secondsSinceLastUpdate);
-
-    _gameLoopCounter.increment();
-}
-
-ivec2 Application::getMouse() const {
-    return getApplicationCompositor().getReticlePosition();
-}
-
-bool Application::exportEntities(const QString& filename,
-                                 const QVector<QUuid>& entityIDs,
-                                 const glm::vec3* givenOffset) {
-    QHash<EntityItemID, EntityItemPointer> entities;
-
-    auto nodeList = DependencyManager::get<NodeList>();
-    const QUuid myAvatarID = nodeList->getSessionUUID();
-
-    auto entityTree = getEntities()->getTree();
-    auto exportTree = std::make_shared<EntityTree>();
-    exportTree->setMyAvatar(getMyAvatar());
-    exportTree->createRootElement();
-    glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE);
-    bool success = true;
-    entityTree->withReadLock([entityIDs, entityTree, givenOffset, myAvatarID, &root, &entities, &success, &exportTree] {
-        for (auto entityID : entityIDs) { // Gather entities and properties.
-            auto entityItem = entityTree->findEntityByEntityItemID(entityID);
-            if (!entityItem) {
-                qCWarning(interfaceapp) << "Skipping export of" << entityID << "that is not in scene.";
-                continue;
-            }
-
-            if (!givenOffset) {
-                EntityItemID parentID = entityItem->getParentID();
-                bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
-                if (!parentIsAvatar && (parentID.isInvalidID() ||
-                                        !entityIDs.contains(parentID) ||
-                                        !entityTree->findEntityByEntityItemID(parentID))) {
-                    // If parent wasn't selected, we want absolute position, which isn't in properties.
-                    auto position = entityItem->getWorldPosition();
-                    root.x = glm::min(root.x, position.x);
-                    root.y = glm::min(root.y, position.y);
-                    root.z = glm::min(root.z, position.z);
-                }
-            }
-            entities[entityID] = entityItem;
-        }
-
-        if (entities.size() == 0) {
-            success = false;
-            return;
-        }
-
-        if (givenOffset) {
-            root = *givenOffset;
-        }
-        for (EntityItemPointer& entityDatum : entities) {
-            auto properties = entityDatum->getProperties();
-            EntityItemID parentID = properties.getParentID();
-            bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
-            if (parentIsAvatar) {
-                properties.setParentID(AVATAR_SELF_ID);
-            } else {
-                if (parentID.isInvalidID()) {
-                    properties.setPosition(properties.getPosition() - root);
-                } else if (!entities.contains(parentID)) {
-                    entityDatum->globalizeProperties(properties, "Parent %3 of %2 %1 is not selected for export.", -root);
-                } // else valid parent -- don't offset
-            }
-            exportTree->addEntity(entityDatum->getEntityItemID(), properties);
-        }
-    });
-    if (success) {
-        success = exportTree->writeToJSONFile(filename.toLocal8Bit().constData());
-
-        // restore the main window's active state
-        _window->activateWindow();
-    }
-    return success;
-}
-
-bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
-    glm::vec3 center(x, y, z);
-    glm::vec3 minCorner = center - vec3(scale);
-    float cubeSize = scale * 2;
-    AACube boundingCube(minCorner, cubeSize);
-    QVector<QUuid> entities;
-    auto entityTree = getEntities()->getTree();
-    entityTree->withReadLock([&] {
-        entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities);
-    });
-    return exportEntities(filename, entities, &center);
-}
-
-void Application::loadSettings(const QCommandLineParser& parser) {
-
-    sessionRunTime.set(0); // Just clean living. We're about to saveSettings, which will update value.
-    DependencyManager::get<AudioClient>()->loadSettings();
-    DependencyManager::get<LODManager>()->loadSettings();
-
-    // DONT CHECK IN
-    //DependencyManager::get<LODManager>()->setAutomaticLODAdjust(false);
-
-    auto menu = Menu::getInstance();
-    menu->loadSettings();
-
-    // override the menu option show overlays to always be true on startup
-    menu->setIsOptionChecked(MenuOption::Overlays, true);
-
-    // If there is a preferred plugin, we probably messed it up with the menu settings, so fix it.
-    auto pluginManager = PluginManager::getInstance();
-    auto plugins = pluginManager->getPreferredDisplayPlugins();
-    if (plugins.size() > 0) {
-        for (auto plugin : plugins) {
-            if (auto action = menu->getActionForOption(plugin->getName())) {
-                action->setChecked(true);
-                action->trigger();
-                // Find and activated highest priority plugin, bail for the rest
-                break;
-            }
-        }
-    }
-
-    bool isFirstPerson = false;
-    if (parser.isSet("no-launcher")) {
-        const auto& displayPlugins = pluginManager->getDisplayPlugins();
-        for (const auto& plugin : displayPlugins) {
-            if (!plugin->isHmd()) {
-                if (auto action = menu->getActionForOption(plugin->getName())) {
-                    action->setChecked(true);
-                    action->trigger();
-                    break;
-                }
-            }
-        }
-        isFirstPerson = (qApp->isHMDMode());
-    } else {
-        if (_firstRun.get()) {
-            // If this is our first run, and no preferred devices were set, default to
-            // an HMD device if available.
-            const auto& displayPlugins = pluginManager->getDisplayPlugins();
-            for (const auto& plugin : displayPlugins) {
-                if (plugin->isHmd()) {
-                    if (auto action = menu->getActionForOption(plugin->getName())) {
-                        action->setChecked(true);
-                        action->trigger();
-                        break;
-                    }
-                }
-            }
-            isFirstPerson = (qApp->isHMDMode());
-        } else {
-            // if this is not the first run, the camera will be initialized differently depending on user settings
-            if (qApp->isHMDMode()) {
-                // if the HMD is active, use first-person camera, unless the appropriate setting is checked
-                isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonHMD);
-            } else {
-                // if HMD is not active, only use first person if the menu option is checked
-                isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonLookAt);
-            }
-        }
-    }
-
-    // Load settings of the RenderScritpingInterface
-    // Do that explicitely before being used
-    RenderScriptingInterface::getInstance()->loadSettings();
-
-    // Setup the PerformanceManager which will enforce the several settings to match the Preset
-    // On the first run, the Preset is evaluated from the
-    getPerformanceManager().setupPerformancePresetSettings(_firstRun.get());
-
-    // finish initializing the camera, based on everything we checked above. Third person camera will be used if no settings
-    // dictated that we should be in first person
-    Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, isFirstPerson);
-    Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !isFirstPerson);
-    _myCamera.setMode((isFirstPerson) ? CAMERA_MODE_FIRST_PERSON_LOOK_AT : CAMERA_MODE_LOOK_AT);
-    cameraMenuChanged();
-
-    const auto& inputs = pluginManager->getInputPlugins();
-    for (const auto& plugin : inputs) {
-        if (!plugin->isActive()) {
-            plugin->activate();
-        }
-    }
-
-    QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
-    if (audioScriptingInterface) {
-        audioScriptingInterface->loadData();
-    }
-
-    getMyAvatar()->loadData();
-
-    auto bucketEnum = QMetaEnum::fromType<ExternalResource::Bucket>();
-    auto externalResource = ExternalResource::getInstance();
-
-    for (int i = 0; i < bucketEnum.keyCount(); i++) {
-        const char* keyName = bucketEnum.key(i);
-        QString setting("ExternalResource/");
-        setting += keyName;
-        auto bucket = static_cast<ExternalResource::Bucket>(bucketEnum.keyToValue(keyName));
-        Setting::Handle<QString> url(setting, externalResource->getBase(bucket));
-        externalResource->setBase(bucket, url.get());
-    }
-
-    _settingsLoaded = true;
-}
-
-void Application::saveSettings() const {
-    sessionRunTime.set(_sessionRunTimer.elapsed() / MSECS_PER_SECOND);
-    DependencyManager::get<AudioClient>()->saveSettings();
-    DependencyManager::get<LODManager>()->saveSettings();
-
-    QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
-    if (audioScriptingInterface) {
-        audioScriptingInterface->saveData();
-    }
-
-    Menu::getInstance()->saveSettings();
-    getMyAvatar()->saveData();
-    PluginManager::getInstance()->saveSettings();
-
-    // Don't save external resource paths until such time as there's UI to select or set alternatives. Otherwise new default
-    // values won't be used unless Interface.json entries are manually remove or Interface.json is deleted.
-    /*
-    auto bucketEnum = QMetaEnum::fromType<ExternalResource::Bucket>();
-    auto externalResource = ExternalResource::getInstance();
-
-    for (int i = 0; i < bucketEnum.keyCount(); i++) {
-        const char* keyName = bucketEnum.key(i);
-        QString setting("ExternalResource/");
-        setting += keyName;
-        auto bucket = static_cast<ExternalResource::Bucket>(bucketEnum.keyToValue(keyName));
-        Setting::Handle<QString> url(setting, externalResource->getBase(bucket));
-        url.set(externalResource->getBase(bucket));
-    }
-    */
-}
-
-bool Application::importEntities(const QString& urlOrFilename, const bool isObservable, const qint64 callerId) {
-    bool success = false;
-    _entityClipboard->withWriteLock([&] {
-        _entityClipboard->eraseAllOctreeElements();
-
-        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON
-        // from the Web.
-        success = _entityClipboard->readFromURL(urlOrFilename, isObservable, callerId, true);
-        if (success) {
-            _entityClipboard->reaverageOctreeElements();
-        }
-    });
-    return success;
-}
-
-QVector<EntityItemID> Application::pasteEntities(const QString& entityHostType, float x, float y, float z) {
-    return _entityClipboard->sendEntities(_entityEditSender.get(), getEntities()->getTree(), entityHostType, x, y, z);
-}
-
-void Application::init() {
-    // Make sure Login state is up to date
-#if !defined(DISABLE_QML)
-    DependencyManager::get<DialogsManager>()->toggleLoginDialog();
-#endif
-    DependencyManager::get<AvatarManager>()->init();
-
-    _timerStart.start();
-    _lastTimeUpdated.start();
-
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        // when +connect_lobby in command line, join steam lobby
-        const QString STEAM_LOBBY_COMMAND_LINE_KEY = "+connect_lobby";
-        int lobbyIndex = arguments().indexOf(STEAM_LOBBY_COMMAND_LINE_KEY);
-        if (lobbyIndex != -1) {
-            QString lobbyId = arguments().value(lobbyIndex + 1);
-            steamClient->joinLobby(lobbyId);
-        }
-    }
-
-
-    qCDebug(interfaceapp) << "Loaded settings";
-
-    // fire off an immediate domain-server check in now that settings are loaded
-    QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "sendDomainServerCheckIn");
-
-    // This allows collision to be set up properly for shape entities supported by GeometryCache.
-    // This is before entity setup to ensure that it's ready for whenever instance collision is initialized.
-    ShapeEntityItem::setShapeInfoCalulator(ShapeEntityItem::ShapeInfoCalculator(&shapeInfoCalculator));
-
-    getEntities()->init();
-    getEntities()->setEntityLoadingPriorityFunction([this](const EntityItem& item) {
-        auto dims = item.getScaledDimensions();
-        auto maxSize = glm::compMax(dims);
-
-        if (maxSize <= 0.0f) {
-            return 0.0f;
-        }
-
-        auto distance = glm::distance(getMyAvatar()->getWorldPosition(), item.getWorldPosition());
-        return atan2(maxSize, distance);
-    });
-
-    ObjectMotionState::setShapeManager(&_shapeManager);
-    _physicsEngine->init();
-
-    EntityTreePointer tree = getEntities()->getTree();
-    _entitySimulation->init(tree, _physicsEngine, _entityEditSender.get());
-    tree->setSimulation(_entitySimulation);
-
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-
-    // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts
-    connect(_entitySimulation.get(), &PhysicalEntitySimulation::entityCollisionWithEntity,
-            getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity);
-
-    // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing
-    // of events related clicking, hovering over, and entering entities
-    getEntities()->connectSignalsToSlots(entityScriptingInterface.data());
-
-    // Make sure any new sounds are loaded as soon as know about them.
-    connect(tree.get(), &EntityTree::newCollisionSoundURL, this, [this](QUrl newURL, EntityItemID id) {
-        getEntities()->setCollisionSound(id, DependencyManager::get<SoundCache>()->getSound(newURL));
-    }, Qt::QueuedConnection);
-    connect(getMyAvatar().get(), &MyAvatar::newCollisionSoundURL, this, [this](QUrl newURL) {
-        if (auto avatar = getMyAvatar()) {
-            auto sound = DependencyManager::get<SoundCache>()->getSound(newURL);
-            avatar->setCollisionSound(sound);
-        }
-    }, Qt::QueuedConnection);
-
-    _gameWorkload.startup(getEntities()->getWorkloadSpace(), _graphicsEngine->getRenderScene(), _entitySimulation);
-    _entitySimulation->setWorkloadSpace(getEntities()->getWorkloadSpace());
-}
-
-void Application::pauseUntilLoginDetermined() {
-    if (QThread::currentThread() != qApp->thread()) {
-        QMetaObject::invokeMethod(this, "pauseUntilLoginDetermined");
-        return;
-    }
-
-    auto myAvatar = getMyAvatar();
-    _previousAvatarTargetScale = myAvatar->getTargetScale();
-    _previousAvatarSkeletonModel = myAvatar->getSkeletonModelURL().toString();
-    myAvatar->setTargetScale(1.0f);
-    myAvatar->setSkeletonModelURLFromScript(myAvatar->defaultFullAvatarModelUrl().toString());
-    myAvatar->setEnableMeshVisible(false);
-
-    _controllerScriptingInterface->disableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
-
-    {
-        auto userInputMapper = DependencyManager::get<UserInputMapper>();
-        if (userInputMapper->loadMapping(NO_MOVEMENT_MAPPING_JSON)) {
-            _controllerScriptingInterface->enableMapping(NO_MOVEMENT_MAPPING_NAME);
-        }
-    }
-
-    const auto& nodeList = DependencyManager::get<NodeList>();
-    // save interstitial mode setting until resuming.
-    _interstitialModeEnabled = nodeList->getDomainHandler().getInterstitialModeEnabled();
-    nodeList->getDomainHandler().setInterstitialModeEnabled(false);
-
-    auto menu = Menu::getInstance();
-    menu->getMenu("Edit")->setVisible(false);
-    menu->getMenu("View")->setVisible(false);
-    menu->getMenu("Navigate")->setVisible(false);
-    menu->getMenu("Settings")->setVisible(false);
-    _developerMenuVisible = menu->getMenu("Developer")->isVisible();
-    menu->setIsOptionChecked(MenuOption::Stats, false);
-    if (_developerMenuVisible) {
-        menu->getMenu("Developer")->setVisible(false);
-    }
-    _previousCameraMode = _myCamera.getMode();
-    _myCamera.setMode(CAMERA_MODE_FIRST_PERSON_LOOK_AT);
-    cameraModeChanged();
-
-    // disconnect domain handler.
-    nodeList->getDomainHandler().disconnect("Pause until login determined");
-
-    // From now on, it's permissible to call resumeAfterLoginDialogActionTaken()
-    _resumeAfterLoginDialogActionTaken_SafeToRun = true;
-
-    if (_resumeAfterLoginDialogActionTaken_WasPostponed) {
-        // resumeAfterLoginDialogActionTaken() was already called, but it aborted. Now it's safe to call it again.
-        resumeAfterLoginDialogActionTaken();
-    }
-}
-
-void Application::resumeAfterLoginDialogActionTaken() {
-    if (QThread::currentThread() != qApp->thread()) {
-        QMetaObject::invokeMethod(this, "resumeAfterLoginDialogActionTaken");
-        return;
-    }
-
-    if (!_resumeAfterLoginDialogActionTaken_SafeToRun) {
-        _resumeAfterLoginDialogActionTaken_WasPostponed = true;
-        return;
-    }
-
-#if !defined(DISABLE_QML)
-    if (!isHMDMode() && getDesktopTabletBecomesToolbarSetting()) {
-        auto toolbar = DependencyManager::get<ToolbarScriptingInterface>()->getToolbar("com.highfidelity.interface.toolbar.system");
-        toolbar->writeProperty("visible", true);
-    } else {
-        getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(true);
-        getApplicationCompositor().getReticleInterface()->setVisible(true);
-    }
-
-    updateSystemTabletMode();
-#endif
-
-    {
-        auto userInputMapper = DependencyManager::get<UserInputMapper>();
-        userInputMapper->unloadMapping(NO_MOVEMENT_MAPPING_JSON);
-        _controllerScriptingInterface->disableMapping(NO_MOVEMENT_MAPPING_NAME);
-    }
-
-    auto myAvatar = getMyAvatar();
-    myAvatar->setTargetScale(_previousAvatarTargetScale);
-    myAvatar->setSkeletonModelURLFromScript(_previousAvatarSkeletonModel);
-    myAvatar->setEnableMeshVisible(true);
-
-    _controllerScriptingInterface->enableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
-
-    const auto& nodeList = DependencyManager::get<NodeList>();
-    nodeList->getDomainHandler().setInterstitialModeEnabled(_interstitialModeEnabled);
-    {
-        auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
-        // this will force the model the look at the correct directory (weird order of operations issue)
-        scriptEngines->reloadLocalFiles();
-
-        // if the --scripts command-line argument was used.
-        if (_overrideDefaultScriptsLocation && _defaultScriptsLocation.exists()) {
-            scriptEngines->loadDefaultScripts();
-            scriptEngines->defaultScriptsLocationOverridden(true);
-        } else {
-            scriptEngines->loadScripts();
-        }
-    }
-
-    auto accountManager = DependencyManager::get<AccountManager>();
-    auto addressManager = DependencyManager::get<AddressManager>();
-
-    // restart domain handler.
-    nodeList->getDomainHandler().resetting();
-
-    QVariant testProperty = property(hifi::properties::TEST);
-    if (testProperty.isValid()) {
-        const auto testScript = property(hifi::properties::TEST).toUrl();
-        // Set last parameter to exit interface when the test script finishes, if so requested
-        DependencyManager::get<ScriptEngines>()->loadScript(testScript, false, false, false, false, quitWhenFinished);
-        // This is done so we don't get a "connection time-out" message when we haven't passed in a URL.
-        if (!_urlParam.isEmpty()) {
-            auto reply = SandboxUtils::getStatus();
-            connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
-        }
-    } else {
-        auto reply = SandboxUtils::getStatus();
-        connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
-    }
-
-    auto menu = Menu::getInstance();
-    menu->getMenu("Edit")->setVisible(true);
-    menu->getMenu("View")->setVisible(true);
-    menu->getMenu("Navigate")->setVisible(true);
-    menu->getMenu("Settings")->setVisible(true);
-    menu->getMenu("Developer")->setVisible(_developerMenuVisible);
-    _myCamera.setMode(_previousCameraMode);
-    cameraModeChanged();
-    _startUpFinished = true;
-    getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::FOCUS_ACTIVE);
-}
-
-void Application::loadAvatarScripts(const QVector<QString>& urls) {
-    auto scriptEngines = DependencyManager::get<ScriptEngines>();
-    auto runningScripts = scriptEngines->getRunningScripts();
-    for (auto url : urls) {
-        int index = runningScripts.indexOf(url);
-        if (index < 0) {
-            auto scriptEnginePointer = scriptEngines->loadScript(url, false);
-            if (scriptEnginePointer) {
-                scriptEnginePointer->setType(ScriptManager::Type::AVATAR);
-            }
-        }
-    }
-}
-
-void Application::unloadAvatarScripts() {
-    auto scriptEngines = DependencyManager::get<ScriptEngines>();
-    auto urls = scriptEngines->getRunningScripts();
-    for (auto url : urls) {
-        auto scriptEngine = scriptEngines->getScriptEngine(url);
-        if (scriptEngine->getType() == ScriptManager::Type::AVATAR) {
-            scriptEngines->stopScript(url, false);
-        }
-    }
-}
-
-void Application::updateLOD(float deltaTime) const {
-    PerformanceTimer perfTimer("LOD");
-    // adjust it unless we were asked to disable this feature, or if we're currently in throttleRendering mode
-    if (!isThrottleRendering()) {
-        float presentTime = getActiveDisplayPlugin()->getAveragePresentTime();
-        float engineRunTime = (float)(_graphicsEngine->getRenderEngine()->getConfiguration().get()->getCPURunTime());
-        float gpuTime = getGPUContext()->getFrameTimerGPUAverage();
-        float batchTime = getGPUContext()->getFrameTimerBatchAverage();
-        auto lodManager = DependencyManager::get<LODManager>();
-        lodManager->setRenderTimes(presentTime, engineRunTime, batchTime, gpuTime);
-        lodManager->autoAdjustLOD(deltaTime);
-    } else {
-        DependencyManager::get<LODManager>()->resetLODAdjust();
-    }
-}
-
-void Application::pushPostUpdateLambda(void* key, const std::function<void()>& func) {
-    std::unique_lock<std::mutex> guard(_postUpdateLambdasLock);
-    _postUpdateLambdas[key] = func;
-}
-
-// Called during Application::update immediately before AvatarManager::updateMyAvatar, updating my data that is then sent
-// to everyone.
-// The principal result is to call updateLookAtTargetAvatar() and then setLookAtPosition().
-// Note that it is called BEFORE we update position or joints based on sensors, etc.
-void Application::updateMyAvatarLookAtPosition(float deltaTime) {
-    PerformanceTimer perfTimer("lookAt");
-    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::updateMyAvatarLookAtPosition()");
-
-    auto myAvatar = getMyAvatar();
-    myAvatar->updateEyesLookAtPosition(deltaTime);
-}
-
-void Application::updateThreads(float deltaTime) {
-    PerformanceTimer perfTimer("updateThreads");
-    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::updateThreads()");
-
-    // parse voxel packets
-    if (!_enableProcessOctreeThread) {
-        _octreeProcessor->threadRoutine();
-        _entityEditSender->threadRoutine();
-    }
-}
-
-void Application::toggleOverlays() {
-    auto menu = Menu::getInstance();
-    menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays));
-}
-
-void Application::setOverlaysVisible(bool visible) {
-    auto menu = Menu::getInstance();
-    menu->setIsOptionChecked(MenuOption::Overlays, visible);
-}
-
-void Application::centerUI() {
-    _overlayConductor.centerUI();
-}
-
-void Application::cycleCamera() {
-    auto menu = Menu::getInstance();
-    if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) {
-
-        menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, false);
-        menu->setIsOptionChecked(MenuOption::LookAtCamera, true);
-
-    } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
-
-        menu->setIsOptionChecked(MenuOption::LookAtCamera, false);
-        if (menu->getActionForOption(MenuOption::SelfieCamera)->isVisible()) {
-            menu->setIsOptionChecked(MenuOption::SelfieCamera, true);
-        } else {
-            menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
-        }
-
-    } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
-
-        menu->setIsOptionChecked(MenuOption::SelfieCamera, false);
-        menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
-
-    }
-    cameraMenuChanged(); // handle the menu change
-}
-
-void Application::cameraModeChanged() {
-    switch (_myCamera.getMode()) {
-        case CAMERA_MODE_FIRST_PERSON_LOOK_AT:
-            Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
-            break;
-        case CAMERA_MODE_LOOK_AT:
-            Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, true);
-            break;
-        case CAMERA_MODE_SELFIE:
-            Menu::getInstance()->setIsOptionChecked(MenuOption::SelfieCamera, true);
-            break;
-        default:
-            // we don't have menu items for the others, so just leave it alone.
-            return;
-    }
-    cameraMenuChanged();
-}
-
-bool Application::shouldCaptureMouse() const {
-    return _captureMouse && _glWidget->isActiveWindow() && !ui::Menu::isSomeSubmenuShown();
-}
-
-void Application::captureMouseChanged(bool captureMouse) {
-    _captureMouse = captureMouse;
-    if (_captureMouse) {
-        _glWidget->setCursor(QCursor(Qt::BlankCursor));
-    } else {
-        _mouseCaptureTarget = QPointF(NAN, NAN);
-        _glWidget->unsetCursor();
-    }
-}
-
-void Application::changeViewAsNeeded(float boomLength) {
-    // Switch between first and third person views as needed
-    // This is called when the boom length has changed
-    bool boomLengthGreaterThanMinimum = (boomLength > MyAvatar::ZOOM_MIN);
-
-    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON_LOOK_AT && boomLengthGreaterThanMinimum) {
-        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, false);
-        Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, true);
-        cameraMenuChanged();
-    } else if (_myCamera.getMode() == CAMERA_MODE_LOOK_AT && !boomLengthGreaterThanMinimum) {
-        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
-        Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, false);
-        cameraMenuChanged();
-    }
-}
-
-void Application::cameraMenuChanged() {
-    auto menu = Menu::getInstance();
-    if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) {
-        if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON_LOOK_AT) {
-            _myCamera.setMode(CAMERA_MODE_FIRST_PERSON_LOOK_AT);
-            getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);
-        }
-    } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
-        if (_myCamera.getMode() != CAMERA_MODE_LOOK_AT) {
-            _myCamera.setMode(CAMERA_MODE_LOOK_AT);
-            if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
-                getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
-            }
-        }
-    } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
-        if (_myCamera.getMode() != CAMERA_MODE_SELFIE) {
-            _myCamera.setMode(CAMERA_MODE_SELFIE);
-            if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
-                getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
-            }
-        }
-    }
-}
-
-void Application::resetPhysicsReadyInformation() {
-    // we've changed domains or cleared out caches or something.  we no longer know enough about the
-    // collision information of nearby entities to make running bullet be safe.
-    _fullSceneReceivedCounter = 0;
-    _fullSceneCounterAtLastPhysicsCheck = 0;
-    _gpuTextureMemSizeStabilityCount = 0;
-    _gpuTextureMemSizeAtLastCheck = 0;
-    _physicsEnabled = false;
-    _octreeProcessor->stopSafeLanding();
-}
-
-void Application::reloadResourceCaches() {
-    resetPhysicsReadyInformation();
-
-    // Query the octree to refresh everything in view
-    _queryExpiry = SteadyClock::now();
-    _octreeQuery.incrementConnectionID();
-
-    queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
-
-    getMyAvatar()->prepareAvatarEntityDataForReload();
-    // Clear the entities and their renderables
-    getEntities()->clear();
-
-    DependencyManager::get<AssetClient>()->clearCache();
-    //It's already cleared in reloadAllScripts so I'm not sure this is necessary.
-    //DependencyManager::get<ScriptCache>()->clearCache();
-
-    // Clear all the resource caches
-    DependencyManager::get<ResourceCacheSharedItems>()->clear();
-    DependencyManager::get<AnimationCache>()->refreshAll();
-    DependencyManager::get<SoundCache>()->refreshAll();
-    DependencyManager::get<MaterialCache>()->refreshAll();
-    DependencyManager::get<ModelCache>()->refreshAll();
-    ShaderCache::instance().refreshAll();
-    DependencyManager::get<TextureCache>()->refreshAll();
-    DependencyManager::get<recording::ClipCache>()->refreshAll();
-
-    DependencyManager::get<NodeList>()->reset("Reloading resources");  // Force redownload of .fst models
-
-    DependencyManager::get<ScriptEngines>()->reloadAllScripts();
-    getOffscreenUI()->clearCache();
-
-    DependencyManager::get<Keyboard>()->createKeyboard();
-
-    getMyAvatar()->resetFullAvatarURL();
-}
-
-void Application::rotationModeChanged() const {
-    if (!Menu::getInstance()->isOptionChecked(MenuOption::CenterPlayerInView)) {
-        getMyAvatar()->setHeadPitch(0);
-    }
-}
-
-void Application::setKeyboardFocusHighlight(const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions) {
-    if (qApp->getLoginDialogPoppedUp()) {
-        return;
-    }
-
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    if (_keyboardFocusHighlightID == UNKNOWN_ENTITY_ID || !entityScriptingInterface->isAddedEntity(_keyboardFocusHighlightID)) {
-        EntityItemProperties properties;
-        properties.setType(EntityTypes::Box);
-        properties.setAlpha(1.0f);
-        properties.setColor({ 0xFF, 0xEF, 0x00 });
-        properties.setPrimitiveMode(PrimitiveMode::LINES);
-        properties.getPulse().setMin(0.5);
-        properties.getPulse().setMax(1.0f);
-        properties.getPulse().setColorMode(PulseMode::IN_PHASE);
-        properties.setIgnorePickIntersection(true);
-        _keyboardFocusHighlightID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
-    }
-
-    // Position focus
-    EntityItemProperties properties;
-    properties.setPosition(position);
-    properties.setRotation(rotation);
-    properties.setDimensions(dimensions);
-    properties.setVisible(true);
-    entityScriptingInterface->editEntity(_keyboardFocusHighlightID, properties);
-}
-
-QUuid Application::getKeyboardFocusEntity() const {
-    return _keyboardFocusedEntity.get();
-}
-
-void Application::setKeyboardFocusEntity(const QUuid& id) {
-    if (_keyboardFocusedEntity.get() != id) {
-        if (qApp->getLoginDialogPoppedUp() && !_loginDialogID.isNull()) {
-            if (id == _loginDialogID) {
-                emit loginDialogFocusEnabled();
-            } else if (!_keyboardFocusWaitingOnRenderable) {
-                // that's the only entity we want in focus;
-                return;
-            }
-        }
-
-        _keyboardFocusedEntity.set(id);
-
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        if (id != UNKNOWN_ENTITY_ID) {
-            EntityPropertyFlags desiredProperties;
-            desiredProperties += PROP_VISIBLE;
-            desiredProperties += PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT;
-            auto properties = entityScriptingInterface->getEntityProperties(id);
-            if (properties.getVisible()) {
-                auto entities = getEntities();
-                auto entityId = _keyboardFocusedEntity.get();
-                auto entityItemRenderable = entities->renderableForEntityId(entityId);
-                if (!entityItemRenderable) {
-                    _keyboardFocusWaitingOnRenderable = true;
-                } else if (entityItemRenderable->wantsKeyboardFocus()) {
-                    entities->setProxyWindow(entityId, _window->windowHandle());
-                    if (_keyboardMouseDevice->isActive()) {
-                        _keyboardMouseDevice->pluginFocusOutEvent();
-                    }
-                    _lastAcceptedKeyPress = usecTimestampNow();
-
-                    if (properties.getShowKeyboardFocusHighlight()) {
-                        if (auto entity = entities->getEntity(entityId)) {
-                            setKeyboardFocusHighlight(entity->getWorldPosition(), entity->getWorldOrientation(),
-                                entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-
-        EntityItemProperties properties;
-        properties.setVisible(false);
-        entityScriptingInterface->editEntity(_keyboardFocusHighlightID, properties);
-    }
-}
-
-void Application::updateDialogs(float deltaTime) const {
-    PerformanceTimer perfTimer("updateDialogs");
-    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::updateDialogs()");
-    auto dialogsManager = DependencyManager::get<DialogsManager>();
-
-    QPointer<OctreeStatsDialog> octreeStatsDialog = dialogsManager->getOctreeStatsDialog();
-    if (octreeStatsDialog) {
-        octreeStatsDialog->update();
-    }
-}
-
-void Application::updateSecondaryCameraViewFrustum() {
-    // TODO: Fix this by modeling the way the secondary camera works on how the main camera works
-    // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary
-    // camera should be.
-
-    // Code based on SecondaryCameraJob
-    auto renderConfig = _graphicsEngine->getRenderEngine()->getConfiguration();
-    assert(renderConfig);
-    auto camera = dynamic_cast<SecondaryCameraJobConfig*>(renderConfig->getConfig("SecondaryCamera"));
-
-    if (!camera || !camera->isEnabled()) {
-        return;
-    }
-
-    ViewFrustum secondaryViewFrustum;
-    if (camera->portalProjection && !camera->attachedEntityId.isNull() && !camera->portalEntranceEntityId.isNull()) {
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        EntityItemPointer portalEntrance = qApp->getEntities()->getTree()->findEntityByID(camera->portalEntranceEntityId);
-        EntityItemPointer portalExit = qApp->getEntities()->getTree()->findEntityByID(camera->attachedEntityId);
-
-        glm::vec3 portalEntrancePropertiesPosition = portalEntrance->getWorldPosition();
-        glm::quat portalEntrancePropertiesRotation = portalEntrance->getWorldOrientation();
-        glm::mat4 worldFromPortalEntranceRotation = glm::mat4_cast(portalEntrancePropertiesRotation);
-        glm::mat4 worldFromPortalEntranceTranslation = glm::translate(portalEntrancePropertiesPosition);
-        glm::mat4 worldFromPortalEntrance = worldFromPortalEntranceTranslation * worldFromPortalEntranceRotation;
-        glm::mat4 portalEntranceFromWorld = glm::inverse(worldFromPortalEntrance);
-
-        glm::vec3 portalExitPropertiesPosition = portalExit->getWorldPosition();
-        glm::quat portalExitPropertiesRotation = portalExit->getWorldOrientation();
-        glm::vec3 portalExitPropertiesDimensions = portalExit->getScaledDimensions();
-        glm::vec3 halfPortalExitPropertiesDimensions = 0.5f * portalExitPropertiesDimensions;
-
-        glm::mat4 worldFromPortalExitRotation = glm::mat4_cast(portalExitPropertiesRotation);
-        glm::mat4 worldFromPortalExitTranslation = glm::translate(portalExitPropertiesPosition);
-        glm::mat4 worldFromPortalExit = worldFromPortalExitTranslation * worldFromPortalExitRotation;
-
-        glm::vec3 mainCameraPositionWorld = getCamera().getPosition();
-        glm::vec3 mainCameraPositionPortalEntrance = vec3(portalEntranceFromWorld * vec4(mainCameraPositionWorld, 1.0f));
-        mainCameraPositionPortalEntrance = vec3(-mainCameraPositionPortalEntrance.x, mainCameraPositionPortalEntrance.y,
-            -mainCameraPositionPortalEntrance.z);
-        glm::vec3 portalExitCameraPositionWorld = vec3(worldFromPortalExit * vec4(mainCameraPositionPortalEntrance, 1.0f));
-
-        secondaryViewFrustum.setPosition(portalExitCameraPositionWorld);
-        secondaryViewFrustum.setOrientation(portalExitPropertiesRotation);
-
-        float nearClip = mainCameraPositionPortalEntrance.z + portalExitPropertiesDimensions.z * 2.0f;
-        // `mainCameraPositionPortalEntrance` should technically be `mainCameraPositionPortalExit`,
-        // but the values are the same.
-        glm::vec3 upperRight = halfPortalExitPropertiesDimensions - mainCameraPositionPortalEntrance;
-        glm::vec3 bottomLeft = -halfPortalExitPropertiesDimensions - mainCameraPositionPortalEntrance;
-        glm::mat4 frustum = glm::frustum(bottomLeft.x, upperRight.x, bottomLeft.y, upperRight.y, nearClip, camera->farClipPlaneDistance);
-        secondaryViewFrustum.setProjection(frustum);
-    } else if (camera->mirrorProjection && !camera->attachedEntityId.isNull()) {
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        auto entityProperties = entityScriptingInterface->getEntityProperties(camera->attachedEntityId);
-        glm::vec3 mirrorPropertiesPosition = entityProperties.getPosition();
-        glm::quat mirrorPropertiesRotation = entityProperties.getRotation();
-        glm::vec3 mirrorPropertiesDimensions = entityProperties.getDimensions();
-        glm::vec3 halfMirrorPropertiesDimensions = 0.5f * mirrorPropertiesDimensions;
-
-        // setup mirror from world as inverse of world from mirror transformation using inverted x and z for mirrored image
-        // TODO: we are assuming here that UP is world y-axis
-        glm::mat4 worldFromMirrorRotation = glm::mat4_cast(mirrorPropertiesRotation) * glm::scale(vec3(-1.0f, 1.0f, -1.0f));
-        glm::mat4 worldFromMirrorTranslation = glm::translate(mirrorPropertiesPosition);
-        glm::mat4 worldFromMirror = worldFromMirrorTranslation * worldFromMirrorRotation;
-        glm::mat4 mirrorFromWorld = glm::inverse(worldFromMirror);
-
-        // get mirror camera position by reflecting main camera position's z coordinate in mirror space
-        glm::vec3 mainCameraPositionWorld = getCamera().getPosition();
-        glm::vec3 mainCameraPositionMirror = vec3(mirrorFromWorld * vec4(mainCameraPositionWorld, 1.0f));
-        glm::vec3 mirrorCameraPositionMirror = vec3(mainCameraPositionMirror.x, mainCameraPositionMirror.y,
-                                                    -mainCameraPositionMirror.z);
-        glm::vec3 mirrorCameraPositionWorld = vec3(worldFromMirror * vec4(mirrorCameraPositionMirror, 1.0f));
-
-        // set frustum position to be mirrored camera and set orientation to mirror's adjusted rotation
-        glm::quat mirrorCameraOrientation = glm::quat_cast(worldFromMirrorRotation);
-        secondaryViewFrustum.setPosition(mirrorCameraPositionWorld);
-        secondaryViewFrustum.setOrientation(mirrorCameraOrientation);
-
-        // build frustum using mirror space translation of mirrored camera
-        float nearClip = mirrorCameraPositionMirror.z + mirrorPropertiesDimensions.z * 2.0f;
-        glm::vec3 upperRight = halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
-        glm::vec3 bottomLeft = -halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
-        glm::mat4 frustum = glm::frustum(bottomLeft.x, upperRight.x, bottomLeft.y, upperRight.y, nearClip, camera->farClipPlaneDistance);
-        secondaryViewFrustum.setProjection(frustum);
-    } else {
-        if (!camera->attachedEntityId.isNull()) {
-            auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-            auto entityProperties = entityScriptingInterface->getEntityProperties(camera->attachedEntityId);
-            secondaryViewFrustum.setPosition(entityProperties.getPosition());
-            secondaryViewFrustum.setOrientation(entityProperties.getRotation());
-        } else {
-            secondaryViewFrustum.setPosition(camera->position);
-            secondaryViewFrustum.setOrientation(camera->orientation);
-        }
-
-        float aspectRatio = (float)camera->textureWidth / (float)camera->textureHeight;
-        secondaryViewFrustum.setProjection(camera->vFoV,
-                                            aspectRatio,
-                                            camera->nearClipPlaneDistance,
-                                            camera->farClipPlaneDistance);
-    }
-    // Without calculating the bound planes, the secondary camera will use the same culling frustum as the main camera,
-    // which is not what we want here.
-    secondaryViewFrustum.calculate();
-
-    _conicalViews.push_back(secondaryViewFrustum);
-}
-
-static bool domainLoadingInProgress = false;
-
-void Application::tryToEnablePhysics() {
-    bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
-
-    if (gpuTextureMemSizeStable() || !enableInterstitial) {
-        _fullSceneCounterAtLastPhysicsCheck = _fullSceneReceivedCounter;
-        _lastQueriedViews.clear();  // Force new view.
-
-        // process octree stats packets are sent in between full sends of a scene (this isn't currently true).
-        // We keep physics disabled until we've received a full scene and everything near the avatar in that
-        // scene is ready to compute its collision shape.
-        auto myAvatar = getMyAvatar();
-        if (myAvatar->isReadyForPhysics()) {
-            myAvatar->getCharacterController()->setPhysicsEngine(_physicsEngine);
-            _octreeProcessor->resetSafeLanding();
-            _physicsEnabled = true;
-            setIsInterstitialMode(false);
-            myAvatar->updateMotionBehaviorFromMenu();
-        }
-    }
-}
-
-void Application::update(float deltaTime) {
-    PROFILE_RANGE_EX(app, __FUNCTION__, 0xffff0000, (uint64_t)_graphicsEngine->_renderFrameCount + 1);
-
-    if (_aboutToQuit) {
-        return;
-    }
-
-    if (!_physicsEnabled) {
-        if (!domainLoadingInProgress) {
-            PROFILE_ASYNC_BEGIN(app, "Scene Loading", "");
-            domainLoadingInProgress = true;
-        }
-
-        // we haven't yet enabled physics.  we wait until we think we have all the collision information
-        // for nearby entities before starting bullet up.
-        if (isServerlessMode()) {
-            tryToEnablePhysics();
-        } else if (_failedToConnectToEntityServer) {
-            if (_octreeProcessor->safeLandingIsActive()) {
-                _octreeProcessor->stopSafeLanding();
-            }
-        } else {
-            _octreeProcessor->updateSafeLanding();
-            if (_octreeProcessor->safeLandingIsComplete()) {
-                tryToEnablePhysics();
-            }
-        }
-    } else if (domainLoadingInProgress) {
-        domainLoadingInProgress = false;
-        PROFILE_ASYNC_END(app, "Scene Loading", "");
-    }
-
-     if (shouldCaptureMouse()) {
-        QPoint point = _glWidget->mapToGlobal(_glWidget->geometry().center());
-        if (QCursor::pos() != point) {
-            _mouseCaptureTarget = point;
-            _ignoreMouseMove = true;
-            if (_captureMouse) {
-                _keyboardMouseDevice->updateMousePositionForCapture(QCursor::pos(), _mouseCaptureTarget);
-            }
-            QCursor::setPos(point);
-        }
-    }
-
-    auto myAvatar = getMyAvatar();
-    {
-        PerformanceTimer perfTimer("devices");
-        auto userInputMapper = DependencyManager::get<UserInputMapper>();
-
-        controller::HmdAvatarAlignmentType hmdAvatarAlignmentType;
-        if (myAvatar->getHmdAvatarAlignmentType() == "eyes") {
-            hmdAvatarAlignmentType = controller::HmdAvatarAlignmentType::Eyes;
-        } else {
-            hmdAvatarAlignmentType = controller::HmdAvatarAlignmentType::Head;
-        }
-
-        controller::InputCalibrationData calibrationData = {
-            myAvatar->getSensorToWorldMatrix(),
-            createMatFromQuatAndPos(myAvatar->getWorldOrientation(), myAvatar->getWorldPosition()),
-            myAvatar->getHMDSensorMatrix(),
-            myAvatar->getCenterEyeCalibrationMat(),
-            myAvatar->getHeadCalibrationMat(),
-            myAvatar->getSpine2CalibrationMat(),
-            myAvatar->getHipsCalibrationMat(),
-            myAvatar->getLeftFootCalibrationMat(),
-            myAvatar->getRightFootCalibrationMat(),
-            myAvatar->getRightArmCalibrationMat(),
-            myAvatar->getLeftArmCalibrationMat(),
-            myAvatar->getRightHandCalibrationMat(),
-            myAvatar->getLeftHandCalibrationMat(),
-            hmdAvatarAlignmentType
-        };
-
-        InputPluginPointer keyboardMousePlugin;
-        for(const auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
-            if (inputPlugin->getName() == KeyboardMouseDevice::NAME) {
-                keyboardMousePlugin = inputPlugin;
-            } else if (inputPlugin->isActive()) {
-                inputPlugin->pluginUpdate(deltaTime, calibrationData);
-            }
-        }
-
-        userInputMapper->setInputCalibrationData(calibrationData);
-        userInputMapper->update(deltaTime);
-
-        if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {
-            keyboardMousePlugin->pluginUpdate(deltaTime, calibrationData);
-        }
-        // Transfer the user inputs to the driveKeys
-        // FIXME can we drop drive keys and just have the avatar read the action states directly?
-        myAvatar->clearDriveKeys();
-        if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT && !isInterstitialMode()) {
-            if (!_controllerScriptingInterface->areActionsCaptured() && _myCamera.getMode() != CAMERA_MODE_MIRROR) {
-                myAvatar->setDriveKey(MyAvatar::TRANSLATE_Z, -1.0f * userInputMapper->getActionState(controller::Action::TRANSLATE_Z));
-                myAvatar->setDriveKey(MyAvatar::TRANSLATE_Y, userInputMapper->getActionState(controller::Action::TRANSLATE_Y));
-                myAvatar->setDriveKey(MyAvatar::TRANSLATE_X, userInputMapper->getActionState(controller::Action::TRANSLATE_X));
-                if (deltaTime > FLT_EPSILON && userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z)  == 0.0f) {
-                    myAvatar->setDriveKey(MyAvatar::PITCH, -1.0f * userInputMapper->getActionState(controller::Action::PITCH));
-                    myAvatar->setDriveKey(MyAvatar::YAW, -1.0f * userInputMapper->getActionState(controller::Action::YAW));
-                    myAvatar->setDriveKey(MyAvatar::DELTA_PITCH, -_myCamera.getSensitivity() * userInputMapper->getActionState(controller::Action::DELTA_PITCH));
-                    myAvatar->setDriveKey(MyAvatar::DELTA_YAW, -_myCamera.getSensitivity() * userInputMapper->getActionState(controller::Action::DELTA_YAW));
-                    myAvatar->setDriveKey(MyAvatar::STEP_YAW, -1.0f * userInputMapper->getActionState(controller::Action::STEP_YAW));
-                }
-            }
-            myAvatar->setDriveKey(MyAvatar::ZOOM, userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z));
-        }
-
-        myAvatar->setSprintMode((bool)userInputMapper->getActionState(controller::Action::SPRINT));
-        static const std::vector<controller::Action> avatarControllerActions = {
-            controller::Action::LEFT_HAND,
-            controller::Action::RIGHT_HAND,
-            controller::Action::LEFT_FOOT,
-            controller::Action::RIGHT_FOOT,
-            controller::Action::HIPS,
-            controller::Action::SPINE2,
-            controller::Action::HEAD,
-            controller::Action::LEFT_HAND_THUMB1,
-            controller::Action::LEFT_HAND_THUMB2,
-            controller::Action::LEFT_HAND_THUMB3,
-            controller::Action::LEFT_HAND_THUMB4,
-            controller::Action::LEFT_HAND_INDEX1,
-            controller::Action::LEFT_HAND_INDEX2,
-            controller::Action::LEFT_HAND_INDEX3,
-            controller::Action::LEFT_HAND_INDEX4,
-            controller::Action::LEFT_HAND_MIDDLE1,
-            controller::Action::LEFT_HAND_MIDDLE2,
-            controller::Action::LEFT_HAND_MIDDLE3,
-            controller::Action::LEFT_HAND_MIDDLE4,
-            controller::Action::LEFT_HAND_RING1,
-            controller::Action::LEFT_HAND_RING2,
-            controller::Action::LEFT_HAND_RING3,
-            controller::Action::LEFT_HAND_RING4,
-            controller::Action::LEFT_HAND_PINKY1,
-            controller::Action::LEFT_HAND_PINKY2,
-            controller::Action::LEFT_HAND_PINKY3,
-            controller::Action::LEFT_HAND_PINKY4,
-            controller::Action::RIGHT_HAND_THUMB1,
-            controller::Action::RIGHT_HAND_THUMB2,
-            controller::Action::RIGHT_HAND_THUMB3,
-            controller::Action::RIGHT_HAND_THUMB4,
-            controller::Action::RIGHT_HAND_INDEX1,
-            controller::Action::RIGHT_HAND_INDEX2,
-            controller::Action::RIGHT_HAND_INDEX3,
-            controller::Action::RIGHT_HAND_INDEX4,
-            controller::Action::RIGHT_HAND_MIDDLE1,
-            controller::Action::RIGHT_HAND_MIDDLE2,
-            controller::Action::RIGHT_HAND_MIDDLE3,
-            controller::Action::RIGHT_HAND_MIDDLE4,
-            controller::Action::RIGHT_HAND_RING1,
-            controller::Action::RIGHT_HAND_RING2,
-            controller::Action::RIGHT_HAND_RING3,
-            controller::Action::RIGHT_HAND_RING4,
-            controller::Action::RIGHT_HAND_PINKY1,
-            controller::Action::RIGHT_HAND_PINKY2,
-            controller::Action::RIGHT_HAND_PINKY3,
-            controller::Action::RIGHT_HAND_PINKY4,
-            controller::Action::LEFT_ARM,
-            controller::Action::RIGHT_ARM,
-            controller::Action::LEFT_SHOULDER,
-            controller::Action::RIGHT_SHOULDER,
-            controller::Action::LEFT_FORE_ARM,
-            controller::Action::RIGHT_FORE_ARM,
-            controller::Action::LEFT_LEG,
-            controller::Action::RIGHT_LEG,
-            controller::Action::LEFT_UP_LEG,
-            controller::Action::RIGHT_UP_LEG,
-            controller::Action::LEFT_TOE_BASE,
-            controller::Action::RIGHT_TOE_BASE,
-            controller::Action::LEFT_EYE,
-            controller::Action::RIGHT_EYE
-
-        };
-
-        // copy controller poses from userInputMapper to myAvatar.
-        glm::mat4 myAvatarMatrix = createMatFromQuatAndPos(myAvatar->getWorldOrientation(), myAvatar->getWorldPosition());
-        glm::mat4 worldToSensorMatrix = glm::inverse(myAvatar->getSensorToWorldMatrix());
-        glm::mat4 avatarToSensorMatrix = worldToSensorMatrix * myAvatarMatrix;
-        for (auto& action : avatarControllerActions) {
-            controller::Pose pose = userInputMapper->getPoseState(action);
-            myAvatar->setControllerPoseInSensorFrame(action, pose.transform(avatarToSensorMatrix));
-        }
-
-        static const std::vector<QString> trackedObjectStringLiterals = {
-            QStringLiteral("_TrackedObject00"), QStringLiteral("_TrackedObject01"), QStringLiteral("_TrackedObject02"), QStringLiteral("_TrackedObject03"),
-            QStringLiteral("_TrackedObject04"), QStringLiteral("_TrackedObject05"), QStringLiteral("_TrackedObject06"), QStringLiteral("_TrackedObject07"),
-            QStringLiteral("_TrackedObject08"), QStringLiteral("_TrackedObject09"), QStringLiteral("_TrackedObject10"), QStringLiteral("_TrackedObject11"),
-            QStringLiteral("_TrackedObject12"), QStringLiteral("_TrackedObject13"), QStringLiteral("_TrackedObject14"), QStringLiteral("_TrackedObject15")
-        };
-
-        // Controlled by the Developer > Avatar > Show Tracked Objects menu.
-        if (_showTrackedObjects) {
-            static const std::vector<controller::Action> trackedObjectActions = {
-                controller::Action::TRACKED_OBJECT_00, controller::Action::TRACKED_OBJECT_01, controller::Action::TRACKED_OBJECT_02, controller::Action::TRACKED_OBJECT_03,
-                controller::Action::TRACKED_OBJECT_04, controller::Action::TRACKED_OBJECT_05, controller::Action::TRACKED_OBJECT_06, controller::Action::TRACKED_OBJECT_07,
-                controller::Action::TRACKED_OBJECT_08, controller::Action::TRACKED_OBJECT_09, controller::Action::TRACKED_OBJECT_10, controller::Action::TRACKED_OBJECT_11,
-                controller::Action::TRACKED_OBJECT_12, controller::Action::TRACKED_OBJECT_13, controller::Action::TRACKED_OBJECT_14, controller::Action::TRACKED_OBJECT_15
-            };
-
-            int i = 0;
-            glm::vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
-            for (auto& action : trackedObjectActions) {
-                controller::Pose pose = userInputMapper->getPoseState(action);
-                if (pose.valid) {
-                    glm::vec3 pos = transformPoint(myAvatarMatrix, pose.translation);
-                    glm::quat rot = glmExtractRotation(myAvatarMatrix) * pose.rotation;
-                    DebugDraw::getInstance().addMarker(trackedObjectStringLiterals[i], rot, pos, BLUE);
-                } else {
-                    DebugDraw::getInstance().removeMarker(trackedObjectStringLiterals[i]);
-                }
-                i++;
-            }
-        } else if (_prevShowTrackedObjects) {
-            for (auto& key : trackedObjectStringLiterals) {
-                DebugDraw::getInstance().removeMarker(key);
-            }
-        }
-        _prevShowTrackedObjects = _showTrackedObjects;
-    }
-
-    updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
-    updateDialogs(deltaTime); // update various stats dialogs if present
-
-    auto grabManager = DependencyManager::get<GrabManager>();
-    grabManager->simulateGrabs();
-
-    // TODO: break these out into distinct perfTimers when they prove interesting
-    {
-        PROFILE_RANGE(app, "PickManager");
-        PerformanceTimer perfTimer("pickManager");
-        DependencyManager::get<PickManager>()->update();
-    }
-
-    {
-        PROFILE_RANGE(app, "PointerManager");
-        PerformanceTimer perfTimer("pointerManager");
-        DependencyManager::get<PointerManager>()->update();
-    }
-
-    QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
-
-    {
-        PROFILE_RANGE(simulation_physics, "Simulation");
-        PerformanceTimer perfTimer("simulation");
-
-        getEntities()->preUpdate();
-        _entitySimulation->removeDeadEntities();
-
-        auto t0 = std::chrono::high_resolution_clock::now();
-        auto t1 = t0;
-        {
-            PROFILE_RANGE(simulation_physics, "PrePhysics");
-            PerformanceTimer perfTimer("prePhysics)");
-            {
-                PROFILE_RANGE(simulation_physics, "Entities");
-                PhysicsEngine::Transaction transaction;
-                _entitySimulation->buildPhysicsTransaction(transaction);
-                _physicsEngine->processTransaction(transaction);
-                _entitySimulation->handleProcessedPhysicsTransaction(transaction);
-            }
-
-            t1 = std::chrono::high_resolution_clock::now();
-
-            {
-                PROFILE_RANGE(simulation_physics, "Avatars");
-                PhysicsEngine::Transaction transaction;
-                avatarManager->buildPhysicsTransaction(transaction);
-                _physicsEngine->processTransaction(transaction);
-                avatarManager->handleProcessedPhysicsTransaction(transaction);
-
-                myAvatar->prepareForPhysicsSimulation();
-                myAvatar->getCharacterController()->preSimulation();
-            }
-        }
-
-        if (_physicsEnabled) {
-            {
-                PROFILE_RANGE(simulation_physics, "PrepareActions");
-                _entitySimulation->applyDynamicChanges();
-                _physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {
-                    dynamic->prepareForPhysicsSimulation();
-                });
-            }
-            auto t2 = std::chrono::high_resolution_clock::now();
-            {
-                PROFILE_RANGE(simulation_physics, "StepPhysics");
-                PerformanceTimer perfTimer("stepPhysics");
-                getEntities()->getTree()->withWriteLock([&] {
-                    _physicsEngine->stepSimulation();
-                });
-            }
-            auto t3 = std::chrono::high_resolution_clock::now();
-            {
-                if (_physicsEngine->hasOutgoingChanges()) {
-                    {
-                        PROFILE_RANGE(simulation_physics, "PostPhysics");
-                        PerformanceTimer perfTimer("postPhysics");
-                        // grab the collision events BEFORE handleChangedMotionStates() because at this point
-                        // we have a better idea of which objects we own or should own.
-                        auto& collisionEvents = _physicsEngine->getCollisionEvents();
-
-                        getEntities()->getTree()->withWriteLock([&] {
-                            PROFILE_RANGE(simulation_physics, "HandleChanges");
-                            PerformanceTimer perfTimer("handleChanges");
-
-                            const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
-                            _entitySimulation->handleChangedMotionStates(outgoingChanges);
-                            avatarManager->handleChangedMotionStates(outgoingChanges);
-
-                            const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
-                            _entitySimulation->handleDeactivatedMotionStates(deactivations);
-                        });
-
-                        // handleCollisionEvents() AFTER handleChangedMotionStates()
-                        {
-                            PROFILE_RANGE(simulation_physics, "CollisionEvents");
-                            avatarManager->handleCollisionEvents(collisionEvents);
-                            // Collision events (and their scripts) must not be handled when we're locked, above. (That would risk
-                            // deadlock.)
-                            _entitySimulation->handleCollisionEvents(collisionEvents);
-                        }
-
-                        {
-                            PROFILE_RANGE(simulation_physics, "MyAvatar");
-                            myAvatar->getCharacterController()->postSimulation();
-                            myAvatar->harvestResultsFromPhysicsSimulation(deltaTime);
-                        }
-
-                        if (PerformanceTimer::isActive() &&
-                                Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails) &&
-                                Menu::getInstance()->isOptionChecked(MenuOption::ExpandPhysicsTiming)) {
-                            _physicsEngine->harvestPerformanceStats();
-                        }
-                        // NOTE: the PhysicsEngine stats are written to stdout NOT to Qt log framework
-                        _physicsEngine->dumpStatsIfNecessary();
-                    }
-                    auto t4 = std::chrono::high_resolution_clock::now();
-
-                    // NOTE: the getEntities()->update() call below will wait for lock
-                    // and will provide non-physical entity motion
-                    getEntities()->update(true); // update the models...
-
-                    auto t5 = std::chrono::high_resolution_clock::now();
-
-                    workload::Timings timings(6);
-                    timings[0] = t1 - t0; // prePhysics entities
-                    timings[1] = t2 - t1; // prePhysics avatars
-                    timings[2] = t3 - t2; // stepPhysics
-                    timings[3] = t4 - t3; // postPhysics
-                    timings[4] = t5 - t4; // non-physical kinematics
-                    timings[5] = workload::Timing_ns((int32_t)(NSECS_PER_SECOND * deltaTime)); // game loop duration
-                    _gameWorkload.updateSimulationTimings(timings);
-                }
-            }
-        } else {
-            // update the rendering without any simulation
-            getEntities()->update(false);
-        }
-        // remove recently dead avatarEntities
-        SetOfEntities deadAvatarEntities;
-        _entitySimulation->takeDeadAvatarEntities(deadAvatarEntities);
-        avatarManager->removeDeadAvatarEntities(deadAvatarEntities);
-    }
-
-    // AvatarManager update
-    {
-        {
-            PROFILE_RANGE(simulation, "OtherAvatars");
-            PerformanceTimer perfTimer("otherAvatars");
-            avatarManager->updateOtherAvatars(deltaTime);
-        }
-
-        {
-            PROFILE_RANGE(simulation, "MyAvatar");
-            PerformanceTimer perfTimer("MyAvatar");
-            qApp->updateMyAvatarLookAtPosition(deltaTime);
-            avatarManager->updateMyAvatar(deltaTime);
-        }
-    }
-
-    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
-    PerformanceWarning warn(showWarnings, "Application::update()");
-
-    updateLOD(deltaTime);
-
-    if (!_loginDialogID.isNull()) {
-        _loginStateManager.update(getMyAvatar()->getDominantHand(), _loginDialogID);
-        updateLoginDialogPosition();
-    }
-
-    {
-        PROFILE_RANGE_EX(app, "Overlays", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
-        PerformanceTimer perfTimer("overlays");
-        _overlays.update(deltaTime);
-    }
-
-    // Update _viewFrustum with latest camera and view frustum data...
-    // NOTE: we get this from the view frustum, to make it simpler, since the
-    // loadViewFrumstum() method will get the correct details from the camera
-    // We could optimize this to not actually load the viewFrustum, since we don't
-    // actually need to calculate the view frustum planes to send these details
-    // to the server.
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        _myCamera.loadViewFrustum(_viewFrustum);
-
-        _conicalViews.clear();
-        _conicalViews.push_back(_viewFrustum);
-        // TODO: Fix this by modeling the way the secondary camera works on how the main camera works
-        // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary
-        // camera should be.
-        updateSecondaryCameraViewFrustum();
-    }
-
-    quint64 now = usecTimestampNow();
-
-    // Update my voxel servers with my current voxel query...
-    {
-        PROFILE_RANGE_EX(app, "QueryOctree", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
-        PerformanceTimer perfTimer("queryOctree");
-        QMutexLocker viewLocker(&_viewMutex);
-
-        bool viewIsDifferentEnough = false;
-        if (_conicalViews.size() == _lastQueriedViews.size()) {
-            for (size_t i = 0; i < _conicalViews.size(); ++i) {
-                if (!_conicalViews[i].isVerySimilar(_lastQueriedViews[i])) {
-                    viewIsDifferentEnough = true;
-                    break;
-                }
-            }
-        } else {
-            viewIsDifferentEnough = true;
-        }
-
-
-        // if it's been a while since our last query or the view has significantly changed then send a query, otherwise suppress it
-        static const std::chrono::seconds MIN_PERIOD_BETWEEN_QUERIES { 3 };
-        auto now = SteadyClock::now();
-        if (now > _queryExpiry || viewIsDifferentEnough) {
-            if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
-                queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
-            }
-            queryAvatars();
-
-            _lastQueriedViews = _conicalViews;
-            _queryExpiry = now + MIN_PERIOD_BETWEEN_QUERIES;
-        }
-    }
-
-    // sent nack packets containing missing sequence numbers of received packets from nodes
-    {
-        quint64 sinceLastNack = now - _lastNackTime;
-        const quint64 TOO_LONG_SINCE_LAST_NACK = 1 * USECS_PER_SECOND;
-        if (sinceLastNack > TOO_LONG_SINCE_LAST_NACK) {
-            _lastNackTime = now;
-            sendNackPackets();
-        }
-    }
-
-    // send packet containing downstream audio stats to the AudioMixer
-    {
-        quint64 sinceLastNack = now - _lastSendDownstreamAudioStats;
-        if (sinceLastNack > TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS && !isInterstitialMode()) {
-            _lastSendDownstreamAudioStats = now;
-
-            QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "sendDownstreamAudioStatsPacket", Qt::QueuedConnection);
-        }
-    }
-
-    {
-        PerformanceTimer perfTimer("avatarManager/postUpdate");
-        avatarManager->postUpdate(deltaTime, getMain3DScene());
-    }
-
-    {
-        PROFILE_RANGE_EX(app, "PostUpdateLambdas", 0xffff0000, (uint64_t)0);
-        PerformanceTimer perfTimer("postUpdateLambdas");
-        std::unique_lock<std::mutex> guard(_postUpdateLambdasLock);
-        for (auto& iter : _postUpdateLambdas) {
-            iter.second();
-        }
-        _postUpdateLambdas.clear();
-    }
-
-
-    updateRenderArgs(deltaTime);
-
-    {
-        PerformanceTimer perfTimer("AnimDebugDraw");
-        AnimDebugDraw::getInstance().update();
-    }
-
-
-    { // Game loop is done, mark the end of the frame for the scene transactions and the render loop to take over
-        PerformanceTimer perfTimer("enqueueFrame");
-        getMain3DScene()->enqueueFrame();
-    }
-
-    // If the display plugin is inactive then the frames won't be processed so process them here.
-    if (!getActiveDisplayPlugin()->isActive()) {
-        getMain3DScene()->processTransactionQueue();
-    }
-
-    // decide if the sensorToWorldMatrix is changing in a way that warrents squeezing the edges of the view down
-    if (getActiveDisplayPlugin()->isHmd()) {
-        PerformanceTimer perfTimer("squeezeVision");
-        _visionSqueeze.updateVisionSqueeze(myAvatar->getSensorToWorldMatrix(), deltaTime);
-    }
-}
-
-void Application::updateRenderArgs(float deltaTime) {
-    _graphicsEngine->editRenderArgs([this, deltaTime](AppRenderArgs& appRenderArgs) {
-        PerformanceTimer perfTimer("editRenderArgs");
-        appRenderArgs._headPose = getHMDSensorPose();
-
-        auto myAvatar = getMyAvatar();
-
-        // update the avatar with a fresh HMD pose
-        {
-            PROFILE_RANGE(render, "/updateAvatar");
-            myAvatar->updateFromHMDSensorMatrix(appRenderArgs._headPose);
-        }
-
-        auto lodManager = DependencyManager::get<LODManager>();
-
-        float sensorToWorldScale = getMyAvatar()->getSensorToWorldScale();
-        appRenderArgs._sensorToWorldScale = sensorToWorldScale;
-        appRenderArgs._sensorToWorld = getMyAvatar()->getSensorToWorldMatrix();
-        {
-            PROFILE_RANGE(render, "/buildFrustrumAndArgs");
-            {
-                QMutexLocker viewLocker(&_viewMutex);
-                // adjust near clip plane to account for sensor scaling.
-                auto adjustedProjection = glm::perspective(glm::radians(_fieldOfView.get()),
-                    getActiveDisplayPlugin()->getRecommendedAspectRatio(),
-                    DEFAULT_NEAR_CLIP * sensorToWorldScale,
-                    DEFAULT_FAR_CLIP);
-                _viewFrustum.setProjection(adjustedProjection);
-                _viewFrustum.calculate();
-            }
-            appRenderArgs._renderArgs = RenderArgs(_graphicsEngine->getGPUContext(), lodManager->getVisibilityDistance(),
-                lodManager->getBoundaryLevelAdjust(), lodManager->getLODFarHalfAngleTan(), lodManager->getLODNearHalfAngleTan(),
-                lodManager->getLODFarDistance(), lodManager->getLODNearDistance(), RenderArgs::DEFAULT_RENDER_MODE,
-                RenderArgs::MONO, RenderArgs::DEFERRED, RenderArgs::RENDER_DEBUG_NONE);
-            appRenderArgs._renderArgs._scene = getMain3DScene();
-
-            {
-                QMutexLocker viewLocker(&_viewMutex);
-                appRenderArgs._renderArgs.setViewFrustum(_viewFrustum);
-            }
-        }
-        {
-            PROFILE_RANGE(render, "/resizeGL");
-            bool showWarnings = false;
-            bool suppressShortTimings = false;
-            auto menu = Menu::getInstance();
-            if (menu) {
-                suppressShortTimings = menu->isOptionChecked(MenuOption::SuppressShortTimings);
-                showWarnings = menu->isOptionChecked(MenuOption::PipelineWarnings);
-            }
-            PerformanceWarning::setSuppressShortTimings(suppressShortTimings);
-            PerformanceWarning warn(showWarnings, "Application::paintGL()");
-            resizeGL();
-        }
-
-        this->updateCamera(appRenderArgs._renderArgs, deltaTime);
-        appRenderArgs._eyeToWorld = _myCamera.getTransform();
-        appRenderArgs._isStereo = false;
-
-        {
-            auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
-            float ipdScale = hmdInterface->getIPDScale();
-
-            // scale IPD by sensorToWorldScale, to make the world seem larger or smaller accordingly.
-            ipdScale *= sensorToWorldScale;
-
-            auto baseProjection = appRenderArgs._renderArgs.getViewFrustum().getProjection();
-
-            if (getActiveDisplayPlugin()->isStereo()) {
-                // Stereo modes will typically have a larger projection matrix overall,
-                // so we ask for the 'mono' projection matrix, which for stereo and HMD
-                // plugins will imply the combined projection for both eyes.
-                //
-                // This is properly implemented for the Oculus plugins, but for OpenVR
-                // and Stereo displays I'm not sure how to get / calculate it, so we're
-                // just relying on the left FOV in each case and hoping that the
-                // overall culling margin of error doesn't cause popping in the
-                // right eye.  There are FIXMEs in the relevant plugins
-                _myCamera.setProjection(getActiveDisplayPlugin()->getCullingProjection(baseProjection));
-                appRenderArgs._isStereo = true;
-
-                auto& eyeOffsets = appRenderArgs._eyeOffsets;
-                auto& eyeProjections = appRenderArgs._eyeProjections;
-
-                // FIXME we probably don't need to set the projection matrix every frame,
-                // only when the display plugin changes (or in non-HMD modes when the user
-                // changes the FOV manually, which right now I don't think they can.
-                for_each_eye([&](Eye eye) {
-                    // For providing the stereo eye views, the HMD head pose has already been
-                    // applied to the avatar, so we need to get the difference between the head
-                    // pose applied to the avatar and the per eye pose, and use THAT as
-                    // the per-eye stereo matrix adjustment.
-                    mat4 eyeToHead = getActiveDisplayPlugin()->getEyeToHeadTransform(eye);
-                    // Grab the translation
-                    vec3 eyeOffset = glm::vec3(eyeToHead[3]);
-                    // Apply IPD scaling
-                    mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * ipdScale);
-                    eyeOffsets[eye] = eyeOffsetTransform;
-                    eyeProjections[eye] = getActiveDisplayPlugin()->getEyeProjection(eye, baseProjection);
-                });
-
-                // Configure the type of display / stereo
-                appRenderArgs._renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR);
-            }
-        }
-
-        appRenderArgs._renderArgs._stencilMaskMode = getActiveDisplayPlugin()->getStencilMaskMode();
-        if (appRenderArgs._renderArgs._stencilMaskMode == StencilMaskMode::MESH) {
-            appRenderArgs._renderArgs._stencilMaskOperator = getActiveDisplayPlugin()->getStencilMaskMeshOperator();
-        }
-
-        {
-            QMutexLocker viewLocker(&_viewMutex);
-            _myCamera.loadViewFrustum(_displayViewFrustum);
-            appRenderArgs._view = glm::inverse(_displayViewFrustum.getView());
-        }
-
-        {
-            QMutexLocker viewLocker(&_viewMutex);
-            appRenderArgs._renderArgs.setViewFrustum(_displayViewFrustum);
-        }
-
-
-        // HACK
-        // load the view frustum
-        // FIXME: This preDisplayRender call is temporary until we create a separate render::scene for the mirror rendering.
-        // Then we can move this logic into the Avatar::simulate call.
-        myAvatar->preDisplaySide(&appRenderArgs._renderArgs);
-    });
-}
-
-void Application::queryAvatars() {
-    if (!isInterstitialMode()) {
-        auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
-        auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
-        unsigned char* bufferStart = destinationBuffer;
-
-        uint8_t numFrustums = (uint8_t)_conicalViews.size();
-        memcpy(destinationBuffer, &numFrustums, sizeof(numFrustums));
-        destinationBuffer += sizeof(numFrustums);
-
-        for (const auto& view : _conicalViews) {
-            destinationBuffer += view.serialize(destinationBuffer);
-        }
-
-        avatarPacket->setPayloadSize(destinationBuffer - bufferStart);
-
-        DependencyManager::get<NodeList>()->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
-    }
-}
-
-
-int Application::sendNackPackets() {
-
-    // iterates through all nodes in NodeList
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    int packetsSent = 0;
-
-    nodeList->eachNode([&](const SharedNodePointer& node){
-
-        if (node->getActiveSocket() && node->getType() == NodeType::EntityServer) {
-
-            auto nackPacketList = NLPacketList::create(PacketType::OctreeDataNack);
-
-            QUuid nodeUUID = node->getUUID();
-
-            // if there are octree packets from this node that are waiting to be processed,
-            // don't send a NACK since the missing packets may be among those waiting packets.
-            if (_octreeProcessor->hasPacketsToProcessFrom(nodeUUID)) {
-                return;
-            }
-
-            QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers;
-            _octreeServerSceneStats.withReadLock([&] {
-                // retrieve octree scene stats of this node
-                if (_octreeServerSceneStats.find(nodeUUID) == _octreeServerSceneStats.end()) {
-                    return;
-                }
-                // get sequence number stats of node, prune its missing set, and make a copy of the missing set
-                SequenceNumberStats& sequenceNumberStats = _octreeServerSceneStats[nodeUUID].getIncomingOctreeSequenceNumberStats();
-                sequenceNumberStats.pruneMissingSet();
-                missingSequenceNumbers = sequenceNumberStats.getMissingSet();
-            });
-
-            _isMissingSequenceNumbers = (missingSequenceNumbers.size() != 0);
-
-            // construct nack packet(s) for this node
-            foreach(const OCTREE_PACKET_SEQUENCE& missingNumber, missingSequenceNumbers) {
-                nackPacketList->writePrimitive(missingNumber);
-            }
-
-            if (nackPacketList->getNumPackets()) {
-                packetsSent += (int)nackPacketList->getNumPackets();
-
-                // send the packet list
-                nodeList->sendPacketList(std::move(nackPacketList), *node);
-            }
-        }
-    });
-
-    return packetsSent;
-}
-
-void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
-    if (!_settingsLoaded) {
-        return; // bail early if settings are not loaded
-    }
-
-    const bool isModifiedQuery = !_physicsEnabled;
-    if (isModifiedQuery) {
-        if (!_octreeProcessor->safeLandingIsActive()) {
-            // don't send the octreeQuery until SafeLanding knows it has started
-            return;
-        }
-        // Create modified view that is a simple sphere.
-        bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
-
-        ConicalViewFrustum sphericalView;
-        AABox box = getMyAvatar()->getGlobalBoundingBox();
-        float radius = glm::max(INITIAL_QUERY_RADIUS, 0.5f * glm::length(box.getDimensions()));
-        sphericalView.setPositionAndSimpleRadius(box.calcCenter(), radius);
-
-        if (interstitialModeEnabled) {
-            ConicalViewFrustum farView;
-            farView.set(_viewFrustum);
-            _octreeQuery.setConicalViews({ sphericalView, farView });
-        } else {
-            _octreeQuery.setConicalViews({ sphericalView });
-        }
-
-        _octreeQuery.setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);
-        static constexpr float MIN_LOD_ADJUST = -20.0f;
-        _octreeQuery.setBoundaryLevelAdjust(MIN_LOD_ADJUST);
-    } else {
-        _octreeQuery.setConicalViews(_conicalViews);
-        auto lodManager = DependencyManager::get<LODManager>();
-        _octreeQuery.setOctreeSizeScale(lodManager->getOctreeSizeScale());
-        _octreeQuery.setBoundaryLevelAdjust(lodManager->getBoundaryLevelAdjust());
-    }
-    _octreeQuery.setReportInitialCompletion(isModifiedQuery);
-
-
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    auto node = nodeList->soloNodeOfType(serverType);
-    if (node && node->getActiveSocket()) {
-        _octreeQuery.setMaxQueryPacketsPerSecond(getMaxOctreePacketsPerSecond());
-
-        auto queryPacket = NLPacket::create(packetType);
-
-        // encode the query data
-        auto packetData = reinterpret_cast<unsigned char*>(queryPacket->getPayload());
-        int packetSize = _octreeQuery.getBroadcastData(packetData);
-        queryPacket->setPayloadSize(packetSize);
-
-        // make sure we still have an active socket
-        nodeList->sendUnreliablePacket(*queryPacket, *node);
-    }
-}
-
-
-bool Application::isHMDMode() const {
-    return getActiveDisplayPlugin()->isHmd();
-}
-
-float Application::getNumCollisionObjects() const {
-    return _physicsEngine ? _physicsEngine->getNumCollisionObjects() : 0;
-}
-
-float Application::getTargetRenderFrameRate() const { return getActiveDisplayPlugin()->getTargetFrameRate(); }
-
-QRect Application::getDesirableApplicationGeometry() const {
-    QRect applicationGeometry = getWindow()->geometry();
-
-    // If our parent window is on the HMD, then don't use its geometry, instead use
-    // the "main screen" geometry.
-    HMDToolsDialog* hmdTools = DependencyManager::get<DialogsManager>()->getHMDToolsDialog();
-    if (hmdTools && hmdTools->hasHMDScreen()) {
-        QScreen* hmdScreen = hmdTools->getHMDScreen();
-        QWindow* appWindow = getWindow()->windowHandle();
-        QScreen* appScreen = appWindow->screen();
-
-        // if our app's screen is the hmd screen, we don't want to place the
-        // running scripts widget on it. So we need to pick a better screen.
-        // we will use the screen for the HMDTools since it's a guaranteed
-        // better screen.
-        if (appScreen == hmdScreen) {
-            QScreen* betterScreen = hmdTools->windowHandle()->screen();
-            applicationGeometry = betterScreen->geometry();
-        }
-    }
-    return applicationGeometry;
-}
-
-PickRay Application::computePickRay(float x, float y) const {
-    vec2 pickPoint { x, y };
-    PickRay result;
-    if (isHMDMode()) {
-        getApplicationCompositor().computeHmdPickRay(pickPoint, result.origin, result.direction);
-    } else {
-        pickPoint /= getCanvasSize();
-        if (_myCamera.getMode() == CameraMode::CAMERA_MODE_MIRROR) {
-            pickPoint.x = 1.0f - pickPoint.x;
-        }
-        QMutexLocker viewLocker(&_viewMutex);
-        _viewFrustum.computePickRay(pickPoint.x, pickPoint.y, result.origin, result.direction);
-    }
-    return result;
-}
-
-std::shared_ptr<MyAvatar> Application::getMyAvatar() const {
-    return DependencyManager::get<AvatarManager>()->getMyAvatar();
-}
-
-glm::vec3 Application::getAvatarPosition() const {
-    return getMyAvatar()->getWorldPosition();
-}
-
-void Application::copyViewFrustum(ViewFrustum& viewOut) const {
-    QMutexLocker viewLocker(&_viewMutex);
-    viewOut = _viewFrustum;
-}
-
-void Application::copyDisplayViewFrustum(ViewFrustum& viewOut) const {
-    QMutexLocker viewLocker(&_viewMutex);
-    viewOut = _displayViewFrustum;
-}
-
-// resentSensors() is a bit of vestigial feature. It used to be used for Oculus DK2 to recenter the view around
-// the current head orientation.  With the introduction of "room scale" tracking we no longer need that particular
-// feature.  However, we still use this to reset face trackers, eye trackers, audio and to optionally re-load the avatar
-// rig and animations from scratch.
-void Application::resetSensors(bool andReload) {
-    _overlayConductor.centerUI();
-    getActiveDisplayPlugin()->resetSensors();
-    getMyAvatar()->reset(true, andReload);
-    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
-}
-
-void Application::hmdVisibleChanged(bool visible) {
-    // TODO
-    // calling start and stop will change audio input and ouput to default audio devices.
-    // we need to add a pause/unpause functionality to AudioClient for this to work properly
-#if 0
-    if (visible) {
-        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "start", Qt::QueuedConnection);
-    } else {
-        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "stop", Qt::QueuedConnection);
-    }
-#endif
-}
-
-void Application::updateWindowTitle() const {
-
-    auto nodeList = DependencyManager::get<NodeList>();
-    auto accountManager = DependencyManager::get<AccountManager>();
-    auto domainAccountManager = DependencyManager::get<DomainAccountManager>();
-    auto isInErrorState = nodeList->getDomainHandler().isInErrorState();
-    bool isMetaverseLoggedIn = accountManager->isLoggedIn();
-    bool hasDomainLogIn = domainAccountManager->hasLogIn();
-    bool isDomainLoggedIn = domainAccountManager->isLoggedIn();
-    QString authedDomainName = domainAccountManager->getAuthedDomainName();
-
-    QString buildVersion = " - Overte - "
-        + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
-        + " " + applicationVersion();
-
-    if (BuildInfo::RELEASE_NAME != "") {
-        buildVersion += " - " + BuildInfo::RELEASE_NAME;
-    }
-
-    QString connectionStatus = isInErrorState ? " (ERROR CONNECTING)" :
-        nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
-
-    QString metaverseUsername = accountManager->getAccountInfo().getUsername();
-    QString domainUsername = domainAccountManager->getUsername();
-
-    auto &ch = CrashHandler::getInstance();
-    ch.setAnnotation("sentry[user][username]", metaverseUsername.toStdString());
-
-    QString currentPlaceName;
-    if (isServerlessMode()) {
-        if (isInErrorState) {
-            currentPlaceName = "Serverless: " + nodeList->getDomainHandler().getErrorDomainURL().toString();
-        } else {
-            currentPlaceName = "Serverless: " + DependencyManager::get<AddressManager>()->getDomainURL().toString();
-        }
-    } else {
-        currentPlaceName = DependencyManager::get<AddressManager>()->getDomainURL().host();
-        if (currentPlaceName.isEmpty()) {
-            currentPlaceName = nodeList->getDomainHandler().getHostname();
-        }
-    }
-
-    QString metaverseDetails;
-    if (isMetaverseLoggedIn) {
-        metaverseDetails = " (Directory Services: Connected to " + MetaverseAPI::getCurrentMetaverseServerURL().toString() + " as " + metaverseUsername + ")";
-    } else {
-        metaverseDetails = " (Directory Services: Not Logged In)";
-    }
-
-    QString domainDetails;
-    if (hasDomainLogIn) {
-        if (currentPlaceName == authedDomainName && isDomainLoggedIn) {
-            domainDetails = " (Domain: Logged in as " + domainUsername + ")";
-        } else {
-            domainDetails = " (Domain: Not Logged In)";
-        }
-    } else {
-        domainDetails = "";
-    }
-
-    QString title = currentPlaceName + connectionStatus + metaverseDetails + domainDetails + buildVersion;
-
-#ifndef WIN32
-    // crashes with vs2013/win32
-    qCDebug(interfaceapp, "Application title set to: %s", title.toStdString().c_str());
-#endif
-    _window->setWindowTitle(title);
-
-    // updateTitleWindow gets called whenever there's a change regarding the domain, so rather
-    // than placing this within domainURLChanged, it's placed here to cover the other potential cases.
-    DependencyManager::get< MessagesClient >()->sendLocalMessage("Toolbar-DomainChanged", "");
-}
-
-void Application::clearDomainOctreeDetails(bool clearAll) {
-    // if we're about to quit, we really don't need to do the rest of these things...
-    if (_aboutToQuit) {
-        return;
-    }
-
-    qCDebug(interfaceapp) << "Clearing domain octree details...";
-
-    resetPhysicsReadyInformation();
-    setIsInterstitialMode(true);
-
-    _octreeServerSceneStats.withWriteLock([&] {
-        _octreeServerSceneStats.clear();
-    });
-
-    // reset the model renderer
-    clearAll ? getEntities()->clear() : getEntities()->clearDomainAndNonOwnedEntities();
-
-    DependencyManager::get<AnimationCache>()->clearUnusedResources();
-    DependencyManager::get<SoundCache>()->clearUnusedResources();
-    DependencyManager::get<MaterialCache>()->clearUnusedResources();
-    DependencyManager::get<ModelCache>()->clearUnusedResources();
-    ShaderCache::instance().clearUnusedResources();
-    DependencyManager::get<TextureCache>()->clearUnusedResources();
-    DependencyManager::get<recording::ClipCache>()->clearUnusedResources();
-}
-
-void Application::domainURLChanged(QUrl domainURL) {
-    // disable physics until we have enough information about our new location to not cause craziness.
-    setIsServerlessMode(domainURL.scheme() != URL_SCHEME_OVERTE);
-    if (isServerlessMode()) {
-        loadServerlessDomain(domainURL);
-    }
-    updateWindowTitle();
-}
-
-void Application::goToErrorDomainURL(QUrl errorDomainURL) {
-    // disable physics until we have enough information about our new location to not cause craziness.
-    setIsServerlessMode(errorDomainURL.scheme() != URL_SCHEME_OVERTE);
-    if (isServerlessMode()) {
-        loadErrorDomain(errorDomainURL);
-    }
-    updateWindowTitle();
-}
-
-void Application::resettingDomain() {
-    _notifiedPacketVersionMismatchThisDomain = false;
-
-    clearDomainOctreeDetails(false);
-}
-
-void Application::nodeAdded(SharedNodePointer node) {
-    if (node->getType() == NodeType::EntityServer) {
-        if (_failedToConnectToEntityServer && !_entityServerConnectionTimer.isActive()) {
-            _octreeProcessor->stopSafeLanding();
-            _failedToConnectToEntityServer = false;
-        } else if (_entityServerConnectionTimer.isActive()) {
-            _entityServerConnectionTimer.stop();
-        }
-        _octreeProcessor->startSafeLanding();
-        _entityServerConnectionTimer.setInterval(ENTITY_SERVER_CONNECTION_TIMEOUT);
-        _entityServerConnectionTimer.start();
-    }
-}
-
-void Application::nodeActivated(SharedNodePointer node) {
-    if (node->getType() == NodeType::AssetServer) {
-        // asset server just connected - check if we have the asset browser showing
-
-#if !defined(DISABLE_QML)
-        auto offscreenUi = getOffscreenUI();
-        if (offscreenUi) {
-            auto nodeList = DependencyManager::get<NodeList>();
-
-            if (nodeList->getThisNodeCanWriteAssets()) {
-                // call reload on the shown asset browser dialog to get the mappings (if permissions allow)
-                auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
-                if (assetDialog) {
-                    QMetaObject::invokeMethod(assetDialog, "reload");
-                }
-            } else {
-                // we switched to an Asset Server that we can't modify, hide the Asset Browser
-                offscreenUi->hide("AssetServer");
-            }
-        }
-#endif
-    }
-
-    // If we get a new EntityServer activated, reset lastQueried time
-    // so we will do a proper query during update
-    if (node->getType() == NodeType::EntityServer) {
-        _queryExpiry = SteadyClock::now();
-        _octreeQuery.incrementConnectionID();
-
-        if  (!_failedToConnectToEntityServer) {
-            _entityServerConnectionTimer.stop();
-        }
-    }
-
-    if (node->getType() == NodeType::AudioMixer && !isInterstitialMode()) {
-        DependencyManager::get<AudioClient>()->negotiateAudioFormat();
-    }
-
-    if (node->getType() == NodeType::AvatarMixer) {
-        _queryExpiry = SteadyClock::now();
-
-        // new avatar mixer, send off our identity packet on next update loop
-        // Reset skeletonModelUrl if the last server modified our choice.
-        // Override the avatar url (but not model name) here too.
-        if (_avatarOverrideUrl.isValid()) {
-            getMyAvatar()->useFullAvatarURL(_avatarOverrideUrl);
-        }
-
-        if (getMyAvatar()->getFullAvatarURLFromPreferences() != getMyAvatar()->getSkeletonModelURL()) {
-            getMyAvatar()->resetFullAvatarURL();
-        }
-        getMyAvatar()->markIdentityDataChanged();
-        getMyAvatar()->resetLastSent();
-
-        if (!isInterstitialMode()) {
-            // transmit a "sendAll" packet to the AvatarMixer we just connected to.
-            getMyAvatar()->sendAvatarDataPacket(true);
-        }
-    }
-}
-
-void Application::nodeKilled(SharedNodePointer node) {
-    // These are here because connecting NodeList::nodeKilled to OctreePacketProcessor::nodeKilled doesn't work:
-    // OctreePacketProcessor::nodeKilled is not being called when NodeList::nodeKilled is emitted.
-    // This may have to do with GenericThread::threadRoutine() blocking the QThread event loop
-
-    _octreeProcessor->nodeKilled(node);
-
-    _entityEditSender->nodeKilled(node);
-
-    if (node->getType() == NodeType::AudioMixer) {
-        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "audioMixerKilled");
-    } else if (node->getType() == NodeType::EntityServer) {
-        // we lost an entity server, clear all of the domain octree details
-        clearDomainOctreeDetails(false);
-    } else if (node->getType() == NodeType::AssetServer) {
-        // asset server going away - check if we have the asset browser showing
-
-#if !defined(DISABLE_QML)
-        auto offscreenUi = getOffscreenUI();
-        auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
-
-        if (assetDialog) {
-            // call reload on the shown asset browser dialog
-            QMetaObject::invokeMethod(assetDialog, "clear");
-        }
-#endif
-    }
-}
-
-void Application::trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket) {
-    // Attempt to identify the sender from its address.
-    if (sendingNode) {
-        const QUuid& nodeUUID = sendingNode->getUUID();
-
-        // now that we know the node ID, let's add these stats to the stats for that node...
-        _octreeServerSceneStats.withWriteLock([&] {
-            if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) {
-                OctreeSceneStats& stats = _octreeServerSceneStats[nodeUUID];
-                stats.trackIncomingOctreePacket(message, wasStatsPacket, sendingNode->getClockSkewUsec());
-            }
-        });
-    }
-}
-
-bool Application::gpuTextureMemSizeStable() {
-    auto renderConfig = qApp->getRenderEngine()->getConfiguration();
-    auto renderStats = renderConfig->getConfig<render::EngineStats>("Stats");
-
-    qint64 textureResourceGPUMemSize = renderStats->textureResourceGPUMemSize;
-    qint64 texturePopulatedGPUMemSize = renderStats->textureResourcePopulatedGPUMemSize;
-    qint64 textureTransferSize = renderStats->texturePendingGPUTransferSize;
-
-    if (_gpuTextureMemSizeAtLastCheck == textureResourceGPUMemSize) {
-        _gpuTextureMemSizeStabilityCount++;
-    } else {
-        _gpuTextureMemSizeStabilityCount = 0;
-    }
-    _gpuTextureMemSizeAtLastCheck = textureResourceGPUMemSize;
-
-    if (_gpuTextureMemSizeStabilityCount >= _minimumGPUTextureMemSizeStabilityCount) {
-        return (textureResourceGPUMemSize == texturePopulatedGPUMemSize) && (textureTransferSize == 0);
-    }
-    return false;
-}
-
-int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode) {
-    // parse the incoming stats datas stick it in a temporary object for now, while we
-    // determine which server it belongs to
-    int statsMessageLength = 0;
-
-    const QUuid& nodeUUID = sendingNode->getUUID();
-
-    // now that we know the node ID, let's add these stats to the stats for that node...
-    _octreeServerSceneStats.withWriteLock([&] {
-        OctreeSceneStats& octreeStats = _octreeServerSceneStats[nodeUUID];
-        statsMessageLength = octreeStats.unpackFromPacket(message);
-
-        if (octreeStats.isFullScene()) {
-            _fullSceneReceivedCounter++;
-        }
-    });
-
-    return statsMessageLength;
-}
-
-void Application::registerScriptEngineWithApplicationServices(ScriptManagerPointer& scriptManager) {
-
-    auto scriptEngine = scriptManager->engine();
-    scriptManager->setEmitScriptUpdatesFunction([this]() {
-        SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
-        return !entityServerNode || isPhysicsEnabled();
-    });
-
-    // setup the packet sender of the script engine's scripting interfaces so
-    // we can use the same ones from the application.
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    entityScriptingInterface->setPacketSender(_entityEditSender.get());
-    entityScriptingInterface->setEntityTree(getEntities()->getTree());
-
-    if (property(hifi::properties::TEST).isValid()) {
-        scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance());
-    }
-
-    scriptEngine->registerGlobalObject("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
-    scriptEngine->registerGlobalObject("Rates", new RatesScriptingInterface(this));
-
-    scriptEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarManager>().data());
-
-    scriptEngine->registerGlobalObject("Camera", &_myCamera);
-    scriptEngine->registerGlobalObject("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
-
-#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
-    scriptEngine->registerGlobalObject("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
-#endif
-
-    ClipboardScriptingInterface* clipboardScriptable = new ClipboardScriptingInterface();
-    scriptEngine->registerGlobalObject("Clipboard", clipboardScriptable);
-    connect(scriptManager.get(), &ScriptManager::finished, clipboardScriptable, &ClipboardScriptingInterface::deleteLater);
-
-    scriptEngine->registerGlobalObject("Overlays", &_overlays);
-
-    bool clientScript = scriptManager->isClientScript();
-
-#if !defined(DISABLE_QML)
-    scriptEngine->registerGlobalObject("OffscreenFlags", getOffscreenUI()->getFlags());
-    if (clientScript) {
-        scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
-    } else {
-        auto desktopScriptingInterface = new DesktopScriptingInterface(nullptr, true);
-        scriptEngine->registerGlobalObject("Desktop", desktopScriptingInterface);
-        if (QThread::currentThread() != thread()) {
-            desktopScriptingInterface->moveToThread(thread());
-        }
-    }
-#endif
-
-    scriptEngine->registerGlobalObject("Toolbars", DependencyManager::get<ToolbarScriptingInterface>().data());
-
-    scriptEngine->registerGlobalObject("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
-    // FIXME remove these deprecated names for the tablet scripting interface
-    scriptEngine->registerGlobalObject("tabletInterface", DependencyManager::get<TabletScriptingInterface>().data());
-
-    auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>().data();
-    DependencyManager::get<TabletScriptingInterface>().data()->setToolbarScriptingInterface(toolbarScriptingInterface);
-
-    scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
-    scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
-                        LocationScriptingInterface::locationSetter, "Window");
-    // register `location` on the global object.
-    scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
-                                       LocationScriptingInterface::locationSetter);
-
-    scriptEngine->registerFunction("OverlayWindow", clientScript ? QmlWindowClass::constructor : QmlWindowClass::restricted_constructor);
-#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
-    scriptEngine->registerFunction("OverlayWebWindow", clientScript ? QmlWebWindowClass::constructor : QmlWebWindowClass::restricted_constructor);
-#endif
-    scriptEngine->registerFunction("QmlFragment", clientScript ? QmlFragmentClass::constructor : QmlFragmentClass::restricted_constructor);
-
-    scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
-    scriptEngine->registerGlobalObject("DesktopPreviewProvider", DependencyManager::get<DesktopPreviewProvider>().data());
-#if !defined(DISABLE_QML)
-    scriptEngine->registerGlobalObject("Stats", Stats::getInstance());
-#endif
-    scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
-    scriptEngine->registerGlobalObject("Snapshot", DependencyManager::get<Snapshot>().data());
-    scriptEngine->registerGlobalObject("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
-    scriptEngine->registerGlobalObject("AudioScope", DependencyManager::get<AudioScope>().data());
-    scriptEngine->registerGlobalObject("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
-    scriptEngine->registerGlobalObject("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
-
-    scriptEngine->registerGlobalObject("RayPick", DependencyManager::get<RayPickScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("Picks", DependencyManager::get<PickScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("Pointers", DependencyManager::get<PointerScriptingInterface>().data());
-
-    // Caches
-    scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCacheScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("TextureCache", DependencyManager::get<TextureCacheScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("MaterialCache", DependencyManager::get<MaterialCacheScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("ModelCache", DependencyManager::get<ModelCacheScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
-
-    scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface);
-
-    scriptEngine->registerGlobalObject("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-    scriptEngine->registerGlobalObject("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
-    scriptEngine->registerGlobalObject("AccountServices", AccountServicesScriptingInterface::getInstance());
-
-    scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data());
-
-    scriptEngine->registerGlobalObject("LODManager", DependencyManager::get<LODManager>().data());
-
-    scriptEngine->registerGlobalObject("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("Performance", new PerformanceScriptingInterface());
-
-    scriptEngine->registerGlobalObject("Paths", DependencyManager::get<PathUtils>().data());
-
-    scriptEngine->registerGlobalObject("HMD", DependencyManager::get<HMDScriptingInterface>().data());
-    scriptEngine->registerFunction("HMD", "getHUDLookAtPosition2D", HMDScriptingInterface::getHUDLookAtPosition2D, 0);
-    scriptEngine->registerFunction("HMD", "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0);
-
-    scriptEngine->registerGlobalObject("Scene", DependencyManager::get<SceneScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("Render", RenderScriptingInterface::getInstance());
-    scriptEngine->registerGlobalObject("Workload", _gameWorkload._engine->getConfiguration().get());
-
-    scriptEngine->registerGlobalObject("Graphics", DependencyManager::get<GraphicsScriptingInterface>().data());
-
-    scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
-    scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
-
-    scriptEngine->registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("Users", DependencyManager::get<UsersScriptingInterface>().data());
-
-    //scriptEngine->registerGlobalObject("GooglePoly", DependencyManager::get<GooglePolyScriptingInterface>().data());
-
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        scriptEngine->registerGlobalObject("Steam", new SteamScriptingInterface(scriptManager.get(), steamClient.get()));
-    }
-    auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
-    scriptEngine->registerGlobalObject("Controller", scriptingInterface.data());
-
-    {
-        auto connection = std::make_shared<QMetaObject::Connection>();
-        *connection = scriptManager->connect(scriptManager.get(), &ScriptManager::scriptEnding, [scriptManager, connection]() {
-            // Request removal of controller routes with callbacks to a given script engine
-            auto userInputMapper = DependencyManager::get<UserInputMapper>();
-            // scheduleScriptEndpointCleanup will have the last instance of shared pointer to script manager
-            // so script manager will get deleted as soon as cleanup is done
-            userInputMapper->scheduleScriptEndpointCleanup(scriptManager);
-            QObject::disconnect(*connection);
-        });
-    }
-
-    UserInputMapper::registerControllerTypes(scriptEngine.get());
-
-    auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
-    scriptEngine->registerGlobalObject("Recording", recordingInterface.data());
-
-    auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
-    scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());
-    scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
-    scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
-    scriptEngine->registerGlobalObject("AddressManager", DependencyManager::get<AddressManager>().data());
-    scriptEngine->registerGlobalObject("About", AboutUtil::getInstance());
-    scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance());  // Deprecated.
-    scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
-
-    // connect this script engines printedMessage signal to the global ScriptEngines these various messages
-    auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
-    connect(scriptManager.get(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage);
-    connect(scriptManager.get(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage);
-    connect(scriptManager.get(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage);
-    connect(scriptManager.get(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage);
-    connect(scriptManager.get(), &ScriptManager::clearDebugWindow, scriptEngines, &ScriptEngines::onClearDebugWindow);
-
-}
-
-bool Application::canAcceptURL(const QString& urlString) const {
-    QUrl url(urlString);
-    if (url.query().contains(WEB_VIEW_TAG)) {
-        return false;
-    } else if (urlString.startsWith(URL_SCHEME_OVERTE)) {
-        return true;
-    }
-    QString lowerPath = url.path().toLower();
-    for (auto& pair : _acceptedExtensions) {
-        if (lowerPath.endsWith(pair.first, Qt::CaseInsensitive)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
-    QUrl url(urlString);
-
-    if (url.scheme() == URL_SCHEME_OVERTE) {
-        // this is a hifi URL - have the AddressManager handle it
-        QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
-                                  Qt::AutoConnection, Q_ARG(const QString&, urlString));
-        return true;
-    }
-
-    QString lowerPath = url.path().toLower();
-    for (auto& pair : _acceptedExtensions) {
-        if (lowerPath.endsWith(pair.first, Qt::CaseInsensitive)) {
-            AcceptURLMethod method = pair.second;
-            return (this->*method)(urlString);
-        }
-    }
-
-    if (defaultUpload && !url.fileName().isEmpty() && url.isLocalFile()) {
-        showAssetServerWidget(urlString);
-    }
-    return defaultUpload;
-}
-
-void Application::setSessionUUID(const QUuid& sessionUUID) const {
-    Physics::setSessionUUID(sessionUUID);
-}
-
-bool Application::askToSetAvatarUrl(const QString& url) {
-    QUrl realUrl(url);
-    if (realUrl.isLocalFile()) {
-        OffscreenUi::asyncWarning("", "You can not use local files for avatar components.");
-        return false;
-    }
-
-    // Download the FST file, to attempt to determine its model type
-    QVariantHash fstMapping = FSTReader::downloadMapping(url);
-
-    FSTReader::ModelType modelType = FSTReader::predictModelType(fstMapping);
-
-    QString modelName = fstMapping["name"].toString();
-    QString modelLicense = fstMapping["license"].toString();
-
-    bool agreeToLicense = true; // assume true
-    //create set avatar callback
-    auto setAvatar = [=] (QString url, QString modelName) {
-        ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Set Avatar",
-                                                              "Would you like to use '" + modelName + "' for your avatar?",
-                                                              QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
-        QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
-            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-
-            bool ok = (QMessageBox::Ok == static_cast<QMessageBox::StandardButton>(answer.toInt()));
-            if (ok) {
-                getMyAvatar()->useFullAvatarURL(url, modelName);
-                emit fullAvatarURLChanged(url, modelName);
-            } else {
-                qCDebug(interfaceapp) << "Declined to use the avatar";
-            }
-        });
-    };
-
-    if (!modelLicense.isEmpty()) {
-        // word wrap the license text to fit in a reasonable shaped message box.
-        const int MAX_CHARACTERS_PER_LINE = 90;
-        modelLicense = simpleWordWrap(modelLicense, MAX_CHARACTERS_PER_LINE);
-
-        ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Avatar Usage License",
-                                                              modelLicense + "\nDo you agree to these terms?",
-                                                              QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
-        QObject::connect(dlg, &ModalDialogListener::response, this, [=, &agreeToLicense] (QVariant answer) {
-            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-
-            agreeToLicense = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
-            if (agreeToLicense) {
-                switch (modelType) {
-                    case FSTReader::HEAD_AND_BODY_MODEL: {
-                    setAvatar(url, modelName);
-                    break;
-                }
-                default:
-                    OffscreenUi::asyncWarning("", modelName + "Does not support a head and body as required.");
-                    break;
-                }
-            } else {
-                qCDebug(interfaceapp) << "Declined to agree to avatar license";
-            }
-
-            //auto offscreenUi = getOffscreenUI();
-        });
-    } else {
-        setAvatar(url, modelName);
-    }
-
-    return true;
-}
-
-
-bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
-    QString shortName = scriptFilenameOrURL;
-
-    QUrl scriptURL { scriptFilenameOrURL };
-
-    if (scriptURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
-        int startIndex = shortName.lastIndexOf('/') + 1;
-        int endIndex = shortName.lastIndexOf('?');
-        shortName = shortName.mid(startIndex, endIndex - startIndex);
-    }
-
-#ifdef DISABLE_QML
-    DependencyManager::get<ScriptEngines>()->loadScript(scriptFilenameOrURL);
-#else
-    QString message = "Would you like to run this script:\n" + shortName;
-    ModalDialogListener* dlg = OffscreenUi::asyncQuestion(getWindow(), "Run Script", message,
-                                                           QMessageBox::Yes | QMessageBox::No);
-
-    QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
-        const QString& fileName = scriptFilenameOrURL;
-        if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
-            qCDebug(interfaceapp) << "Chose to run the script: " << fileName;
-            DependencyManager::get<ScriptEngines>()->loadScript(fileName);
-        } else {
-            qCDebug(interfaceapp) << "Declined to run the script";
-        }
-        QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-    });
-#endif
-    return true;
-}
-
-bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
-    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
-    QNetworkRequest networkRequest = QNetworkRequest(url);
-    networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
-    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
-    QNetworkReply* reply = networkAccessManager.get(networkRequest);
-    int requestNumber = ++_avatarAttachmentRequest;
-    connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() {
-
-        if (requestNumber != _avatarAttachmentRequest) {
-            // this request has been superseded by another more recent request
-            reply->deleteLater();
-            return;
-        }
-
-        QNetworkReply::NetworkError networkError = reply->error();
-        if (networkError == QNetworkReply::NoError) {
-            // download success
-            QByteArray contents = reply->readAll();
-
-            QJsonParseError jsonError;
-            auto doc = QJsonDocument::fromJson(contents, &jsonError);
-            if (jsonError.error == QJsonParseError::NoError) {
-
-                auto jsonObject = doc.object();
-
-                // retrieve optional name field from JSON
-                QString name = tr("Unnamed Attachment");
-                auto nameValue = jsonObject.value("name");
-                if (nameValue.isString()) {
-                    name = nameValue.toString();
-                }
-
-                auto avatarAttachmentConfirmationTitle = tr("Avatar Attachment Confirmation");
-                auto avatarAttachmentConfirmationMessage = tr("Would you like to wear '%1' on your avatar?").arg(name);
-                ModalDialogListener* dlg = OffscreenUi::asyncQuestion(avatarAttachmentConfirmationTitle,
-                                           avatarAttachmentConfirmationMessage,
-                                           QMessageBox::Ok | QMessageBox::Cancel);
-                QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
-                    QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-                    if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
-                        // add attachment to avatar
-                        auto myAvatar = getMyAvatar();
-                        assert(myAvatar);
-                        auto attachmentDataVec = myAvatar->getAttachmentData();
-                        AttachmentData attachmentData;
-                        attachmentData.fromJson(jsonObject);
-                        attachmentDataVec.push_back(attachmentData);
-                        myAvatar->setAttachmentData(attachmentDataVec);
-                    } else {
-                        qCDebug(interfaceapp) << "User declined to wear the avatar attachment";
-                    }
-                });
-            } else {
-                // json parse error
-                auto avatarAttachmentParseErrorString = tr("Error parsing attachment JSON from url: \"%1\"");
-                displayAvatarAttachmentWarning(avatarAttachmentParseErrorString.arg(url));
-            }
-        } else {
-            // download failure
-            auto avatarAttachmentDownloadErrorString = tr("Error downloading attachment JSON from url: \"%1\"");
-            displayAvatarAttachmentWarning(avatarAttachmentDownloadErrorString.arg(url));
-        }
-        reply->deleteLater();
-    });
-    return true;
-}
-
-static const QString CONTENT_SET_NAME_QUERY_PARAM = "name";
-
-void Application::replaceDomainContent(const QString& url, const QString& itemName) {
-    qCDebug(interfaceapp) << "Attempting to replace domain content";
-    QUrl msgUrl(url);
-    QUrlQuery urlQuery(msgUrl.query());
-    urlQuery.addQueryItem(CONTENT_SET_NAME_QUERY_PARAM, itemName);
-    msgUrl.setQuery(urlQuery.query(QUrl::QUrl::FullyEncoded));
-    QByteArray urlData(msgUrl.toString(QUrl::QUrl::FullyEncoded).toUtf8());
-    auto limitedNodeList = DependencyManager::get<NodeList>();
-    const auto& domainHandler = limitedNodeList->getDomainHandler();
-
-    auto octreeFilePacket = NLPacket::create(PacketType::DomainContentReplacementFromUrl, urlData.size(), true);
-    octreeFilePacket->write(urlData);
-    limitedNodeList->sendPacket(std::move(octreeFilePacket), domainHandler.getSockAddr());
-
-    auto addressManager = DependencyManager::get<AddressManager>();
-    addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
-    QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
-    qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
-    DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
-}
-
-bool Application::askToReplaceDomainContent(const QString& url) {
-    QString methodDetails;
-    const int MAX_CHARACTERS_PER_LINE = 90;
-    if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
-        QUrl originURL { url };
-        if (originURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
-            // Create a confirmation dialog when this call is made
-            static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
-                "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
-                "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
-                "\nhttps://docs.overte.org/host/maintain-domain/backup-domain.html";
-
-            ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
-                                                                  infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-
-            QObject::connect(dig, &ModalDialogListener::response, this, [=] (QVariant answer) {
-                QString details;
-                if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
-                    // Given confirmation, send request to domain server to replace content
-                    replaceDomainContent(url, QString());
-                    details = "SuccessfulRequestToReplaceContent";
-                } else {
-                    details = "UserDeclinedToReplaceContent";
-                }
-                QJsonObject messageProperties = {
-                    { "status", details },
-                    { "content_set_url", url }
-                };
-                UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
-                QObject::disconnect(dig, &ModalDialogListener::response, this, nullptr);
-            });
-        } else {
-            methodDetails = "ContentSetDidNotOriginateFromMarketplace";
-            QJsonObject messageProperties = {
-                { "status", methodDetails },
-                { "content_set_url", url }
-            };
-            UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
-        }
-    } else {
-            methodDetails = "UserDoesNotHavePermissionToReplaceContent";
-            static const QString warningMessage = simpleWordWrap("The domain owner must enable 'Replace Content' "
-                "permissions for you in this domain's server settings before you can continue.", MAX_CHARACTERS_PER_LINE);
-            OffscreenUi::asyncWarning("You do not have permissions to replace domain content", warningMessage,
-                                 QMessageBox::Ok, QMessageBox::Ok);
-
-            QJsonObject messageProperties = {
-                { "status", methodDetails },
-                { "content_set_url", url }
-            };
-            UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
-    }
-    return true;
-}
-
-void Application::displayAvatarAttachmentWarning(const QString& message) const {
-    auto avatarAttachmentWarningTitle = tr("Avatar Attachment Failure");
-    OffscreenUi::asyncWarning(avatarAttachmentWarningTitle, message);
-}
-
-void Application::showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const {
-    auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet(SYSTEM_TABLET);
-    auto hmd = DependencyManager::get<HMDScriptingInterface>();
-    bool onTablet = false;
-
-    if (!tablet->getToolbarMode()) {
-        onTablet = tablet->pushOntoStack(tabletUrl);
-        if (onTablet) {
-            toggleTabletUI(true);
-        }
-    } else {
-#if !defined(DISABLE_QML)
-        getOffscreenUI()->show(widgetUrl, name);
-#endif
-    }
-}
-
-void Application::showScriptLogs() {
-    QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
-    defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/debugging/debugWindow.js");
-    DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
-}
-
-void Application::showAssetServerWidget(QString filePath) {
-    if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets() || getLoginDialogPoppedUp()) {
-        return;
-    }
-    static const QUrl url { "hifi/AssetServer.qml" };
-
-    auto startUpload = [=](QQmlContext* context, QObject* newObject){
-        if (!filePath.isEmpty()) {
-            emit uploadRequest(filePath);
-        }
-    };
-    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
-    auto hmd = DependencyManager::get<HMDScriptingInterface>();
-    if (tablet->getToolbarMode()) {
-        getOffscreenUI()->show(url, "AssetServer", startUpload);
-    } else {
-        if (!hmd->getShouldShowTablet() && !isHMDMode()) {
-            getOffscreenUI()->show(url, "AssetServer", startUpload);
-        } else {
-            static const QUrl url("qrc:///qml/hifi/dialogs/TabletAssetServer.qml");
-            if (!tablet->isPathLoaded(url)) {
-                tablet->pushOntoStack(url);
-            }
-        }
-    }
-
-    startUpload(nullptr, nullptr);
-}
-
-void Application::addAssetToWorldFromURL(QString url) {
-
-    QString filename;
-    if (url.contains("filename")) {
-        filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
-    }
-    if (url.contains("poly.google.com/downloads")) {
-        filename = url.section('/', -1);
-        if (url.contains("noDownload")) {
-            filename.remove(".zip?noDownload=false");
-        } else {
-            filename.remove(".zip");
-        }
-
-    }
-
-    if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
-        QString errorInfo = "You do not have permissions to write to the Asset Server.";
-        qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-        addAssetToWorldError(filename, errorInfo);
-        return;
-    }
-
-    addAssetToWorldInfo(filename, "Downloading model file " + filename + ".");
-
-    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
-        nullptr, QUrl(url), true, -1, "Application::addAssetToWorldFromURL");
-    connect(request, &ResourceRequest::finished, this, &Application::addAssetToWorldFromURLRequestFinished);
-    request->send();
-}
-
-void Application::addAssetToWorldFromURLRequestFinished() {
-    auto request = qobject_cast<ResourceRequest*>(sender());
-    Q_ASSERT(request != nullptr);
-    auto url = request->getUrl().toString();
-    auto result = request->getResult();
-
-    QString filename;
-    bool isBlocks = false;
-
-    if (url.contains("filename")) {
-        filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
-    }
-    if (url.contains("poly.google.com/downloads")) {
-        filename = url.section('/', -1);
-        if (url.contains("noDownload")) {
-            filename.remove(".zip?noDownload=false");
-        } else {
-            filename.remove(".zip");
-        }
-        isBlocks = true;
-    }
-
-    if (result == ResourceRequest::Success) {
-        QTemporaryDir temporaryDir;
-        temporaryDir.setAutoRemove(false);
-        if (temporaryDir.isValid()) {
-            QString temporaryDirPath = temporaryDir.path();
-            QString downloadPath = temporaryDirPath + "/" + filename;
-
-            QFile tempFile(downloadPath);
-            if (tempFile.open(QIODevice::WriteOnly)) {
-                tempFile.write(request->getData());
-                addAssetToWorldInfoClear(filename);  // Remove message from list; next one added will have a different key.
-                tempFile.close();
-                qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false, isBlocks);
-            } else {
-                QString errorInfo = "Couldn't open temporary file for download";
-                qWarning(interfaceapp) << errorInfo;
-                addAssetToWorldError(filename, errorInfo);
-            }
-        } else {
-            QString errorInfo = "Couldn't create temporary directory for download";
-            qWarning(interfaceapp) << errorInfo;
-            addAssetToWorldError(filename, errorInfo);
-        }
-    } else {
-        qWarning(interfaceapp) << "Error downloading" << url << ":" << request->getResultString();
-        addAssetToWorldError(filename, "Error downloading " + filename + " : " + request->getResultString());
-    }
-
-    request->deleteLater();
-}
-
-
-QString filenameFromPath(QString filePath) {
-    return filePath.right(filePath.length() - filePath.lastIndexOf("/") - 1);
-}
-
-void Application::addAssetToWorldUnzipFailure(QString filePath) {
-    QString filename = filenameFromPath(QUrl(filePath).toLocalFile());
-    qWarning(interfaceapp) << "Couldn't unzip file" << filePath;
-    addAssetToWorldError(filename, "Couldn't unzip file " + filename + ".");
-}
-
-void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, bool isBlocks) {
-    // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
-    QString mapping;
-    QString filename = filenameFromPath(path);
-    if (isZip || isBlocks) {
-        QString assetName = zipFile.section("/", -1).remove(QRegExp("[.]zip(.*)$"));
-        QString assetFolder = path.section("model_repo/", -1);
-        mapping = "/" + assetName + "/" + assetFolder;
-    } else {
-        mapping = "/" + filename;
-    }
-
-    // Test repeated because possibly different code paths.
-    if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
-        QString errorInfo = "You do not have permissions to write to the Asset Server.";
-        qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-        addAssetToWorldError(filename, errorInfo);
-        return;
-    }
-
-    addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server.");
-
-    addAssetToWorldWithNewMapping(path, mapping, 0, isZip, isBlocks);
-}
-
-void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isZip, bool isBlocks) {
-    auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
-
-    QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
-        const int MAX_COPY_COUNT = 100;  // Limit number of duplicate assets; recursion guard.
-        auto result = request->getError();
-        if (result == GetMappingRequest::NotFound) {
-            addAssetToWorldUpload(filePath, mapping, isZip, isBlocks);
-        } else if (result != GetMappingRequest::NoError) {
-            QString errorInfo = "Could not map asset name: "
-                + mapping.left(mapping.length() - QString::number(copy).length() - 1);
-            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
-        } else if (copy < MAX_COPY_COUNT - 1) {
-            if (copy > 0) {
-                mapping = mapping.remove(mapping.lastIndexOf("-"), QString::number(copy).length() + 1);
-            }
-            copy++;
-            mapping = mapping.insert(mapping.lastIndexOf("."), "-" + QString::number(copy));
-            addAssetToWorldWithNewMapping(filePath, mapping, copy, isZip, isBlocks);
-        } else {
-            QString errorInfo = "Too many copies of asset name: "
-                + mapping.left(mapping.length() - QString::number(copy).length() - 1);
-            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
-        }
-        request->deleteLater();
-    });
-
-    request->start();
-}
-
-void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool isZip, bool isBlocks) {
-    qInfo(interfaceapp) << "Uploading" << filePath << "to Asset Server as" << mapping;
-    auto upload = DependencyManager::get<AssetClient>()->createUpload(filePath);
-    QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
-        if (upload->getError() != AssetUpload::NoError) {
-            QString errorInfo = "Could not upload model to the Asset Server.";
-            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
-        } else {
-            addAssetToWorldSetMapping(filePath, mapping, hash, isZip, isBlocks);
-        }
-
-        // Remove temporary directory created by Clara.io market place download.
-        int index = filePath.lastIndexOf("/model_repo/");
-        if (index > 0) {
-            QString tempDir = filePath.left(index);
-            qCDebug(interfaceapp) << "Removing temporary directory at: " + tempDir;
-            QDir(tempDir).removeRecursively();
-        }
-
-        upload->deleteLater();
-    });
-
-    upload->start();
-}
-
-void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isZip, bool isBlocks) {
-    auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash);
-    connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
-        if (request->getError() != SetMappingRequest::NoError) {
-            QString errorInfo = "Could not set asset mapping.";
-            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
-            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
-        } else {
-            // to prevent files that aren't models or texture files from being loaded into world automatically
-            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) ||
-                ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) &&
-                ((!isBlocks) && (!isZip)))) {
-                addAssetToWorldAddEntity(filePath, mapping);
-            } else {
-                qCDebug(interfaceapp) << "Zipped contents are not supported entity files";
-                addAssetToWorldInfoDone(filenameFromPath(filePath));
-            }
-        }
-        request->deleteLater();
-    });
-
-    request->start();
-}
-
-void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
-    EntityItemProperties properties;
-    properties.setName(mapping.right(mapping.length() - 1));
-    if (filePath.toLower().endsWith(PNG_EXTENSION) || filePath.toLower().endsWith(JPG_EXTENSION)) {
-        properties.setType(EntityTypes::Image);
-        properties.setImageURL(QString("atp:" + mapping));
-        properties.setKeepAspectRatio(false);
-    } else {
-        properties.setType(EntityTypes::Model);
-        properties.setModelURL("atp:" + mapping);
-        properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
-    }
-    properties.setCollisionless(true);  // Temporarily set so that doesn't collide with avatar.
-    properties.setVisible(false);  // Temporarily set so that don't see at large unresized dimensions.
-    bool grabbable = (Menu::getInstance()->isOptionChecked(MenuOption::CreateEntitiesGrabbable));
-    properties.setUserData(grabbable ? GRABBABLE_USER_DATA : NOT_GRABBABLE_USER_DATA);
-    glm::vec3 positionOffset = getMyAvatar()->getWorldOrientation() * (getMyAvatar()->getSensorToWorldScale() * glm::vec3(0.0f, 0.0f, -2.0f));
-    properties.setPosition(getMyAvatar()->getWorldPosition() + positionOffset);
-    properties.setRotation(getMyAvatar()->getWorldOrientation());
-    properties.setGravity(glm::vec3(0.0f, 0.0f, 0.0f));
-    auto entityID = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties);
-
-    // Note: Model dimensions are not available here; model is scaled per FBX mesh in RenderableModelEntityItem::update() later
-    // on. But FBX dimensions may be in cm, so we monitor for the dimension change and rescale again if warranted.
-
-    if (entityID == QUuid()) {
-        QString errorInfo = "Could not add model " + mapping + " to world.";
-        qWarning(interfaceapp) << "Could not add model to world: " + errorInfo;
-        addAssetToWorldError(filenameFromPath(filePath), errorInfo);
-    } else {
-        // Monitor when asset is rendered in world so that can resize if necessary.
-        _addAssetToWorldResizeList.insert(entityID, 0);  // List value is count of checks performed.
-        if (!_addAssetToWorldResizeTimer.isActive()) {
-            _addAssetToWorldResizeTimer.start();
-        }
-
-        // Close progress message box.
-        addAssetToWorldInfoDone(filenameFromPath(filePath));
-    }
-}
-
-void Application::addAssetToWorldCheckModelSize() {
-    if (_addAssetToWorldResizeList.size() == 0) {
-        return;
-    }
-
-    auto item = _addAssetToWorldResizeList.begin();
-    while (item != _addAssetToWorldResizeList.end()) {
-        auto entityID = item.key();
-
-        EntityPropertyFlags propertyFlags;
-        propertyFlags += PROP_NAME;
-        propertyFlags += PROP_DIMENSIONS;
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        auto properties = entityScriptingInterface->getEntityPropertiesInternal(entityID, propertyFlags, false);
-        auto name = properties.getName();
-        auto dimensions = properties.getDimensions();
-
-        bool doResize = false;
-
-        const glm::vec3 DEFAULT_DIMENSIONS = glm::vec3(0.1f, 0.1f, 0.1f);
-        if (dimensions != DEFAULT_DIMENSIONS) {
-
-            // Scale model so that its maximum is exactly specific size.
-            const float MAXIMUM_DIMENSION = getMyAvatar()->getSensorToWorldScale();
-            auto previousDimensions = dimensions;
-            auto scale = std::min(MAXIMUM_DIMENSION / dimensions.x, std::min(MAXIMUM_DIMENSION / dimensions.y,
-                MAXIMUM_DIMENSION / dimensions.z));
-            dimensions *= scale;
-            qInfo(interfaceapp) << "Model" << name << "auto-resized from" << previousDimensions << " to " << dimensions;
-            doResize = true;
-
-            item = _addAssetToWorldResizeList.erase(item);  // Finished with this entity; advance to next.
-        } else {
-            // Increment count of checks done.
-            _addAssetToWorldResizeList[entityID]++;
-
-            const int CHECK_MODEL_SIZE_MAX_CHECKS = 300;
-            if (_addAssetToWorldResizeList[entityID] > CHECK_MODEL_SIZE_MAX_CHECKS) {
-                // Have done enough checks; model was either the default size or something's gone wrong.
-
-                // Rescale all dimensions.
-                const glm::vec3 UNIT_DIMENSIONS = glm::vec3(1.0f, 1.0f, 1.0f);
-                dimensions = UNIT_DIMENSIONS;
-                qInfo(interfaceapp) << "Model" << name << "auto-resize timed out; resized to " << dimensions;
-                doResize = true;
-
-                item = _addAssetToWorldResizeList.erase(item);  // Finished with this entity; advance to next.
-            } else {
-                // No action on this entity; advance to next.
-                ++item;
-            }
-        }
-
-        if (doResize) {
-            EntityItemProperties properties;
-            properties.setDimensions(dimensions);
-            properties.setVisible(true);
-            if (!name.toLower().endsWith(PNG_EXTENSION) && !name.toLower().endsWith(JPG_EXTENSION)) {
-                properties.setCollisionless(false);
-            }
-            bool grabbable = (Menu::getInstance()->isOptionChecked(MenuOption::CreateEntitiesGrabbable));
-            properties.setUserData(grabbable ? GRABBABLE_USER_DATA : NOT_GRABBABLE_USER_DATA);
-            properties.setLastEdited(usecTimestampNow());
-            entityScriptingInterface->editEntity(entityID, properties);
-        }
-    }
-
-    // Stop timer if nothing in list to check.
-    if (_addAssetToWorldResizeList.size() == 0) {
-        _addAssetToWorldResizeTimer.stop();
-    }
-}
-
-
-void Application::addAssetToWorldInfo(QString modelName, QString infoText) {
-    // Displays the most recent info message, subject to being overridden by error messages.
-
-    if (_aboutToQuit) {
-        return;
-    }
-
-    /*
-    Cancel info timer if running.
-    If list has an entry for modelName, delete it (just one).
-    Append modelName, infoText to list.
-    Display infoText in message box unless an error is being displayed (i.e., error timer is running).
-    Show message box if not already visible.
-    */
-
-    _addAssetToWorldInfoTimer.stop();
-
-    addAssetToWorldInfoClear(modelName);
-
-    _addAssetToWorldInfoKeys.append(modelName);
-    _addAssetToWorldInfoMessages.append(infoText);
-
-    if (!_addAssetToWorldErrorTimer.isActive()) {
-        if (!_addAssetToWorldMessageBox) {
-            _addAssetToWorldMessageBox = getOffscreenUI()->createMessageBox(OffscreenUi::ICON_INFORMATION,
-                "Downloading Model", "", QMessageBox::NoButton, QMessageBox::NoButton);
-            connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed()));
-        }
-
-        _addAssetToWorldMessageBox->setProperty("text", "\n" + infoText);
-        _addAssetToWorldMessageBox->setVisible(true);
-    }
-}
-
-void Application::addAssetToWorldInfoClear(QString modelName) {
-    // Clears modelName entry from message list without affecting message currently displayed.
-
-    if (_aboutToQuit) {
-        return;
-    }
-
-    /*
-    Delete entry for modelName from list.
-    */
-
-    auto index = _addAssetToWorldInfoKeys.indexOf(modelName);
-    if (index > -1) {
-        _addAssetToWorldInfoKeys.removeAt(index);
-        _addAssetToWorldInfoMessages.removeAt(index);
-    }
-}
-
-void Application::addAssetToWorldInfoDone(QString modelName) {
-    // Continues to display this message if the latest for a few seconds, then deletes it and displays the next latest.
-
-    if (_aboutToQuit) {
-        return;
-    }
-
-    /*
-    Delete entry for modelName from list.
-    (Re)start the info timer to update message box. ... onAddAssetToWorldInfoTimeout()
-    */
-
-    addAssetToWorldInfoClear(modelName);
-    _addAssetToWorldInfoTimer.start();
-}
-
-void Application::addAssetToWorldInfoTimeout() {
-    if (_aboutToQuit) {
-        return;
-    }
-
-    /*
-    If list not empty, display last message in list (may already be displayed ) unless an error is being displayed.
-    If list empty, close the message box unless an error is being displayed.
-    */
-
-    if (!_addAssetToWorldErrorTimer.isActive() && _addAssetToWorldMessageBox) {
-        if (_addAssetToWorldInfoKeys.length() > 0) {
-            _addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last());
-        } else {
-            disconnect(_addAssetToWorldMessageBox);
-            _addAssetToWorldMessageBox->setVisible(false);
-            _addAssetToWorldMessageBox->deleteLater();
-            _addAssetToWorldMessageBox = nullptr;
-        }
-    }
-}
-
-void Application::addAssetToWorldError(QString modelName, QString errorText) {
-    // Displays the most recent error message for a few seconds.
-
-    if (_aboutToQuit) {
-        return;
-    }
-
-    /*
-    If list has an entry for modelName, delete it.
-    Display errorText in message box.
-    Show message box if not already visible.
-    (Re)start error timer. ... onAddAssetToWorldErrorTimeout()
-    */
-
-    addAssetToWorldInfoClear(modelName);
-
-    if (!_addAssetToWorldMessageBox) {
-        _addAssetToWorldMessageBox = getOffscreenUI()->createMessageBox(OffscreenUi::ICON_INFORMATION,
-            "Downloading Model", "", QMessageBox::NoButton, QMessageBox::NoButton);
-        connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed()));
-    }
-
-    _addAssetToWorldMessageBox->setProperty("text", "\n" + errorText);
-    _addAssetToWorldMessageBox->setVisible(true);
-
-    _addAssetToWorldErrorTimer.start();
-}
-
-void Application::addAssetToWorldErrorTimeout() {
-    if (_aboutToQuit) {
-        return;
-    }
-
-    /*
-    If list is not empty, display message from last entry.
-    If list is empty, close the message box.
-    */
-
-    if (_addAssetToWorldMessageBox) {
-        if (_addAssetToWorldInfoKeys.length() > 0) {
-            _addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last());
-        } else {
-            disconnect(_addAssetToWorldMessageBox);
-            _addAssetToWorldMessageBox->setVisible(false);
-            _addAssetToWorldMessageBox->deleteLater();
-            _addAssetToWorldMessageBox = nullptr;
-        }
-    }
-}
-
-
-void Application::addAssetToWorldMessageClose() {
-    // Clear messages, e.g., if Interface is being closed or domain changes.
-
-    /*
-    Call if user manually closes message box.
-    Call if domain changes.
-    Call if application is shutting down.
-
-    Stop timers.
-    Close the message box if open.
-    Clear lists.
-    */
-
-    _addAssetToWorldInfoTimer.stop();
-    _addAssetToWorldErrorTimer.stop();
-
-    if (_addAssetToWorldMessageBox) {
-        disconnect(_addAssetToWorldMessageBox);
-        _addAssetToWorldMessageBox->setVisible(false);
-        _addAssetToWorldMessageBox->deleteLater();
-        _addAssetToWorldMessageBox = nullptr;
-    }
-
-    _addAssetToWorldInfoKeys.clear();
-    _addAssetToWorldInfoMessages.clear();
-}
-
-void Application::onAssetToWorldMessageBoxClosed() {
-    if (_addAssetToWorldMessageBox) {
-        // User manually closed message box; perhaps because it has become stuck, so reset all messages.
-        qInfo(interfaceapp) << "User manually closed download status message box";
-        disconnect(_addAssetToWorldMessageBox);
-        _addAssetToWorldMessageBox = nullptr;
-        addAssetToWorldMessageClose();
-    }
-}
-
-
-void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks) {
-    if (autoAdd) {
-        if (!unzipFile.isEmpty()) {
-            for (int i = 0; i < unzipFile.length(); i++) {
-                if (QFileInfo(unzipFile.at(i)).isFile()) {
-                    qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
-                    addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks);
-                }
-            }
-        } else {
-            addAssetToWorldUnzipFailure(zipFile);
-        }
-    } else {
-        showAssetServerWidget(unzipFile.first());
-    }
-}
-
-void Application::packageModel() {
-    ModelPackager::package();
-}
-
-void Application::loadDialog() {
-    ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_glWidget, tr("Open Script"),
-                                                                 getPreviousScriptLocation(),
-                                                                 tr("JavaScript Files (*.js)"));
-    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
-        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-        const QString& response = answer.toString();
-        if (!response.isEmpty() && QFile(response).exists()) {
-            setPreviousScriptLocation(QFileInfo(response).absolutePath());
-            DependencyManager::get<ScriptEngines>()->loadScript(response, true, false, false, true);  // Don't load from cache
-        }
-    });
-}
-
-QString Application::getPreviousScriptLocation() {
-    QString result = _previousScriptLocation.get();
-    return result;
-}
-
-void Application::setPreviousScriptLocation(const QString& location) {
-    _previousScriptLocation.set(location);
-}
-
-void Application::loadScriptURLDialog() const {
-    ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
-    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
-        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-        const QString& newScript = response.toString();
-        if (QUrl(newScript).scheme() == "atp") {
-            OffscreenUi::asyncWarning("Error Loading Script", "Cannot load client script over ATP");
-        } else if (!newScript.isEmpty()) {
-            DependencyManager::get<ScriptEngines>()->loadScript(newScript.trimmed());
-        }
-    });
-}
-
-SharedSoundPointer Application::getSampleSound() const {
-    return _sampleSound;
-}
-
-void Application::loadLODToolsDialog() {
-    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
-    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
-        auto dialogsManager = DependencyManager::get<DialogsManager>();
-        dialogsManager->lodTools();
-    } else {
-        tablet->pushOntoStack("hifi/dialogs/TabletLODTools.qml");
-    }
-}
-
-void Application::loadEntityStatisticsDialog() {
-    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
-    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
-        auto dialogsManager = DependencyManager::get<DialogsManager>();
-        dialogsManager->octreeStatsDetails();
-    } else {
-        tablet->pushOntoStack("hifi/dialogs/TabletEntityStatistics.qml");
-    }
-}
-
-void Application::loadDomainConnectionDialog() {
-    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
-    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
-    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
-        auto dialogsManager = DependencyManager::get<DialogsManager>();
-        dialogsManager->showDomainConnectionDialog();
-    } else {
-        tablet->pushOntoStack("hifi/dialogs/TabletDCDialog.qml");
-    }
-}
-
-void Application::toggleLogDialog() {
-#ifndef ANDROID_APP_QUEST_INTERFACE
-    if (getLoginDialogPoppedUp()) {
-        return;
-    }
-    if (! _logDialog) {
-
-        bool keepOnTop =_keepLogWindowOnTop.get();
-#ifdef Q_OS_WIN
-        _logDialog = new LogDialog(keepOnTop ? qApp->getWindow() : nullptr, getLogger());
-#elif !defined(Q_OS_ANDROID)
-        _logDialog = new LogDialog(nullptr, getLogger());
-
-        if (keepOnTop) {
-            Qt::WindowFlags flags = _logDialog->windowFlags() | Qt::Tool;
-            _logDialog->setWindowFlags(flags);
-        }
-#else
-        Q_UNUSED(keepOnTop)
-#endif
-    }
-
-    if (_logDialog->isVisible()) {
-        _logDialog->hide();
-    } else {
-        _logDialog->show();
-    }
-#endif
-}
-
- void Application::recreateLogWindow(int keepOnTop) {
-     _keepLogWindowOnTop.set(keepOnTop != 0);
-     if (_logDialog) {
-         bool toggle = _logDialog->isVisible();
-         _logDialog->close();
-         _logDialog = nullptr;
-
-         if (toggle) {
-             toggleLogDialog();
-         }
-     }
- }
-
-void Application::toggleEntityScriptServerLogDialog() {
-    if (! _entityScriptServerLogDialog) {
-        _entityScriptServerLogDialog = new EntityScriptServerLogDialog(nullptr);
-    }
-
-    if (_entityScriptServerLogDialog->isVisible()) {
-        _entityScriptServerLogDialog->hide();
-    } else {
-        _entityScriptServerLogDialog->show();
-    }
-}
-
-void Application::loadAddAvatarBookmarkDialog() const {
-    auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
-}
-
-void Application::loadAvatarBrowser() const {
-    auto tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
-    // construct the url to the marketplace item
-    QString url = MetaverseAPI::getCurrentMetaverseServerURL().toString() + "/marketplace?category=avatars";
-
-    QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
-    tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
-    DependencyManager::get<HMDScriptingInterface>()->openTablet();
-}
-
-void Application::addSnapshotOperator(const SnapshotOperator& snapshotOperator) {
-    std::lock_guard<std::mutex> lock(_snapshotMutex);
-    _snapshotOperators.push(snapshotOperator);
-    _hasPrimarySnapshot = _hasPrimarySnapshot || std::get<2>(snapshotOperator);
-}
-
-bool Application::takeSnapshotOperators(std::queue<SnapshotOperator>& snapshotOperators) {
-    std::lock_guard<std::mutex> lock(_snapshotMutex);
-    bool hasPrimarySnapshot = _hasPrimarySnapshot;
-    _hasPrimarySnapshot = false;
-    _snapshotOperators.swap(snapshotOperators);
-    return hasPrimarySnapshot;
-}
-
-void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRatio, const QString& filename) {
-    addSnapshotOperator(std::make_tuple([notify, includeAnimated, aspectRatio, filename](const QImage& snapshot) {
-        qApp->postLambdaEvent([snapshot, notify, includeAnimated, aspectRatio, filename] {
-            QString path = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation());
-
-            // If we're not doing an animated snapshot as well...
-            if (!includeAnimated) {
-                if (!path.isEmpty()) {
-                    // Tell the dependency manager that the capture of the still snapshot has taken place.
-                    emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(path, notify);
-                }
-            } else if (!SnapshotAnimated::isAlreadyTakingSnapshotAnimated()) {
-                // Get an animated GIF snapshot and save it
-                SnapshotAnimated::saveSnapshotAnimated(path, aspectRatio, DependencyManager::get<WindowScriptingInterface>());
-            }
-        });
-    }, aspectRatio, true));
-}
-
-void Application::takeSecondaryCameraSnapshot(const bool& notify, const QString& filename) {
-    addSnapshotOperator(std::make_tuple([notify, filename](const QImage& snapshot) {
-        qApp->postLambdaEvent([snapshot, notify, filename] {
-            QString snapshotPath = DependencyManager::get<Snapshot>()->saveSnapshot(snapshot, filename, TestScriptingInterface::getInstance()->getTestResultsLocation());
-
-            emit DependencyManager::get<WindowScriptingInterface>()->stillSnapshotTaken(snapshotPath, notify);
-        });
-    }, 0.0f, false));
-}
-
-void Application::takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition, const bool& cubemapOutputFormat, const bool& notify, const QString& filename) {
-    postLambdaEvent([notify, filename, cubemapOutputFormat, cameraPosition] {
-        DependencyManager::get<Snapshot>()->save360Snapshot(cameraPosition, cubemapOutputFormat, notify, filename);
-    });
-}
-
-void Application::shareSnapshot(const QString& path, const QUrl& href) {
-    postLambdaEvent([path, href] {
-        // not much to do here, everything is done in snapshot code...
-        DependencyManager::get<Snapshot>()->uploadSnapshot(path, href);
-    });
-}
-
-float Application::getRenderResolutionScale() const {
-    return RenderScriptingInterface::getInstance()->getViewportResolutionScale();
-}
-
-void Application::notifyPacketVersionMismatch() {
-    if (!_notifiedPacketVersionMismatchThisDomain && !isInterstitialMode()) {
-        _notifiedPacketVersionMismatchThisDomain = true;
-
-        QString message = "The location you are visiting is running an incompatible server version.\n";
-        message += "Content may not display properly.";
-
-        OffscreenUi::asyncWarning("", message);
-    }
-}
-
-void Application::checkSkeleton() const {
-    if (getMyAvatar()->getSkeletonModel()->isLoaded() && !getMyAvatar()->getSkeletonModel()->hasSkeleton()) {
-        qCDebug(interfaceapp) << "MyAvatar model has no skeleton";
-
-        QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
-        OffscreenUi::asyncWarning("", message);
-
-        getMyAvatar()->useFullAvatarURL(AvatarData::defaultFullAvatarModelUrl(), DEFAULT_FULL_AVATAR_MODEL_NAME);
-    } else {
-        _physicsEngine->setCharacterController(getMyAvatar()->getCharacterController());
-    }
-}
-
-void Application::activeChanged(Qt::ApplicationState state) {
-    switch (state) {
-        case Qt::ApplicationActive:
-            _isForeground = true;
-            if (!_aboutToQuit && _startUpFinished) {
-                getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::FOCUS_ACTIVE);
-            }
-            break;
-
-        case Qt::ApplicationSuspended:
-            break;
-        case Qt::ApplicationHidden:
-            break;
-        case Qt::ApplicationInactive:
-            if (!_aboutToQuit && _startUpFinished) {
-                getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::UNFOCUS);
+        // Transfer the user inputs to the driveKeys
+        // FIXME can we drop drive keys and just have the avatar read the action states directly?
+        myAvatar->clearDriveKeys();
+        if (_myCamera.getMode() != CAMERA_MODE_INDEPENDENT && !isInterstitialMode()) {
+            if (!_controllerScriptingInterface->areActionsCaptured() && _myCamera.getMode() != CAMERA_MODE_MIRROR) {
+                myAvatar->setDriveKey(MyAvatar::TRANSLATE_Z, -1.0f * userInputMapper->getActionState(controller::Action::TRANSLATE_Z));
+                myAvatar->setDriveKey(MyAvatar::TRANSLATE_Y, userInputMapper->getActionState(controller::Action::TRANSLATE_Y));
+                myAvatar->setDriveKey(MyAvatar::TRANSLATE_X, userInputMapper->getActionState(controller::Action::TRANSLATE_X));
+                if (deltaTime > FLT_EPSILON && userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z)  == 0.0f) {
+                    myAvatar->setDriveKey(MyAvatar::PITCH, -1.0f * userInputMapper->getActionState(controller::Action::PITCH));
+                    myAvatar->setDriveKey(MyAvatar::YAW, -1.0f * userInputMapper->getActionState(controller::Action::YAW));
+                    myAvatar->setDriveKey(MyAvatar::DELTA_PITCH, -_myCamera.getSensitivity() * userInputMapper->getActionState(controller::Action::DELTA_PITCH));
+                    myAvatar->setDriveKey(MyAvatar::DELTA_YAW, -_myCamera.getSensitivity() * userInputMapper->getActionState(controller::Action::DELTA_YAW));
+                    myAvatar->setDriveKey(MyAvatar::STEP_YAW, -1.0f * userInputMapper->getActionState(controller::Action::STEP_YAW));
+                }
             }
-            break;
-        default:
-            _isForeground = false;
-            break;
-    }
-}
-
-void Application::windowMinimizedChanged(bool minimized) {
-    // initialize the _minimizedWindowTimer
-    static std::once_flag once;
-    std::call_once(once, [&] {
-        connect(&_minimizedWindowTimer, &QTimer::timeout, this, [] {
-            QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(static_cast<QEvent::Type>(Idle)), Qt::HighEventPriority);
-        });
-    });
-
-    // avoid rendering to the display plugin but continue posting Idle events,
-    // so that physics continues to simulate and the deadlock watchdog knows we're alive
-    if (!minimized && !getActiveDisplayPlugin()->isActive()) {
-        _minimizedWindowTimer.stop();
-        getActiveDisplayPlugin()->activate();
-    } else if (minimized && getActiveDisplayPlugin()->isActive()) {
-        getActiveDisplayPlugin()->deactivate();
-        _minimizedWindowTimer.start(THROTTLED_SIM_FRAME_PERIOD_MS);
-    }
-}
-
-void Application::postLambdaEvent(const std::function<void()>& f) {
-    if (this->thread() == QThread::currentThread()) {
-        f();
-    } else {
-        QCoreApplication::postEvent(this, new LambdaEvent(f));
-    }
-}
-
-void Application::sendLambdaEvent(const std::function<void()>& f) {
-    if (this->thread() == QThread::currentThread()) {
-        f();
-    } else {
-        LambdaEvent event(f);
-        QCoreApplication::sendEvent(this, &event);
-    }
-}
-
-void Application::shutdownPlugins() {
-}
-
-glm::uvec2 Application::getCanvasSize() const {
-    return glm::uvec2(_glWidget->width(), _glWidget->height());
-}
-
-QRect Application::getRenderingGeometry() const {
-    auto geometry = _glWidget->geometry();
-    auto topLeft = geometry.topLeft();
-    auto topLeftScreen = _glWidget->mapToGlobal(topLeft);
-    geometry.moveTopLeft(topLeftScreen);
-    return geometry;
-}
-
-glm::uvec2 Application::getUiSize() const {
-    static const uint MIN_SIZE = 1;
-    glm::uvec2 result(MIN_SIZE);
-    if (_displayPlugin) {
-        result = getActiveDisplayPlugin()->getRecommendedUiSize();
-    }
-    return result;
-}
-
-QRect Application::getRecommendedHUDRect() const {
-    auto uiSize = getUiSize();
-    QRect result(0, 0, uiSize.x, uiSize.y);
-    if (_displayPlugin) {
-        result = getActiveDisplayPlugin()->getRecommendedHUDRect();
-    }
-    return result;
-}
-
-glm::vec2 Application::getDeviceSize() const {
-    static const int MIN_SIZE = 1;
-    glm::vec2 result(MIN_SIZE);
-    if (_displayPlugin) {
-        result = getActiveDisplayPlugin()->getRecommendedRenderSize();
-    }
-    return result;
-}
-
-bool Application::isThrottleRendering() const {
-    if (_displayPlugin) {
-        return getActiveDisplayPlugin()->isThrottled();
-    }
-    return false;
-}
-
-bool Application::hasFocus() const {
-    bool result = (QApplication::activeWindow() != nullptr);
-
-
-#if defined(Q_OS_WIN)
-    // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't
-    // take user focus away from their current window. So also check whether the application is the user's current foreground
-    // window.
-    result = result && (HWND)QApplication::activeWindow()->winId() == GetForegroundWindow();
-#endif
-    return result;
-}
-
-void Application::setFocus() {
-    // Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and
-    // flashes the taskbar icon.
-    auto window = qApp->getWindow();
-    window->activateWindow();
-}
-
-void Application::raise() {
-    auto windowState = qApp->getWindow()->windowState();
-    if (windowState & Qt::WindowMinimized) {
-        if (windowState & Qt::WindowMaximized) {
-            qApp->getWindow()->showMaximized();
-        } else if (windowState & Qt::WindowFullScreen) {
-            qApp->getWindow()->showFullScreen();
-        } else {
-            qApp->getWindow()->showNormal();
+            myAvatar->setDriveKey(MyAvatar::ZOOM, userInputMapper->getActionState(controller::Action::TRANSLATE_CAMERA_Z));
         }
-    }
-    qApp->getWindow()->raise();
-}
-
-void Application::setMaxOctreePacketsPerSecond(int maxOctreePPS) {
-    if (maxOctreePPS != _maxOctreePPS) {
-        _maxOctreePPS = maxOctreePPS;
-        maxOctreePacketsPerSecond.set(_maxOctreePPS);
-    }
-}
-
-int Application::getMaxOctreePacketsPerSecond() const {
-    return _maxOctreePPS;
-}
-
-qreal Application::getDevicePixelRatio() {
-    return (_window && _window->windowHandle()) ? _window->windowHandle()->devicePixelRatio() : 1.0;
-}
-
-DisplayPluginPointer Application::getActiveDisplayPlugin() const {
-    if (QThread::currentThread() != thread()) {
-        std::unique_lock<std::mutex> lock(_displayPluginLock);
-        return _displayPlugin;
-    }
-
-    if (!_aboutToQuit && !_displayPlugin) {
-        const_cast<Application*>(this)->updateDisplayMode();
-        Q_ASSERT(_displayPlugin);
-    }
-    return _displayPlugin;
-}
 
+        myAvatar->setSprintMode((bool)userInputMapper->getActionState(controller::Action::SPRINT));
+        static const std::vector<controller::Action> avatarControllerActions = {
+            controller::Action::LEFT_HAND,
+            controller::Action::RIGHT_HAND,
+            controller::Action::LEFT_FOOT,
+            controller::Action::RIGHT_FOOT,
+            controller::Action::HIPS,
+            controller::Action::SPINE2,
+            controller::Action::HEAD,
+            controller::Action::LEFT_HAND_THUMB1,
+            controller::Action::LEFT_HAND_THUMB2,
+            controller::Action::LEFT_HAND_THUMB3,
+            controller::Action::LEFT_HAND_THUMB4,
+            controller::Action::LEFT_HAND_INDEX1,
+            controller::Action::LEFT_HAND_INDEX2,
+            controller::Action::LEFT_HAND_INDEX3,
+            controller::Action::LEFT_HAND_INDEX4,
+            controller::Action::LEFT_HAND_MIDDLE1,
+            controller::Action::LEFT_HAND_MIDDLE2,
+            controller::Action::LEFT_HAND_MIDDLE3,
+            controller::Action::LEFT_HAND_MIDDLE4,
+            controller::Action::LEFT_HAND_RING1,
+            controller::Action::LEFT_HAND_RING2,
+            controller::Action::LEFT_HAND_RING3,
+            controller::Action::LEFT_HAND_RING4,
+            controller::Action::LEFT_HAND_PINKY1,
+            controller::Action::LEFT_HAND_PINKY2,
+            controller::Action::LEFT_HAND_PINKY3,
+            controller::Action::LEFT_HAND_PINKY4,
+            controller::Action::RIGHT_HAND_THUMB1,
+            controller::Action::RIGHT_HAND_THUMB2,
+            controller::Action::RIGHT_HAND_THUMB3,
+            controller::Action::RIGHT_HAND_THUMB4,
+            controller::Action::RIGHT_HAND_INDEX1,
+            controller::Action::RIGHT_HAND_INDEX2,
+            controller::Action::RIGHT_HAND_INDEX3,
+            controller::Action::RIGHT_HAND_INDEX4,
+            controller::Action::RIGHT_HAND_MIDDLE1,
+            controller::Action::RIGHT_HAND_MIDDLE2,
+            controller::Action::RIGHT_HAND_MIDDLE3,
+            controller::Action::RIGHT_HAND_MIDDLE4,
+            controller::Action::RIGHT_HAND_RING1,
+            controller::Action::RIGHT_HAND_RING2,
+            controller::Action::RIGHT_HAND_RING3,
+            controller::Action::RIGHT_HAND_RING4,
+            controller::Action::RIGHT_HAND_PINKY1,
+            controller::Action::RIGHT_HAND_PINKY2,
+            controller::Action::RIGHT_HAND_PINKY3,
+            controller::Action::RIGHT_HAND_PINKY4,
+            controller::Action::LEFT_ARM,
+            controller::Action::RIGHT_ARM,
+            controller::Action::LEFT_SHOULDER,
+            controller::Action::RIGHT_SHOULDER,
+            controller::Action::LEFT_FORE_ARM,
+            controller::Action::RIGHT_FORE_ARM,
+            controller::Action::LEFT_LEG,
+            controller::Action::RIGHT_LEG,
+            controller::Action::LEFT_UP_LEG,
+            controller::Action::RIGHT_UP_LEG,
+            controller::Action::LEFT_TOE_BASE,
+            controller::Action::RIGHT_TOE_BASE,
+            controller::Action::LEFT_EYE,
+            controller::Action::RIGHT_EYE
 
-#if !defined(DISABLE_QML)
-static const char* EXCLUSION_GROUP_KEY = "exclusionGroup";
-
-static void addDisplayPluginToMenu(const DisplayPluginPointer& displayPlugin, int index, bool active) {
-    auto menu = Menu::getInstance();
-    QString name = displayPlugin->getName();
-    auto grouping = displayPlugin->getGrouping();
-    QString groupingMenu { "" };
-    Q_ASSERT(!menu->menuItemExists(MenuOption::OutputMenu, name));
-
-    // assign the meny grouping based on plugin grouping
-    switch (grouping) {
-        case Plugin::ADVANCED:
-            groupingMenu = "Advanced";
-            break;
-        case Plugin::DEVELOPER:
-            groupingMenu = "Developer";
-            break;
-        default:
-            groupingMenu = "Standard";
-            break;
-    }
-
-    static QActionGroup* displayPluginGroup = nullptr;
-    if (!displayPluginGroup) {
-        displayPluginGroup = new QActionGroup(menu);
-        displayPluginGroup->setExclusive(true);
-    }
-    auto parent = menu->getMenu(MenuOption::OutputMenu);
-    auto action = menu->addActionToQMenuAndActionHash(parent,
-        name, QKeySequence(Qt::CTRL + (Qt::Key_0 + index)), qApp,
-        SLOT(updateDisplayMode()),
-        QAction::NoRole, Menu::UNSPECIFIED_POSITION, groupingMenu);
-
-    action->setCheckable(true);
-    action->setChecked(active);
-    displayPluginGroup->addAction(action);
-
-    action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup));
-    Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name));
-}
-#endif
+        };
 
-void Application::updateDisplayMode() {
-    // Unsafe to call this method from anything but the main thread
-    if (QThread::currentThread() != thread()) {
-        qFatal("Attempted to switch display plugins from a non-main thread");
-    }
+        // copy controller poses from userInputMapper to myAvatar.
+        glm::mat4 myAvatarMatrix = createMatFromQuatAndPos(myAvatar->getWorldOrientation(), myAvatar->getWorldPosition());
+        glm::mat4 worldToSensorMatrix = glm::inverse(myAvatar->getSensorToWorldMatrix());
+        glm::mat4 avatarToSensorMatrix = worldToSensorMatrix * myAvatarMatrix;
+        for (auto& action : avatarControllerActions) {
+            controller::Pose pose = userInputMapper->getPoseState(action);
+            myAvatar->setControllerPoseInSensorFrame(action, pose.transform(avatarToSensorMatrix));
+        }
 
-    // Once time initialization code that depends on the UI being available
-    const auto& displayPlugins = getDisplayPlugins();
+        static const std::vector<QString> trackedObjectStringLiterals = {
+            QStringLiteral("_TrackedObject00"), QStringLiteral("_TrackedObject01"), QStringLiteral("_TrackedObject02"), QStringLiteral("_TrackedObject03"),
+            QStringLiteral("_TrackedObject04"), QStringLiteral("_TrackedObject05"), QStringLiteral("_TrackedObject06"), QStringLiteral("_TrackedObject07"),
+            QStringLiteral("_TrackedObject08"), QStringLiteral("_TrackedObject09"), QStringLiteral("_TrackedObject10"), QStringLiteral("_TrackedObject11"),
+            QStringLiteral("_TrackedObject12"), QStringLiteral("_TrackedObject13"), QStringLiteral("_TrackedObject14"), QStringLiteral("_TrackedObject15")
+        };
 
-    // Default to the first item on the list, in case none of the menu items match
+        // Controlled by the Developer > Avatar > Show Tracked Objects menu.
+        if (_showTrackedObjects) {
+            static const std::vector<controller::Action> trackedObjectActions = {
+                controller::Action::TRACKED_OBJECT_00, controller::Action::TRACKED_OBJECT_01, controller::Action::TRACKED_OBJECT_02, controller::Action::TRACKED_OBJECT_03,
+                controller::Action::TRACKED_OBJECT_04, controller::Action::TRACKED_OBJECT_05, controller::Action::TRACKED_OBJECT_06, controller::Action::TRACKED_OBJECT_07,
+                controller::Action::TRACKED_OBJECT_08, controller::Action::TRACKED_OBJECT_09, controller::Action::TRACKED_OBJECT_10, controller::Action::TRACKED_OBJECT_11,
+                controller::Action::TRACKED_OBJECT_12, controller::Action::TRACKED_OBJECT_13, controller::Action::TRACKED_OBJECT_14, controller::Action::TRACKED_OBJECT_15
+            };
 
-    DisplayPluginPointer newDisplayPlugin = displayPlugins.at(0);
-    auto menu = getPrimaryMenu();
-    if (menu) {
-        for (const auto& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
-            QString name = displayPlugin->getName();
-            QAction* action = menu->getActionForOption(name);
-            // Menu might have been removed if the display plugin lost
-            if (!action) {
-                continue;
+            int i = 0;
+            glm::vec4 BLUE(0.0f, 0.0f, 1.0f, 1.0f);
+            for (auto& action : trackedObjectActions) {
+                controller::Pose pose = userInputMapper->getPoseState(action);
+                if (pose.valid) {
+                    glm::vec3 pos = transformPoint(myAvatarMatrix, pose.translation);
+                    glm::quat rot = glmExtractRotation(myAvatarMatrix) * pose.rotation;
+                    DebugDraw::getInstance().addMarker(trackedObjectStringLiterals[i], rot, pos, BLUE);
+                } else {
+                    DebugDraw::getInstance().removeMarker(trackedObjectStringLiterals[i]);
+                }
+                i++;
             }
-            if (action->isChecked()) {
-                newDisplayPlugin = displayPlugin;
-                break;
+        } else if (_prevShowTrackedObjects) {
+            for (auto& key : trackedObjectStringLiterals) {
+                DebugDraw::getInstance().removeMarker(key);
             }
         }
+        _prevShowTrackedObjects = _showTrackedObjects;
     }
 
-    if (newDisplayPlugin == _displayPlugin) {
-        return;
-    }
+    updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
+    updateDialogs(deltaTime); // update various stats dialogs if present
 
-    setDisplayPlugin(newDisplayPlugin);
-}
+    auto grabManager = DependencyManager::get<GrabManager>();
+    grabManager->simulateGrabs();
 
-void Application::setDisplayPlugin(DisplayPluginPointer newDisplayPlugin) {
-    if (newDisplayPlugin == _displayPlugin) {
-        return;
+    // TODO: break these out into distinct perfTimers when they prove interesting
+    {
+        PROFILE_RANGE(app, "PickManager");
+        PerformanceTimer perfTimer("pickManager");
+        DependencyManager::get<PickManager>()->update();
     }
 
-    // FIXME don't have the application directly set the state of the UI,
-    // instead emit a signal that the display plugin is changing and let
-    // the desktop lock itself.  Reduces coupling between the UI and display
-    // plugins
-    auto offscreenUi = getOffscreenUI();
-    auto desktop = offscreenUi ? offscreenUi->getDesktop() : nullptr;
-    auto menu = Menu::getInstance();
+    {
+        PROFILE_RANGE(app, "PointerManager");
+        PerformanceTimer perfTimer("pointerManager");
+        DependencyManager::get<PointerManager>()->update();
+    }
+
+    QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
 
-    // Make the switch atomic from the perspective of other threads
     {
-        std::unique_lock<std::mutex> lock(_displayPluginLock);
-        bool wasRepositionLocked = false;
-        if (desktop) {
-            // Tell the desktop to no reposition (which requires plugin info), until we have set the new plugin, below.
-            wasRepositionLocked = desktop->property("repositionLocked").toBool();
-            desktop->setProperty("repositionLocked", true);
-        }
+        PROFILE_RANGE(simulation_physics, "Simulation");
+        PerformanceTimer perfTimer("simulation");
 
-        if (_displayPlugin) {
-            disconnect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
-            _displayPlugin->deactivate();
-        }
+        getEntities()->preUpdate();
+        _entitySimulation->removeDeadEntities();
 
-        auto oldDisplayPlugin = _displayPlugin;
-        bool active = newDisplayPlugin->activate();
+        auto t0 = std::chrono::high_resolution_clock::now();
+        auto t1 = t0;
+        {
+            PROFILE_RANGE(simulation_physics, "PrePhysics");
+            PerformanceTimer perfTimer("prePhysics)");
+            {
+                PROFILE_RANGE(simulation_physics, "Entities");
+                PhysicsEngine::Transaction transaction;
+                _entitySimulation->buildPhysicsTransaction(transaction);
+                _physicsEngine->processTransaction(transaction);
+                _entitySimulation->handleProcessedPhysicsTransaction(transaction);
+            }
 
-        if (!active) {
-            const DisplayPluginList& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+            t1 = std::chrono::high_resolution_clock::now();
 
-            // If the new plugin fails to activate, fallback to last display
-            qWarning() << "Failed to activate display: " << newDisplayPlugin->getName();
-            newDisplayPlugin = oldDisplayPlugin;
+            {
+                PROFILE_RANGE(simulation_physics, "Avatars");
+                PhysicsEngine::Transaction transaction;
+                avatarManager->buildPhysicsTransaction(transaction);
+                _physicsEngine->processTransaction(transaction);
+                avatarManager->handleProcessedPhysicsTransaction(transaction);
 
-            if (newDisplayPlugin) {
-                qWarning() << "Falling back to last display: " << newDisplayPlugin->getName();
-                active = newDisplayPlugin->activate();
+                myAvatar->prepareForPhysicsSimulation();
+                myAvatar->getCharacterController()->preSimulation();
             }
+        }
 
-            // If there is no last display, or
-            // If the last display fails to activate, fallback to desktop
-            if (!active) {
-                newDisplayPlugin = displayPlugins.at(0);
-                qWarning() << "Falling back to display: " << newDisplayPlugin->getName();
-                active = newDisplayPlugin->activate();
+        if (_physicsEnabled) {
+            {
+                PROFILE_RANGE(simulation_physics, "PrepareActions");
+                _entitySimulation->applyDynamicChanges();
+                _physicsEngine->forEachDynamic([&](EntityDynamicPointer dynamic) {
+                    dynamic->prepareForPhysicsSimulation();
+                });
             }
-
-            if (!active) {
-                qFatal("Failed to activate fallback plugin");
+            auto t2 = std::chrono::high_resolution_clock::now();
+            {
+                PROFILE_RANGE(simulation_physics, "StepPhysics");
+                PerformanceTimer perfTimer("stepPhysics");
+                getEntities()->getTree()->withWriteLock([&] {
+                    _physicsEngine->stepSimulation();
+                });
             }
-        }
-
-        if (offscreenUi) {
-            offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
-        }
-        getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
-        _displayPlugin = newDisplayPlugin;
-        connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent, Qt::DirectConnection);
-        if (desktop) {
-            desktop->setProperty("repositionLocked", wasRepositionLocked);
-        }
-
-        RefreshRateManager& refreshRateManager = getRefreshRateManager();
-        refreshRateManager.setRefreshRateOperator(OpenGLDisplayPlugin::getRefreshRateOperator());
-        bool isHmd = newDisplayPlugin->isHmd();
-        RefreshRateManager::UXMode uxMode = isHmd ? RefreshRateManager::UXMode::VR :
-            RefreshRateManager::UXMode::DESKTOP;
-
-        refreshRateManager.setUXMode(uxMode);
-    }
+            auto t3 = std::chrono::high_resolution_clock::now();
+            {
+                if (_physicsEngine->hasOutgoingChanges()) {
+                    {
+                        PROFILE_RANGE(simulation_physics, "PostPhysics");
+                        PerformanceTimer perfTimer("postPhysics");
+                        // grab the collision events BEFORE handleChangedMotionStates() because at this point
+                        // we have a better idea of which objects we own or should own.
+                        auto& collisionEvents = _physicsEngine->getCollisionEvents();
 
-    bool isHmd = _displayPlugin->isHmd();
-    qCDebug(interfaceapp) << "Entering into" << (isHmd ? "HMD" : "Desktop") << "Mode";
+                        getEntities()->getTree()->withWriteLock([&] {
+                            PROFILE_RANGE(simulation_physics, "HandleChanges");
+                            PerformanceTimer perfTimer("handleChanges");
 
-    // Only log/emit after a successful change
-    UserActivityLogger::getInstance().logAction("changed_display_mode", {
-        { "previous_display_mode", _displayPlugin ? _displayPlugin->getName() : "" },
-        { "display_mode", newDisplayPlugin ? newDisplayPlugin->getName() : "" },
-        { "hmd", isHmd }
-    });
-    emit activeDisplayPluginChanged();
+                            const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
+                            _entitySimulation->handleChangedMotionStates(outgoingChanges);
+                            avatarManager->handleChangedMotionStates(outgoingChanges);
 
-    // reset the avatar, to set head and hand palms back to a reasonable default pose.
-    getMyAvatar()->reset(false);
+                            const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
+                            _entitySimulation->handleDeactivatedMotionStates(deactivations);
+                        });
 
-    // switch to first person if entering hmd and setting is checked
-    if (menu) {
-        QAction* action = menu->getActionForOption(newDisplayPlugin->getName());
-        if (action) {
-            action->setChecked(true);
-        }
+                        // handleCollisionEvents() AFTER handleChangedMotionStates()
+                        {
+                            PROFILE_RANGE(simulation_physics, "CollisionEvents");
+                            avatarManager->handleCollisionEvents(collisionEvents);
+                            // Collision events (and their scripts) must not be handled when we're locked, above. (That would risk
+                            // deadlock.)
+                            _entitySimulation->handleCollisionEvents(collisionEvents);
+                        }
 
-        if (isHmd && menu->isOptionChecked(MenuOption::FirstPersonHMD)) {
-            menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
-            cameraMenuChanged();
-        }
+                        {
+                            PROFILE_RANGE(simulation_physics, "MyAvatar");
+                            myAvatar->getCharacterController()->postSimulation();
+                            myAvatar->harvestResultsFromPhysicsSimulation(deltaTime);
+                        }
 
-        // Remove the selfie camera options from menu if in HMD mode
-        auto selfieAction = menu->getActionForOption(MenuOption::SelfieCamera);
-        selfieAction->setVisible(!isHmd);
-    }
+                        if (PerformanceTimer::isActive() &&
+                                Menu::getInstance()->isOptionChecked(MenuOption::DisplayDebugTimingDetails) &&
+                                Menu::getInstance()->isOptionChecked(MenuOption::ExpandPhysicsTiming)) {
+                            _physicsEngine->harvestPerformanceStats();
+                        }
+                        // NOTE: the PhysicsEngine stats are written to stdout NOT to Qt log framework
+                        _physicsEngine->dumpStatsIfNecessary();
+                    }
+                    auto t4 = std::chrono::high_resolution_clock::now();
 
-    Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
-}
+                    // NOTE: the getEntities()->update() call below will wait for lock
+                    // and will provide non-physical entity motion
+                    getEntities()->update(true); // update the models...
 
-void Application::switchDisplayMode() {
-    if (!_autoSwitchDisplayModeSupportedHMDPlugin) {
-        return;
-    }
+                    auto t5 = std::chrono::high_resolution_clock::now();
 
-    bool currentHMDWornStatus = _autoSwitchDisplayModeSupportedHMDPlugin->isDisplayVisible();
-    if (currentHMDWornStatus != _previousHMDWornStatus) {
-        // Switch to respective mode as soon as currentHMDWornStatus changes
-        if (currentHMDWornStatus) {
-            qCDebug(interfaceapp) << "Switching from Desktop to HMD mode";
-            endHMDSession();
-            setActiveDisplayPlugin(_autoSwitchDisplayModeSupportedHMDPluginName);
+                    workload::Timings timings(6);
+                    timings[0] = t1 - t0; // prePhysics entities
+                    timings[1] = t2 - t1; // prePhysics avatars
+                    timings[2] = t3 - t2; // stepPhysics
+                    timings[3] = t4 - t3; // postPhysics
+                    timings[4] = t5 - t4; // non-physical kinematics
+                    timings[5] = workload::Timing_ns((int32_t)(NSECS_PER_SECOND * deltaTime)); // game loop duration
+                    _gameWorkload.updateSimulationTimings(timings);
+                }
+            }
         } else {
-            qCDebug(interfaceapp) << "Switching from HMD to desktop mode";
-            setActiveDisplayPlugin(DESKTOP_DISPLAY_PLUGIN_NAME);
-            startHMDStandBySession();
+            // update the rendering without any simulation
+            getEntities()->update(false);
         }
+        // remove recently dead avatarEntities
+        SetOfEntities deadAvatarEntities;
+        _entitySimulation->takeDeadAvatarEntities(deadAvatarEntities);
+        avatarManager->removeDeadAvatarEntities(deadAvatarEntities);
     }
-    _previousHMDWornStatus = currentHMDWornStatus;
-}
-
-void Application::setShowBulletWireframe(bool value) {
-    _physicsEngine->setShowBulletWireframe(value);
-}
-
-void Application::setShowBulletAABBs(bool value) {
-    _physicsEngine->setShowBulletAABBs(value);
-}
-
-void Application::setShowBulletContactPoints(bool value) {
-    _physicsEngine->setShowBulletContactPoints(value);
-}
-
-void Application::setShowBulletConstraints(bool value) {
-    _physicsEngine->setShowBulletConstraints(value);
-}
-
-void Application::setShowBulletConstraintLimits(bool value) {
-    _physicsEngine->setShowBulletConstraintLimits(value);
-}
-
-void Application::confirmConnectWithoutAvatarEntities() {
-
-    if (_confirmConnectWithoutAvatarEntitiesDialog) {
-        // Dialog is already displayed.
-        return;
-    }
-
-    if (!getMyAvatar()->hasAvatarEntities()) {
-        // No avatar entities so continue with login.
-        DependencyManager::get<NodeList>()->getDomainHandler().setCanConnectWithoutAvatarEntities(true);
-        return;
-    }
-
-    QString continueMessage = "Your wearables will not display on this domain. Continue?";
-    _confirmConnectWithoutAvatarEntitiesDialog = OffscreenUi::asyncQuestion("Continue Without Wearables", continueMessage,
-        QMessageBox::Yes | QMessageBox::No);
-    if (_confirmConnectWithoutAvatarEntitiesDialog->getDialogItem()) {
-        QObject::connect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, [=](QVariant answer) {
-            QObject::disconnect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, nullptr);
-            _confirmConnectWithoutAvatarEntitiesDialog = nullptr;
-            bool shouldConnect = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
-            DependencyManager::get<NodeList>()->getDomainHandler().setCanConnectWithoutAvatarEntities(shouldConnect);
-        });
-    }
-}
-
-void Application::createLoginDialog() {
-    const glm::vec3 LOGIN_DIMENSIONS { 0.89f, 0.5f, 0.01f };
-    const auto OFFSET = glm::vec2(0.7f, -0.1f);
-    auto cameraPosition = _myCamera.getPosition();
-    auto cameraOrientation = _myCamera.getOrientation();
-    auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y;
-    auto headLookVec = (cameraOrientation * Vectors::FRONT);
-    // DEFAULT_DPI / tablet scale percentage
-    const float DPI = 31.0f / (75.0f / 100.0f);
-    auto offset = headLookVec * OFFSET.x;
-    auto position = (cameraPosition + offset) + (upVec * OFFSET.y);
-
-    EntityItemProperties properties;
-    properties.setType(EntityTypes::Web);
-    properties.setName("LoginDialogEntity");
-    properties.setSourceUrl(LOGIN_DIALOG.toString());
-    properties.setPosition(position);
-    properties.setRotation(cameraOrientation);
-    properties.setDimensions(LOGIN_DIMENSIONS);
-    properties.setPrimitiveMode(PrimitiveMode::SOLID);
-    properties.getGrab().setGrabbable(false);
-    properties.setIgnorePickIntersection(false);
-    properties.setAlpha(1.0f);
-    properties.setDPI(DPI);
-    properties.setVisible(true);
-
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    _loginDialogID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
-
-    auto keyboard = DependencyManager::get<Keyboard>().data();
-    if (!keyboard->getAnchorID().isNull() && !_loginDialogID.isNull()) {
-        auto keyboardLocalOffset = cameraOrientation * glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f);
-
-        EntityItemProperties properties;
-        properties.setPosition(position + keyboardLocalOffset);
-        properties.setRotation(cameraOrientation * Quaternions::Y_180);
-
-        entityScriptingInterface->editEntity(keyboard->getAnchorID(), properties);
-        keyboard->setResetKeyboardPositionOnRaise(false);
-    }
-    setKeyboardFocusEntity(_loginDialogID);
-    emit loginDialogFocusEnabled();
-    getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false);
-    getApplicationCompositor().getReticleInterface()->setVisible(false);
-    if (!_loginStateManager.isSetUp()) {
-        _loginStateManager.setUp();
-    }
-}
 
-void Application::updateLoginDialogPosition() {
-    const float LOOK_AWAY_THRESHOLD_ANGLE = 70.0f;
-    const auto OFFSET = glm::vec2(0.7f, -0.1f);
-
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    EntityPropertyFlags desiredProperties;
-    desiredProperties += PROP_POSITION;
-    auto properties = entityScriptingInterface->getEntityPropertiesInternal(_loginDialogID, desiredProperties, false);
-    auto positionVec = properties.getPosition();
-    auto cameraPositionVec = _myCamera.getPosition();
-    auto cameraOrientation = cancelOutRollAndPitch(_myCamera.getOrientation());
-    auto headLookVec = (cameraOrientation * Vectors::FRONT);
-    auto entityToHeadVec = positionVec - cameraPositionVec;
-    auto pointAngle = (glm::acos(glm::dot(glm::normalize(entityToHeadVec), glm::normalize(headLookVec))) * 180.0f / PI);
-    auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y;
-    auto offset = headLookVec * OFFSET.x;
-    auto newPositionVec = (cameraPositionVec + offset) + (upVec * OFFSET.y);
-
-    bool outOfBounds = glm::distance(positionVec, cameraPositionVec) > 1.0f;
-
-    if (pointAngle > LOOK_AWAY_THRESHOLD_ANGLE || outOfBounds) {
+    // AvatarManager update
+    {
         {
-            EntityItemProperties properties;
-            properties.setPosition(newPositionVec);
-            properties.setRotation(cameraOrientation);
-            entityScriptingInterface->editEntity(_loginDialogID, properties);
+            PROFILE_RANGE(simulation, "OtherAvatars");
+            PerformanceTimer perfTimer("otherAvatars");
+            avatarManager->updateOtherAvatars(deltaTime);
         }
 
         {
-            glm::vec3 keyboardLocalOffset = cameraOrientation * glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f);
-            glm::quat keyboardOrientation = cameraOrientation * glm::quat(glm::radians(glm::vec3(-30.0f, 180.0f, 0.0f)));
-
-            EntityItemProperties properties;
-            properties.setPosition(newPositionVec + keyboardLocalOffset);
-            properties.setRotation(keyboardOrientation);
-            entityScriptingInterface->editEntity(DependencyManager::get<Keyboard>()->getAnchorID(), properties);
+            PROFILE_RANGE(simulation, "MyAvatar");
+            PerformanceTimer perfTimer("MyAvatar");
+            qApp->updateMyAvatarLookAtPosition(deltaTime);
+            avatarManager->updateMyAvatar(deltaTime);
         }
     }
-}
-
-void Application::createAvatarInputsBar() {
-    const glm::vec3 LOCAL_POSITION { 0.0, 0.0, -1.0 };
-    // DEFAULT_DPI / tablet scale percentage
-    const float DPI = 31.0f / (75.0f / 100.0f);
-
-    EntityItemProperties properties;
-    properties.setType(EntityTypes::Web);
-    properties.setName("AvatarInputsBarEntity");
-    properties.setSourceUrl(AVATAR_INPUTS_BAR_QML.toString());
-    properties.setParentID(getMyAvatar()->getSelfID());
-    properties.setParentJointIndex(getMyAvatar()->getJointIndex("_CAMERA_MATRIX"));
-    properties.setPosition(LOCAL_POSITION);
-    properties.setLocalRotation(Quaternions::IDENTITY);
-    //properties.setDimensions(LOGIN_DIMENSIONS);
-    properties.setPrimitiveMode(PrimitiveMode::SOLID);
-    properties.getGrab().setGrabbable(false);
-    properties.setIgnorePickIntersection(false);
-    properties.setAlpha(1.0f);
-    properties.setDPI(DPI);
-    properties.setVisible(true);
-
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    _avatarInputsBarID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
-}
-
-void Application::destroyAvatarInputsBar() {
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-    if (!_avatarInputsBarID.isNull()) {
-        entityScriptingInterface->deleteEntity(_avatarInputsBarID);
-    }
-}
 
-bool Application::hasRiftControllers() {
-    return PluginUtils::isOculusTouchControllerAvailable();
-}
+    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
+    PerformanceWarning warn(showWarnings, "Application::update()");
 
-bool Application::hasViveControllers() {
-    return PluginUtils::isViveControllerAvailable();
-}
+    updateLOD(deltaTime);
 
-void Application::onDismissedLoginDialog() {
-    _loginDialogPoppedUp = false;
-    loginDialogPoppedUp.set(false);
-    auto keyboard = DependencyManager::get<Keyboard>().data();
-    keyboard->setResetKeyboardPositionOnRaise(true);
     if (!_loginDialogID.isNull()) {
-        DependencyManager::get<EntityScriptingInterface>()->deleteEntity(_loginDialogID);
-        _loginDialogID = QUuid();
-        _loginStateManager.tearDown();
+        _loginStateManager.update(getMyAvatar()->getDominantHand(), _loginDialogID);
+        updateLoginDialogPosition();
     }
-    resumeAfterLoginDialogActionTaken();
-}
-
-void Application::setShowTrackedObjects(bool value) {
-    _showTrackedObjects = value;
-}
-
-void Application::startHMDStandBySession() {
-    _autoSwitchDisplayModeSupportedHMDPlugin->startStandBySession();
-}
-
-void Application::endHMDSession() {
-    _autoSwitchDisplayModeSupportedHMDPlugin->endSession();
-}
 
-mat4 Application::getEyeProjection(int eye) const {
-    QMutexLocker viewLocker(&_viewMutex);
-    if (isHMDMode()) {
-        return getActiveDisplayPlugin()->getEyeProjection((Eye)eye, _viewFrustum.getProjection());
+    {
+        PROFILE_RANGE_EX(app, "Overlays", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
+        PerformanceTimer perfTimer("overlays");
+        _overlays.update(deltaTime);
     }
-    return _viewFrustum.getProjection();
-}
 
-mat4 Application::getEyeOffset(int eye) const {
-    // FIXME invert?
-    return getActiveDisplayPlugin()->getEyeToHeadTransform((Eye)eye);
-}
+    // Update _viewFrustum with latest camera and view frustum data...
+    // NOTE: we get this from the view frustum, to make it simpler, since the
+    // loadViewFrumstum() method will get the correct details from the camera
+    // We could optimize this to not actually load the viewFrustum, since we don't
+    // actually need to calculate the view frustum planes to send these details
+    // to the server.
+    {
+        QMutexLocker viewLocker(&_viewMutex);
+        _myCamera.loadViewFrustum(_viewFrustum);
 
-mat4 Application::getHMDSensorPose() const {
-    if (isHMDMode()) {
-        return getActiveDisplayPlugin()->getHeadPose();
+        _conicalViews.clear();
+        _conicalViews.push_back(_viewFrustum);
+        // TODO: Fix this by modeling the way the secondary camera works on how the main camera works
+        // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary
+        // camera should be.
+        updateSecondaryCameraViewFrustum();
     }
-    return mat4();
-}
 
-void Application::deadlockApplication() {
-    qCDebug(interfaceapp) << "Intentionally deadlocked Interface";
-    // Using a loop that will *technically* eventually exit (in ~600 billion years)
-    // to avoid compiler warnings about a loop that will never exit
-    for (uint64_t i = 1; i != 0; ++i) {
-        QThread::sleep(1);
-    }
-}
+    quint64 now = usecTimestampNow();
 
-// cause main thread to be unresponsive for 35 seconds
-void Application::unresponsiveApplication() {
-    // to avoid compiler warnings about a loop that will never exit
-    uint64_t start = usecTimestampNow();
-    uint64_t UNRESPONSIVE_FOR_SECONDS = 35;
-    uint64_t UNRESPONSIVE_FOR_USECS = UNRESPONSIVE_FOR_SECONDS * USECS_PER_SECOND;
-    qCDebug(interfaceapp) << "Intentionally cause Interface to be unresponsive for " << UNRESPONSIVE_FOR_SECONDS << " seconds";
-    while (usecTimestampNow() - start < UNRESPONSIVE_FOR_USECS) {
-        QThread::sleep(1);
-    }
-}
+    // Update my voxel servers with my current voxel query...
+    {
+        PROFILE_RANGE_EX(app, "QueryOctree", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
+        PerformanceTimer perfTimer("queryOctree");
+        QMutexLocker viewLocker(&_viewMutex);
 
-void Application::setActiveDisplayPlugin(const QString& pluginName) {
-    DisplayPluginPointer newDisplayPlugin;
-    for (const DisplayPluginPointer& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
-        QString name = displayPlugin->getName();
-        if (pluginName == name) {
-            newDisplayPlugin = displayPlugin;
-            break;
+        bool viewIsDifferentEnough = false;
+        if (_conicalViews.size() == _lastQueriedViews.size()) {
+            for (size_t i = 0; i < _conicalViews.size(); ++i) {
+                if (!_conicalViews[i].isVerySimilar(_lastQueriedViews[i])) {
+                    viewIsDifferentEnough = true;
+                    break;
+                }
+            }
+        } else {
+            viewIsDifferentEnough = true;
         }
-    }
-
-    if (newDisplayPlugin) {
-        setDisplayPlugin(newDisplayPlugin);
-    }
-}
-
-void Application::handleLocalServerConnection() const {
-    auto server = qobject_cast<QLocalServer*>(sender());
-    Q_ASSERT(server != nullptr);
-
-    qCDebug(interfaceapp) << "Got connection on local server from additional instance - waiting for parameters";
 
-    auto socket = server->nextPendingConnection();
 
-    connect(socket, &QLocalSocket::readyRead, this, &Application::readArgumentsFromLocalSocket);
+        // if it's been a while since our last query or the view has significantly changed then send a query, otherwise suppress it
+        static const std::chrono::seconds MIN_PERIOD_BETWEEN_QUERIES { 3 };
+        auto now = SteadyClock::now();
+        if (now > _queryExpiry || viewIsDifferentEnough) {
+            if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
+                queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
+            }
+            queryAvatars();
 
-    qApp->getWindow()->raise();
-    qApp->getWindow()->activateWindow();
-}
+            _lastQueriedViews = _conicalViews;
+            _queryExpiry = now + MIN_PERIOD_BETWEEN_QUERIES;
+        }
+    }
 
-void Application::readArgumentsFromLocalSocket() const {
-    auto socket = qobject_cast<QLocalSocket*>(sender());
-    Q_ASSERT(socket != nullptr);
+    // sent nack packets containing missing sequence numbers of received packets from nodes
+    {
+        quint64 sinceLastNack = now - _lastNackTime;
+        const quint64 TOO_LONG_SINCE_LAST_NACK = 1 * USECS_PER_SECOND;
+        if (sinceLastNack > TOO_LONG_SINCE_LAST_NACK) {
+            _lastNackTime = now;
+            sendNackPackets();
+        }
+    }
 
-    auto message = socket->readAll();
-    socket->deleteLater();
+    // send packet containing downstream audio stats to the AudioMixer
+    {
+        quint64 sinceLastNack = now - _lastSendDownstreamAudioStats;
+        if (sinceLastNack > TOO_LONG_SINCE_LAST_SEND_DOWNSTREAM_AUDIO_STATS && !isInterstitialMode()) {
+            _lastSendDownstreamAudioStats = now;
 
-    qCDebug(interfaceapp) << "Read from connection: " << message;
+            QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "sendDownstreamAudioStatsPacket", Qt::QueuedConnection);
+        }
+    }
 
-    // If we received a message, try to open it as a URL
-    if (message.length() > 0) {
-        DependencyManager::get<AddressManager>()->handleLookupString(QString::fromUtf8(message));
+    {
+        PerformanceTimer perfTimer("avatarManager/postUpdate");
+        avatarManager->postUpdate(deltaTime, getMain3DScene());
     }
-}
 
-void Application::showDesktop() {
-}
+    {
+        PROFILE_RANGE_EX(app, "PostUpdateLambdas", 0xffff0000, (uint64_t)0);
+        PerformanceTimer perfTimer("postUpdateLambdas");
+        std::unique_lock<std::mutex> guard(_postUpdateLambdasLock);
+        for (auto& iter : _postUpdateLambdas) {
+            iter.second();
+        }
+        _postUpdateLambdas.clear();
+    }
 
-CompositorHelper& Application::getApplicationCompositor() const {
-    return *DependencyManager::get<CompositorHelper>();
-}
 
+    updateRenderArgs(deltaTime);
 
-// virtual functions required for PluginContainer
-ui::Menu* Application::getPrimaryMenu() {
-    auto appMenu = _window->menuBar();
-    auto uiMenu = dynamic_cast<ui::Menu*>(appMenu);
-    return uiMenu;
-}
+    {
+        PerformanceTimer perfTimer("AnimDebugDraw");
+        AnimDebugDraw::getInstance().update();
+    }
 
-void Application::showDisplayPluginsTools(bool show) {
-    DependencyManager::get<DialogsManager>()->hmdTools(show);
-}
 
-GLWidget* Application::getPrimaryWidget() {
-    return _glWidget;
-}
+    { // Game loop is done, mark the end of the frame for the scene transactions and the render loop to take over
+        PerformanceTimer perfTimer("enqueueFrame");
+        getMain3DScene()->enqueueFrame();
+    }
 
-MainWindow* Application::getPrimaryWindow() {
-    return getWindow();
-}
+    // If the display plugin is inactive then the frames won't be processed so process them here.
+    if (!getActiveDisplayPlugin()->isActive()) {
+        getMain3DScene()->processTransactionQueue();
+    }
 
-QOpenGLContext* Application::getPrimaryContext() {
-    return _glWidget->qglContext();
+    // decide if the sensorToWorldMatrix is changing in a way that warrents squeezing the edges of the view down
+    if (getActiveDisplayPlugin()->isHmd()) {
+        PerformanceTimer perfTimer("squeezeVision");
+        _visionSqueeze.updateVisionSqueeze(myAvatar->getSensorToWorldMatrix(), deltaTime);
+    }
 }
 
-bool Application::makeRenderingContextCurrent() {
-    return true;
-}
 
-bool Application::isForeground() const {
-    return _isForeground && !_window->isMinimized();
+void Application::updateLOD(float deltaTime) const {
+    PerformanceTimer perfTimer("LOD");
+    // adjust it unless we were asked to disable this feature, or if we're currently in throttleRendering mode
+    if (!isThrottleRendering()) {
+        float presentTime = getActiveDisplayPlugin()->getAveragePresentTime();
+        float engineRunTime = (float)(_graphicsEngine->getRenderEngine()->getConfiguration().get()->getCPURunTime());
+        float gpuTime = getGPUContext()->getFrameTimerGPUAverage();
+        float batchTime = getGPUContext()->getFrameTimerBatchAverage();
+        auto lodManager = DependencyManager::get<LODManager>();
+        lodManager->setRenderTimes(presentTime, engineRunTime, batchTime, gpuTime);
+        lodManager->autoAdjustLOD(deltaTime);
+    } else {
+        DependencyManager::get<LODManager>()->resetLODAdjust();
+    }
 }
 
-// FIXME?  perhaps two, one for the main thread and one for the offscreen UI rendering thread?
-static const int UI_RESERVED_THREADS = 1;
-// Windows won't let you have all the cores
-static const int OS_RESERVED_THREADS = 1;
-
-void Application::updateThreadPoolCount() const {
-    auto reservedThreads = UI_RESERVED_THREADS + OS_RESERVED_THREADS + _displayPlugin->getRequiredThreadCount();
-    auto availableThreads = QThread::idealThreadCount() - reservedThreads;
-    auto threadPoolSize = std::max(MIN_PROCESSING_THREAD_POOL_SIZE, availableThreads);
-    qCDebug(interfaceapp) << "Ideal Thread Count " << QThread::idealThreadCount();
-    qCDebug(interfaceapp) << "Reserved threads " << reservedThreads;
-    qCDebug(interfaceapp) << "Setting thread pool size to " << threadPoolSize;
-    QThreadPool::globalInstance()->setMaxThreadCount(threadPoolSize);
-}
+void Application::updateThreads(float deltaTime) {
+    PerformanceTimer perfTimer("updateThreads");
+    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
+    PerformanceWarning warn(showWarnings, "Application::updateThreads()");
 
-void Application::updateSystemTabletMode() {
-    if (_settingsLoaded && !getLoginDialogPoppedUp()) {
-        qApp->setProperty(hifi::properties::HMD, isHMDMode());
-        if (isHMDMode()) {
-            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
-        } else {
-            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
-        }
+    // parse voxel packets
+    if (!_enableProcessOctreeThread) {
+        _octreeProcessor->threadRoutine();
+        _entityEditSender->threadRoutine();
     }
 }
 
-QUuid Application::getTabletScreenID() const {
-    auto HMD = DependencyManager::get<HMDScriptingInterface>();
-    return HMD->getCurrentTabletScreenID();
-}
-
-QUuid Application::getTabletHomeButtonID() const {
-    auto HMD = DependencyManager::get<HMDScriptingInterface>();
-    return HMD->getCurrentHomeButtonID();
-}
+void Application::userKickConfirmation(const QUuid& nodeID, unsigned int banFlags) {
+    auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
+    auto avatar = avatarHashMap->getAvatarBySessionID(nodeID);
 
-QUuid Application::getTabletFrameID() const {
-    auto HMD = DependencyManager::get<HMDScriptingInterface>();
-    return HMD->getCurrentTabletFrameID();
-}
+    QString userName;
 
-QVector<QUuid> Application::getTabletIDs() const {
-    // Most important first.
-    QVector<QUuid> result;
-    auto HMD = DependencyManager::get<HMDScriptingInterface>();
-    result << HMD->getCurrentTabletScreenID();
-    result << HMD->getCurrentHomeButtonID();
-    result << HMD->getCurrentTabletFrameID();
-    return result;
-}
+    if (avatar) {
+        userName = avatar->getSessionDisplayName();
+    } else {
+        userName = nodeID.toString();
+    }
 
-void Application::setAvatarOverrideUrl(const QUrl& url, bool save) {
-    _avatarOverrideUrl = url;
-    _saveAvatarOverrideUrl = save;
-}
+    QString kickMessage = "Do you wish to kick " + userName + " from your domain";
+    ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Kick User", kickMessage,
+                                                          QMessageBox::Yes | QMessageBox::No);
 
-void Application::saveNextPhysicsStats(QString filename) {
-    _physicsEngine->saveNextPhysicsStats(filename);
-}
+    if (dlg->getDialogItem()) {
 
-void Application::copyToClipboard(const QString& text) {
-    if (QThread::currentThread() != qApp->thread()) {
-        QMetaObject::invokeMethod(this, "copyToClipboard");
-        return;
-    }
+        QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
 
-    // assume that the address is being copied because the user wants a shareable address
-    QApplication::clipboard()->setText(text);
-}
+            bool yes = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
+            // ask the NodeList to kick the user with the given session ID
 
-QString Application::getGraphicsCardType() {
-    return GPUIdent::getInstance()->getName();
-}
+            if (yes) {
+                DependencyManager::get<NodeList>()->kickNodeBySessionID(nodeID, banFlags);
+            }
 
-void Application::openDirectory(const QString& path) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "openDirectory", Q_ARG(const QString&, path));
-        return;
+            DependencyManager::get<UsersScriptingInterface>()->setWaitForKickResponse(false);
+        });
+        DependencyManager::get<UsersScriptingInterface>()->setWaitForKickResponse(true);
     }
+}
 
-    QString dirPath = path;
-#if defined(Q_OS_WIN)
-    const QString FILE_SCHEME = "file:///";
-#else
-    const QString FILE_SCHEME = "file://";
-#endif
-    if (dirPath.startsWith(FILE_SCHEME)) {
-        dirPath.remove(0, FILE_SCHEME.length());
-    }
-    QFileInfo fileInfo(dirPath);
-    if (fileInfo.isDir()) {
-        auto scheme = QUrl(path).scheme();
-        QDesktopServices::unsetUrlHandler(scheme);
-        QDesktopServices::openUrl(path);
-        QDesktopServices::setUrlHandler(scheme, this, "showUrlHandler");
-    }
+std::shared_ptr<MyAvatar> Application::getMyAvatar() const {
+    return DependencyManager::get<AvatarManager>()->getMyAvatar();
 }
 
-void Application::showUrlHandler(const QUrl& url) {
-    if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "showUrlHandler", Q_ARG(const QUrl&, url));
-        return;
-    }
+void Application::checkSkeleton() const {
+    if (getMyAvatar()->getSkeletonModel()->isLoaded() && !getMyAvatar()->getSkeletonModel()->hasSkeleton()) {
+        qCDebug(interfaceapp) << "MyAvatar model has no skeleton";
 
-    ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Confirm openUrl", "Do you recognize this path or code and want to open or execute it: " + url.toDisplayString());
-    QObject::connect(dlg, &ModalDialogListener::response, this, [=](QVariant answer) {
-        QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
-        if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {
-            // Unset the handler, open the URL, and the reset the handler
-            QDesktopServices::unsetUrlHandler(url.scheme());
-            QDesktopServices::openUrl(url);
-            QDesktopServices::setUrlHandler(url.scheme(), this, "showUrlHandler");
-        }
-    });
-}
+        QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
+        OffscreenUi::asyncWarning("", message);
 
-// used to test "shutdown" crash annotation.
-void Application::crashOnShutdown() {
-    qDebug() << "crashOnShutdown(), ON PURPOSE!";
-    _crashOnShutdown = true;
-    quit();
+        getMyAvatar()->useFullAvatarURL(AvatarData::defaultFullAvatarModelUrl(), DEFAULT_FULL_AVATAR_MODEL_NAME);
+    } else {
+        _physicsEngine->setCharacterController(getMyAvatar()->getCharacterController());
+    }
 }
 
-void Application::overrideEntry(){
-    _overrideEntry = true;
-}
-void Application::forceDisplayName(const QString& displayName) {
-    getMyAvatar()->setDisplayName(displayName);
-}
-void Application::forceLoginWithTokens(const QString& tokens) {
-    DependencyManager::get<AccountManager>()->setAccessTokens(tokens);
-    Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, true).set(true);
-}
-void Application::setConfigFileURL(const QString& fileUrl) {
-    DependencyManager::get<AccountManager>()->setConfigFileURL(fileUrl);
-}
+void Application::queryAvatars() {
+    if (!isInterstitialMode()) {
+        auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
+        auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
+        unsigned char* bufferStart = destinationBuffer;
 
-#if defined(Q_OS_ANDROID)
-void Application::beforeEnterBackground() {
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->setSendDomainServerCheckInEnabled(false);
-    nodeList->reset("Entering background", true);
-    clearDomainOctreeDetails();
-}
+        uint8_t numFrustums = (uint8_t)_conicalViews.size();
+        memcpy(destinationBuffer, &numFrustums, sizeof(numFrustums));
+        destinationBuffer += sizeof(numFrustums);
 
+        for (const auto& view : _conicalViews) {
+            destinationBuffer += view.serialize(destinationBuffer);
+        }
 
+        avatarPacket->setPayloadSize(destinationBuffer - bufferStart);
 
-void Application::enterBackground() {
-    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
-                              "stop", Qt::BlockingQueuedConnection);
-// Quest only supports one plugin which can't be deactivated currently
-#if !defined(ANDROID_APP_QUEST_INTERFACE)
-    if (getActiveDisplayPlugin()->isActive()) {
-        getActiveDisplayPlugin()->deactivate();
+        DependencyManager::get<NodeList>()->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
     }
-#endif
 }
 
-void Application::enterForeground() {
-    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(),
-                                  "start", Qt::BlockingQueuedConnection);
-// 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);
-}
+void Application::tryToEnablePhysics() {
+    bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
 
+    if (gpuTextureMemSizeStable() || !enableInterstitial) {
+        _fullSceneCounterAtLastPhysicsCheck = _octreeProcessor->getFullSceneReceivedCounter();
+        _lastQueriedViews.clear();  // Force new view.
 
-void Application::toggleAwayMode(){
-    QKeyEvent event = QKeyEvent (QEvent::KeyPress, Qt::Key_Escape, Qt::NoModifier);
-    QCoreApplication::sendEvent (this, &event);
+        // process octree stats packets are sent in between full sends of a scene (this isn't currently true).
+        // We keep physics disabled until we've received a full scene and everything near the avatar in that
+        // scene is ready to compute its collision shape.
+        auto myAvatar = getMyAvatar();
+        if (myAvatar->isReadyForPhysics()) {
+            myAvatar->getCharacterController()->setPhysicsEngine(_physicsEngine);
+            _octreeProcessor->resetSafeLanding();
+            _physicsEnabled = true;
+            setIsInterstitialMode(false);
+            myAvatar->updateMotionBehaviorFromMenu();
+        }
+    }
 }
-
-
-#endif
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 63a035dd45e..bb5928625c3 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -15,96 +15,60 @@
 #ifndef hifi_Application_h
 #define hifi_Application_h
 
-#include <functional>
-#include <memory>
-
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QHash>
-#include <QtCore/QPointer>
-#include <QtCore/QSet>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QStringList>
-#include <QtQuick/QQuickItem>
-#include <QtCore/QSharedPointer>
-
-#include <QtGui/QImage>
-
 #include <QtWidgets/QApplication>
 
-#include <AvatarHashMap.h>
-#include <ThreadHelpers.h>
 #include <AbstractScriptingServicesInterface.h>
+#include <AbstractUriHandler.h>
 #include <AbstractViewStateInterface.h>
+#include <AvatarHashMap.h>
 #include <EntityEditPacketSender.h>
-#include <EntityTreeRenderer.h>
-#include "ArchiveDownloadInterface.h"
-#include <input-plugins/KeyboardMouseDevice.h>
-#include <input-plugins/TouchscreenDevice.h>
-#include <input-plugins/TouchscreenVirtualPadDevice.h>
+#include <ModerationFlags.h>
 #include <OctreeQuery.h>
-#include <PhysicalEntitySimulation.h>
 #include <PhysicsEngine.h>
-#include <plugins/Forward.h>
-#include <ui-plugins/PluginContainer.h>
 #include <ShapeManager.h>
-#include <SimpleMovingAverage.h>
-#include <StDev.h>
-#include <ViewFrustum.h>
-#include <AbstractUriHandler.h>
-#include <shared/RateCounter.h>
-#include <ThreadSafeValueCache.h>
-#include <shared/ConicalViewFrustum.h>
-#include <shared/FileLogger.h>
-#include <RunningMarker.h>
-#include <ModerationFlags.h>
-#include <OffscreenUi.h>
+#include <TouchEvent.h>
+#include <ui-plugins/PluginContainer.h>
 
 #include "avatar/MyAvatar.h"
-#include "FancyCamera.h"
 #include "ConnectionMonitor.h"
 #include "CursorManager.h"
-#include "gpu/Context.h"
+#include "FancyCamera.h"
+#include "graphics/GraphicsEngine.h"
 #include "LoginStateManager.h"
-#include "Menu.h"
+#include "octree/OctreePacketProcessor.h"
 #include "PerformanceManager.h"
 #include "RefreshRateManager.h"
-#include "octree/OctreePacketProcessor.h"
-#include "render/Engine.h"
-#include "scripting/ControllerScriptingInterface.h"
 #include "scripting/DialogsManagerScriptingInterface.h"
 #include "ui/ApplicationOverlay.h"
-#include "ui/EntityScriptServerLogDialog.h"
-#include "ui/LodToolsDialog.h"
-#include "ui/LogDialog.h"
-#include "ui/OctreeStatsDialog.h"
 #include "ui/OverlayConductor.h"
 #include "ui/overlays/Overlays.h"
-#include "DiscordRichPresence.h"
-
-#include "workload/GameWorkload.h"
-#include "graphics/GraphicsEngine.h"
-
-#include <graphics/Skybox.h>
-#include <ModelScriptingInterface.h>
-
-#include "Sound.h"
 #include "VisionSqueeze.h"
+#include "workload/GameWorkload.h"
 
+class ArchiveDownloadInterface;
+class AudioInjector;
+class CompositorHelper;
+class ControllerScriptingInterface;
+class DiscordPresence;
+class EntityScriptServerLogDialog;
+class FileLogger;
 class GLCanvas;
+class KeyboardMouseDevice;
+class LogDialog;
 class MainWindow;
-class AssetUpload;
-class CompositorHelper;
-class AudioInjector;
-class ScriptEngine;
-using ScriptEnginePointer = std::shared_ptr<ScriptEngine>;
+class ModalDialogListener;
+class OffscreenUi;
+class TouchscreenDevice;
+class TouchscreenVirtualPadDevice;
+class QCommandLineParser;
+class QGestureEvent;
+class QQmlContext;
+class QQuickItem;
 
 namespace controller {
     class StateController;
 }
 
-
-static const QString RUNNING_MARKER_FILENAME = "Interface.running";
-
 class Application;
 #if defined(qApp)
 #undef qApp
@@ -119,21 +83,13 @@ class Application : public QApplication,
 {
     Q_OBJECT
 
-    // TODO? Get rid of those
-    friend class OctreePacketProcessor;
-
 public:
-
-    /**
-     * @brief Initialize the plugin manager
-     *
-     * This both does the initial startup and parses arguments. This
-     * is necessary because the plugin manager's options must be set
-     * before any usage of it is made, or they won't apply.
-     *
-     * @param parser
-     */
-    void initializePluginManager(const QCommandLineParser& parser);
+    Application(
+        int& argc, char** argv,
+        const QCommandLineParser& parser,
+        QElapsedTimer& startup_time
+    );
+    ~Application();
 
     /**
      * @brief Initialize everything
@@ -146,122 +102,92 @@ class Application : public QApplication,
      */
     void initialize(const QCommandLineParser &parser);
 
+    MainWindow* getWindow() const { return _window; }
+    virtual QThread* getMainThread() override { return thread(); }
+
+    bool isAboutToQuit() const { return _aboutToQuit; }
+    bool isServerlessMode() const;
+    bool isInterstitialMode() const { return _interstitialMode; }
+    bool failedToConnectToEntityServer() const { return _failedToConnectToEntityServer; }
+
     void setPreviousSessionCrashed(bool value) { _previousSessionCrashed = value; }
 
-    // virtual functions required for PluginContainer
-    virtual ui::Menu* getPrimaryMenu() override;
-    virtual void requestReset() override { resetSensors(false); }
-    virtual void showDisplayPluginsTools(bool show) override;
-    virtual GLWidget* getPrimaryWidget() override;
-    virtual MainWindow* getPrimaryWindow() override;
-    virtual QOpenGLContext* getPrimaryContext() override;
-    virtual bool makeRenderingContextCurrent() override;
-    virtual bool isForeground() const override;
+    // Return an HTTP User-Agent string with OS and device information.
+    Q_INVOKABLE QString getUserAgent();
 
-    virtual DisplayPluginPointer getActiveDisplayPlugin() const override;
+    PerformanceManager& getPerformanceManager() { return _performanceManager; }
+    RefreshRateManager& getRefreshRateManager() { return _refreshRateManager; }
+    float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
-    static void shutdownPlugins();
+#ifndef Q_OS_ANDROID
+    FileLogger* getLogger() const { return _logger; }
+#endif
 
-    Application(
-        int& argc, char** argv,
-        const QCommandLineParser& parser,
-        QElapsedTimer& startup_time
-    );
-    ~Application();
+    QString getPreviousScriptLocation() { return _previousScriptLocation.get(); }
+    void setPreviousScriptLocation(const QString& previousScriptLocation) { _previousScriptLocation.set(previousScriptLocation); }
 
-    void postLambdaEvent(const std::function<void()>& f) override;
-    void sendLambdaEvent(const std::function<void()>& f) override;
+    void replaceDomainContent(const QString& url, const QString& itemName);
 
-    QString getPreviousScriptLocation();
-    void setPreviousScriptLocation(const QString& previousScriptLocation);
+    void openDirectory(const QString& path);
 
-    // Return an HTTP User-Agent string with OS and device information.
-    Q_INVOKABLE QString getUserAgent();
+    void overrideEntry() { _overrideEntry = true; }
+    void forceDisplayName(const QString& displayName) { getMyAvatar()->setDisplayName(displayName); }
+    void forceLoginWithTokens(const QString& tokens);
+    void setConfigFileURL(const QString& fileUrl);
 
-    void initializeGL();
-    void initializeDisplayPlugins();
-    void initializeRenderEngine();
-    void initializeUi();
+    void loadAvatarScripts(const QVector<QString>& urls);
+    void unloadAvatarScripts();
 
-    void updateSecondaryCameraViewFrustum();
+    Q_INVOKABLE void copyToClipboard(const QString& text);
 
-    void updateCamera(RenderArgs& renderArgs, float deltaTime);
-    void resizeGL();
+    Q_INVOKABLE void setMinimumGPUTextureMemStabilityCount(int stabilityCount) { _minimumGPUTextureMemSizeStabilityCount = stabilityCount; }
 
-    bool notify(QObject *, QEvent *) override;
-    bool event(QEvent* event) override;
-    bool eventFilter(QObject* object, QEvent* event) override;
+    virtual ControllerScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
+    virtual void registerScriptEngineWithApplicationServices(ScriptManagerPointer& scriptManager) override;
 
-    glm::uvec2 getCanvasSize() const;
-    QRect getRenderingGeometry() const;
+    // used by preferences and HMDScriptingInterface...
+    VisionSqueeze& getVisionSqueeze() { return _visionSqueeze; }
+
+
+    // UI
+    virtual ui::Menu* getPrimaryMenu() override;
+    virtual void showDisplayPluginsTools(bool show) override;
+    virtual GLWidget* getPrimaryWidget() override;
+    virtual MainWindow* getPrimaryWindow() override;
+    virtual QOpenGLContext* getPrimaryContext() override;
+    virtual bool isForeground() const override;
 
-    glm::uvec2 getUiSize() const;
-    QRect getRecommendedHUDRect() const;
-    glm::vec2 getDeviceSize() const;
     bool hasFocus() const;
     void setFocus();
     void raise();
 
     void showCursor(const Cursor::Icon& cursor);
 
-    bool isThrottleRendering() const;
-
-    Camera& getCamera() { return _myCamera; }
-    const Camera& getCamera() const { return _myCamera; }
-    // Represents the current view frustum of the avatar.
-    void copyViewFrustum(ViewFrustum& viewOut) const;
-    // Represents the view frustum of the current rendering pass,
-    // which might be different from the viewFrustum, i.e. shadowmap
-    // passes, mirror window passes, etc
-    void copyDisplayViewFrustum(ViewFrustum& viewOut) const;
-
-    bool isMissingSequenceNumbers() { return _isMissingSequenceNumbers; }
-
-    const ConicalViewFrustums& getConicalViews() const override { return _conicalViews; }
-
-    const OctreePacketProcessor& getOctreePacketProcessor() const { return *_octreeProcessor; }
-    QSharedPointer<EntityTreeRenderer> getEntities() const { return DependencyManager::get<EntityTreeRenderer>(); }
-    MainWindow* getWindow() const { return _window; }
-    EntityTreePointer getEntityClipboard() const { return _entityClipboard; }
-    std::shared_ptr<EntityEditPacketSender> getEntityEditPacketSender() { return _entityEditSender; }
-
-    ivec2 getMouse() const;
-
+    Overlays& getOverlays() { return _overlays; }
     ApplicationOverlay& getApplicationOverlay() { return *_applicationOverlay; }
     const ApplicationOverlay& getApplicationOverlay() const { return *_applicationOverlay; }
     CompositorHelper& getApplicationCompositor() const;
 
-    Overlays& getOverlays() { return _overlays; }
-
-    PerformanceManager& getPerformanceManager() { return _performanceManager; }
-    RefreshRateManager& getRefreshRateManager() { return _refreshRateManager; }
-
-    size_t getRenderFrameCount() const { return _graphicsEngine->getRenderFrameCount(); }
-    float getRenderLoopRate() const { return _graphicsEngine->getRenderLoopRate(); }
-    float getNumCollisionObjects() const;
-    float getTargetRenderFrameRate() const; // frames/second
+    virtual PickRay computePickRay(float x, float y) const override;
 
     static void setupQmlSurface(QQmlContext* surfaceContext, bool setAdditionalContextProperties);
 
-    float getFieldOfView() { return _fieldOfView.get(); }
-    void setFieldOfView(float fov);
-
     float getHMDTabletScale() { return _hmdTabletScale.get(); }
-    void setHMDTabletScale(float hmdTabletScale);
+    void setHMDTabletScale(float hmdTabletScale) { _hmdTabletScale.set(hmdTabletScale); }
     float getDesktopTabletScale() { return _desktopTabletScale.get(); }
-    void setDesktopTabletScale(float desktopTabletScale);
+    void setDesktopTabletScale(float desktopTabletScale) { _desktopTabletScale.set(desktopTabletScale); }
 
     bool getDesktopTabletBecomesToolbarSetting() { return _desktopTabletBecomesToolbarSetting.get(); }
-    bool getLogWindowOnTopSetting() { return _keepLogWindowOnTop.get(); }
-    void setLogWindowOnTopSetting(bool keepOnTop) { _keepLogWindowOnTop.set(keepOnTop); }
     void setDesktopTabletBecomesToolbarSetting(bool value);
     bool getHmdTabletBecomesToolbarSetting() { return _hmdTabletBecomesToolbarSetting.get(); }
     void setHmdTabletBecomesToolbarSetting(bool value);
-    bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); }
-    void setPreferStylusOverLaser(bool value);
 
+    bool getLogWindowOnTopSetting() { return _keepLogWindowOnTop.get(); }
+    void setLogWindowOnTopSetting(bool keepOnTop) { _keepLogWindowOnTop.set(keepOnTop); }
+    bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); }
+    void setPreferStylusOverLaser(bool value) { _preferStylusOverLaserSetting.set(value); }
     bool getPreferAvatarFingerOverStylus() { return _preferAvatarFingerOverStylusSetting.get(); }
-    void setPreferAvatarFingerOverStylus(bool value);
+    void setPreferAvatarFingerOverStylus(bool value) { _preferAvatarFingerOverStylusSetting.set(value); }
 
     bool getMiniTabletEnabled() { return _miniTabletEnabledSetting.get(); }
     void setMiniTabletEnabled(bool enabled);
@@ -272,32 +198,51 @@ class Application : public QApplication,
     float getAwayStateWhenFocusLostInVREnabled() { return _awayStateWhenFocusLostInVREnabled.get(); }
     void setAwayStateWhenFocusLostInVREnabled(bool setting);
 
-    Q_INVOKABLE void setMinimumGPUTextureMemStabilityCount(int stabilityCount) { _minimumGPUTextureMemSizeStabilityCount = stabilityCount; }
+    QUuid getTabletScreenID() const;
+    QUuid getTabletHomeButtonID() const;
+    QUuid getTabletFrameID() const;
+    QVector<QUuid> getTabletIDs() const;
 
-    NodeToOctreeSceneStats* getOcteeSceneStats() { return &_octreeServerSceneStats; }
+    void confirmConnectWithoutAvatarEntities();
 
-    virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
-    virtual void registerScriptEngineWithApplicationServices(ScriptManagerPointer& scriptManager) override;
+    bool getLoginDialogPoppedUp() const { return _loginDialogPoppedUp; }
+    void createLoginDialog();
+    void updateLoginDialogPosition();
 
-    virtual void copyCurrentViewFrustum(ViewFrustum& viewOut) const override { copyDisplayViewFrustum(viewOut); }
-    virtual QThread* getMainThread() override { return thread(); }
-    virtual PickRay computePickRay(float x, float y) const override;
-    virtual glm::vec3 getAvatarPosition() const override;
-    virtual qreal getDevicePixelRatio() override;
+    void createAvatarInputsBar();
+    void destroyAvatarInputsBar();
 
-    void setActiveDisplayPlugin(const QString& pluginName);
 
-#ifndef Q_OS_ANDROID
-    FileLogger* getLogger() const { return _logger; }
-#endif
+    // Plugins
+    /**
+     * @brief Initialize the plugin manager
+     *
+     * This both does the initial startup and parses arguments. This
+     * is necessary because the plugin manager's options must be set
+     * before any usage of it is made, or they won't apply.
+     *
+     * @param parser
+     */
+    void initializePluginManager(const QCommandLineParser& parser);
 
-    float getRenderResolutionScale() const;
+    virtual void requestReset() override { resetSensors(false); }
+    virtual bool makeRenderingContextCurrent() override { return true; }
 
-    qint64 getCurrentSessionRuntime() const { return _sessionRunTimer.elapsed(); }
+    static void shutdownPlugins();
 
-    bool isAboutToQuit() const { return _aboutToQuit; }
-    bool isPhysicsEnabled() const { return _physicsEnabled; }
-    PhysicsEnginePointer getPhysicsEngine() { return _physicsEngine; }
+    void initializeDisplayPlugins();
+    virtual DisplayPluginPointer getActiveDisplayPlugin() const override;
+    void setActiveDisplayPlugin(const QString& pluginName);
+
+    glm::uvec2 getUiSize() const;
+    QRect getRecommendedHUDRect() const;
+    glm::vec2 getDeviceSize() const;
+    bool isThrottleRendering() const;
+    float getTargetRenderFrameRate() const;  // frames/second
+
+    // Check if a headset is connected
+    bool hasRiftControllers();
+    bool hasViveControllers();
 
     // the isHMDMode is true whenever we use the interface from an HMD and not a standard flat display
     // rendering of several elements depend on that
@@ -307,93 +252,112 @@ class Application : public QApplication,
     glm::mat4 getEyeOffset(int eye) const;
     glm::mat4 getEyeProjection(int eye) const;
 
-    QRect getDesirableApplicationGeometry() const;
 
-    virtual bool canAcceptURL(const QString& url) const override;
-    virtual bool acceptURL(const QString& url, bool defaultUpload = false) override;
+    // Graphics
+    void initializeGL();
+    void initializeRenderEngine();
+    void initializeUi();
 
-    void setMaxOctreePacketsPerSecond(int maxOctreePPS);
-    int getMaxOctreePacketsPerSecond() const;
+    void resizeGL();
+
+    glm::uvec2 getCanvasSize() const;
+    float getRenderResolutionScale() const;
 
     render::ScenePointer getMain3DScene() override { return _graphicsEngine->getRenderScene(); }
-    render::EnginePointer getRenderEngine() override { return  _graphicsEngine->getRenderEngine(); }
+    render::EnginePointer getRenderEngine() override { return _graphicsEngine->getRenderEngine(); }
     gpu::ContextPointer getGPUContext() const { return _graphicsEngine->getGPUContext(); }
+    float getRenderLoopRate() const { return _graphicsEngine->getRenderLoopRate(); }
 
-    const GameWorkload& getGameWorkload() const { return _gameWorkload; }
 
-    virtual void pushPostUpdateLambda(void* key, const std::function<void()>& func) override;
+    // Events
+    bool notify(QObject*, QEvent*) override;
+    bool event(QEvent* event) override;
+    bool eventFilter(QObject* object, QEvent* event) override;
 
-    void updateMyAvatarLookAtPosition(float deltaTime);
+    void postLambdaEvent(const std::function<void()>& f) override;
+    void sendLambdaEvent(const std::function<void()>& f) override;
+    virtual void pushPostUpdateLambda(void* key, const std::function<void()>& func) override;
 
-    float getGameLoopRate() const { return _gameLoopCounter.rate(); }
 
-    void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
-    void takeSecondaryCameraSnapshot(const bool& notify, const QString& filename = QString());
-    void takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition,
-                                        const bool& cubemapOutputFormat,
-                                        const bool& notify,
-                                        const QString& filename = QString());
+    // Camera
+    Camera& getCamera() { return _myCamera; }
+    const Camera& getCamera() const { return _myCamera; }
+    // Represents the current view frustum of the avatar.
+    void copyViewFrustum(ViewFrustum& viewOut) const;
+    // Represents the view frustum of the current rendering pass,
+    // which might be different from the viewFrustum, i.e. shadowmap
+    // passes, mirror window passes, etc
+    void copyDisplayViewFrustum(ViewFrustum& viewOut) const;
 
-    void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
+    void updateCamera(RenderArgs& renderArgs, float deltaTime);
+    void updateSecondaryCameraViewFrustum();
 
-    QUuid getTabletScreenID() const;
-    QUuid getTabletHomeButtonID() const;
-    QUuid getTabletFrameID() const;
-    QVector<QUuid> getTabletIDs() const;
+    const ConicalViewFrustums& getConicalViews() const override { return _conicalViews; }
 
-    void setAvatarOverrideUrl(const QUrl& url, bool save);
-    void clearAvatarOverrideUrl() { _avatarOverrideUrl = QUrl(); _saveAvatarOverrideUrl = false; }
-    QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; }
-    bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; }
-    void saveNextPhysicsStats(QString filename);
+    float getFieldOfView() { return _fieldOfView.get(); }
+    void setFieldOfView(float fov);
 
-    bool isServerlessMode() const;
-    bool isInterstitialMode() const { return _interstitialMode; }
-    bool failedToConnectToEntityServer() const { return _failedToConnectToEntityServer; }
+    void updateMyAvatarLookAtPosition(float deltaTime);
 
-    void replaceDomainContent(const QString& url, const QString& itemName);
 
-    void loadAvatarScripts(const QVector<QString>& urls);
-    void unloadAvatarScripts();
+    // Entities
+    QSharedPointer<EntityTreeRenderer> getEntities() const { return DependencyManager::get<EntityTreeRenderer>(); }
+    EntityTreePointer getEntityClipboard() const { return _entityClipboard; }
+    const OctreePacketProcessor& getOctreePacketProcessor() const { return *_octreeProcessor; }
+    std::shared_ptr<EntityEditPacketSender> getEntityEditPacketSender() { return _entityEditSender; }
 
-    Q_INVOKABLE void copyToClipboard(const QString& text);
+    void setMaxOctreePacketsPerSecond(int maxOctreePPS);
+    int getMaxOctreePacketsPerSecond() const { return _maxOctreePPS; }
+    bool isMissingSequenceNumbers() { return _isMissingSequenceNumbers; }
 
-    int getOtherAvatarsReplicaCount() { return DependencyManager::get<AvatarHashMap>()->getReplicaCount(); }
-    void setOtherAvatarsReplicaCount(int count) { DependencyManager::get<AvatarHashMap>()->setReplicaCount(count); }
+    NodeToOctreeSceneStats* getOcteeSceneStats() { return _octreeProcessor->getOctreeSceneStats(); }
 
-    void confirmConnectWithoutAvatarEntities();
 
-    bool getLoginDialogPoppedUp() const { return _loginDialogPoppedUp; }
-    void createLoginDialog();
-    void updateLoginDialogPosition();
+    // Assets
+    virtual bool canAcceptURL(const QString& url) const override;
+    virtual bool acceptURL(const QString& url, bool defaultUpload = false) override;
 
-    void createAvatarInputsBar();
-    void destroyAvatarInputsBar();
 
-    // Check if a headset is connected
-    bool hasRiftControllers();
-    bool hasViveControllers();
+    // Physics
+    bool isPhysicsEnabled() const { return _physicsEnabled; }
+    PhysicsEnginePointer getPhysicsEngine() { return _physicsEngine; }
+    const GameWorkload& getGameWorkload() const { return _gameWorkload; }
+
+    float getNumCollisionObjects() const { return _physicsEngine ? _physicsEngine->getNumCollisionObjects() : 0; }
+    void saveNextPhysicsStats(QString filename) { _physicsEngine->saveNextPhysicsStats(filename); }
+
+
+    // Avatar
+    virtual glm::vec3 getAvatarPosition() const override { return getMyAvatar()->getWorldPosition(); }
+
+    void clearAvatarOverrideUrl() { _avatarOverrideUrl = QUrl(); _saveAvatarOverrideUrl = false; }
+    QUrl getAvatarOverrideUrl() { return _avatarOverrideUrl; }
+    bool getSaveAvatarOverrideUrl() { return _saveAvatarOverrideUrl; }
+
+    int getOtherAvatarsReplicaCount() { return DependencyManager::get<AvatarHashMap>()->getReplicaCount(); }
+    void setOtherAvatarsReplicaCount(int count) { DependencyManager::get<AvatarHashMap>()->setReplicaCount(count); }
 
-#if defined(Q_OS_ANDROID)
-    void beforeEnterBackground();
-    void enterBackground();
-    void enterForeground();
-    void toggleAwayMode();
-    #endif
 
+    // Snapshots
     using SnapshotOperator = std::tuple<std::function<void(const QImage&)>, float, bool>;
     void addSnapshotOperator(const SnapshotOperator& snapshotOperator);
     bool takeSnapshotOperators(std::queue<SnapshotOperator>& snapshotOperators);
 
-    void openDirectory(const QString& path);
+    void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f, const QString& filename = QString());
+    void takeSecondaryCameraSnapshot(const bool& notify, const QString& filename = QString());
+    void takeSecondaryCamera360Snapshot(const glm::vec3& cameraPosition,
+                                        const bool& cubemapOutputFormat,
+                                        const bool& notify,
+                                        const QString& filename = QString());
+    void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 
-    void overrideEntry();
-    void forceDisplayName(const QString& displayName);
-    void forceLoginWithTokens(const QString& tokens);
-    void setConfigFileURL(const QString& fileUrl);
 
-    // used by preferences and HMDScriptingInterface...
-    VisionSqueeze& getVisionSqueeze() { return _visionSqueeze; }
+#if defined(Q_OS_ANDROID)
+    void beforeEnterBackground();
+    void enterBackground();
+    void enterForeground();
+    void toggleAwayMode();
+#endif
 
 signals:
     void svoImportRequested(const QString& url);
@@ -414,14 +378,50 @@ class Application : public QApplication,
     void awayStateWhenFocusLostInVRChanged(bool enabled);
 
 public slots:
-    QVector<EntityItemID> pasteEntities(const QString& entityHostType, 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, float x, float y, float z, float scale);
-    bool importEntities(const QString& url, const bool isObservable = true, const qint64 callerId = -1);
     void updateThreadPoolCount() const;
-    void updateSystemTabletMode();
+
+    static void gotoTutorial();
     void goToErrorDomainURL(QUrl errorDomainURL);
+    void handleLocalServerConnection() const;
+    void readArgumentsFromLocalSocket() const;
+    void showUrlHandler(const QUrl& url);
+
+#if (PR_BUILD || DEV_BUILD)
+    void sendWrongProtocolVersionsSignature(bool checked) { ::sendWrongProtocolVersionsSignature(checked); }
+#endif
+
+    void hmdVisibleChanged(bool visible);
+
+    void reloadResourceCaches();
+
+    void updateHeartbeat() const;
+
+    static void deadlockApplication();
+    static void unresponsiveApplication();  // cause main thread to be unresponsive for 35 seconds
+    void crashOnShutdown(); // used to test "shutdown" crash annotation.
+
+    void rotationModeChanged() const;
+
+    void setIsServerlessMode(bool serverlessDomain);
+    std::map<QString, QString> prepareServerlessDomainContents(QUrl domainURL, QByteArray data);
+
+    void loadServerlessDomain(QUrl domainURL);
+    void loadErrorDomain(QUrl domainURL);
+    void setIsInterstitialMode(bool interstitialMode);
+
+    void updateVerboseLogging();
+
+    void setCachebustRequire();
+
+    QString getGraphicsCardType();
+    bool gpuTextureMemSizeStable();
+
+    Q_INVOKABLE SharedSoundPointer getSampleSound() const { return _sampleSound; }
+
+    static void runTests();
 
+    // UI
+    void showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const;
     Q_INVOKABLE void loadDialog();
     Q_INVOKABLE void loadScriptURLDialog() const;
     void toggleLogDialog();
@@ -430,13 +430,44 @@ public slots:
     Q_INVOKABLE void showAssetServerWidget(QString filePath = "");
     Q_INVOKABLE void loadAddAvatarBookmarkDialog() const;
     Q_INVOKABLE void loadAvatarBrowser() const;
-    Q_INVOKABLE SharedSoundPointer getSampleSound() const;
-
-    void showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const;
 
     void showLoginScreen();
+    static void showHelp();
+
+    void updateSystemTabletMode();
+
+    void captureMouseChanged(bool captureMouse);
+    void toggleOverlays();
+    void setOverlaysVisible(bool visible);
+    Q_INVOKABLE void centerUI() { _overlayConductor.centerUI(); }
+
+    void addAssetToWorldMessageClose();
+
+    void loadLODToolsDialog();
+    void loadEntityStatisticsDialog();
+    void loadDomainConnectionDialog();
+    void showScriptLogs();
+
+    const QString getPreferredCursor() const { return _preferredCursor.get(); }
+    void setPreferredCursor(const QString& cursor);
+
+
+    // Plugins
+    void resetSensors(bool andReload = false);
+
+
+    // Entities
+    QVector<EntityItemID> pasteEntities(const QString& entityHostType, 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, float x, float y, float z, float scale);
+    bool importEntities(const QString& url, const bool isObservable = true, const qint64 callerId = -1);
+
+    void setKeyboardFocusHighlight(const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions);
+    QUuid getKeyboardFocusEntity() const { return _keyboardFocusedEntity.get(); }  // thread-safe
+    void setKeyboardFocusEntity(const QUuid& id);
+
 
-    // FIXME: Move addAssetToWorld* methods to own class?
+    // Assets
     void addAssetToWorldFromURL(QString url);
     void addAssetToWorldFromURLRequestFinished();
     void addAssetToWorld(QString filePath, QString zipFile, bool isZip = false, bool isBlocks = false);
@@ -450,183 +481,138 @@ public slots:
 
     ArchiveDownloadInterface* getFileDownloadInterface() { return _fileDownload; }
 
-    void handleLocalServerConnection() const;
-    void readArgumentsFromLocalSocket() const;
-
     static void packageModel();
 
-    void resetSensors(bool andReload = false);
-
-    void hmdVisibleChanged(bool visible);
-
-#if (PR_BUILD || DEV_BUILD)
-    void sendWrongProtocolVersionsSignature(bool checked) { ::sendWrongProtocolVersionsSignature(checked); }
-#endif
-
-    static void showHelp();
-    static void gotoTutorial();
 
+    // Camera
     void cycleCamera();
     void cameraModeChanged();
     void cameraMenuChanged();
-    void captureMouseChanged(bool captureMouse);
-    void toggleOverlays();
-    void setOverlaysVisible(bool visible);
-    Q_INVOKABLE void centerUI();
-
-    void resetPhysicsReadyInformation();
 
-    void reloadResourceCaches();
-
-    void updateHeartbeat() const;
-
-    static void deadlockApplication();
-    static void unresponsiveApplication(); // cause main thread to be unresponsive for 35 seconds
-
-    void rotationModeChanged() const;
-
-    static void runTests();
-
-    void setKeyboardFocusHighlight(const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions);
-
-    QUuid getKeyboardFocusEntity() const;  // thread-safe
-    void setKeyboardFocusEntity(const QUuid& id);
+    void changeViewAsNeeded(float boomLength);
 
-    void addAssetToWorldMessageClose();
 
-    void loadLODToolsDialog();
-    void loadEntityStatisticsDialog();
-    void loadDomainConnectionDialog();
-    void showScriptLogs();
+    // Physics
+    void resetPhysicsReadyInformation();
 
-    const QString getPreferredCursor() const { return _preferredCursor.get(); }
-    void setPreferredCursor(const QString& cursor);
 
-    void setIsServerlessMode(bool serverlessDomain);
-    std::map<QString, QString> prepareServerlessDomainContents(QUrl domainURL, QByteArray data);
+private slots:
+    void onAboutToQuit();
 
-    void loadServerlessDomain(QUrl domainURL);
-    void loadErrorDomain(QUrl domainURL);
-    void setIsInterstitialMode(bool interstitialMode);
+    void loadSettings(const QCommandLineParser& parser);
+    void saveSettings() const;
+    void setFailedToConnectToEntityServer() { _failedToConnectToEntityServer = true; }
 
-    void updateVerboseLogging();
+    bool acceptSnapshot(const QString& urlString);
 
-    void setCachebustRequire();
+    void setSessionUUID(const QUuid& sessionUUID) const;
 
-    void changeViewAsNeeded(float boomLength);
+    void domainURLChanged(QUrl domainURL);
+    void domainConnectionRefused(const QString& reasonMessage, int reason, const QString& extraInfo);
 
-    QString getGraphicsCardType();
+    void updateWindowTitle() const;
+    void nodeAdded(SharedNodePointer node);
+    void nodeActivated(SharedNodePointer node);
+    void nodeKilled(SharedNodePointer node);
 
-    bool gpuTextureMemSizeStable();
-    void showUrlHandler(const QUrl& url);
+    void handleSandboxStatus(QNetworkReply* reply);
 
-    // used to test "shutdown" crash annotation.
-    void crashOnShutdown();
 
-private slots:
+    // UI
     void onDesktopRootItemCreated(QQuickItem* qmlContext);
     void onDesktopRootContextCreated(QQmlContext* qmlContext);
     void showDesktop();
-    void clearDomainOctreeDetails(bool clearAll = true);
-    void onAboutToQuit();
-    void onPresent(quint32 frameCount);
-
-    void resettingDomain();
-
-    void activeChanged(Qt::ApplicationState state);
-    void windowMinimizedChanged(bool minimized);
 
     void notifyPacketVersionMismatch();
 
-    void loadSettings(const QCommandLineParser& parser);
-    void saveSettings() const;
-    void setFailedToConnectToEntityServer();
-
-    bool acceptSnapshot(const QString& urlString);
     bool askToSetAvatarUrl(const QString& url);
     bool askToLoadScript(const QString& scriptFilenameOrURL);
-
     bool askToWearAvatarAttachmentUrl(const QString& url);
     void displayAvatarAttachmentWarning(const QString& message) const;
-
     bool askToReplaceDomainContent(const QString& url);
 
-    void setSessionUUID(const QUuid& sessionUUID) const;
+    void onDismissedLoginDialog();
 
-    void domainURLChanged(QUrl domainURL);
-    void updateWindowTitle() const;
-    void nodeAdded(SharedNodePointer node);
-    void nodeActivated(SharedNodePointer node);
-    void nodeKilled(SharedNodePointer node);
+
+    // Entities
+    void clearDomainOctreeDetails(bool clearAll = true);
+    void resettingDomain();
+
+
+    // Events
+    void onPresent(quint32 frameCount);
+
+    void activeChanged(Qt::ApplicationState state);
+    void windowMinimizedChanged(bool minimized);
+
+
+    // Plugins
     void updateDisplayMode();
+    void switchDisplayMode();
     void setDisplayPlugin(DisplayPluginPointer newPlugin);
-    void domainConnectionRefused(const QString& reasonMessage, int reason, const QString& extraInfo);
 
-    void addAssetToWorldCheckModelSize();
 
+    // Assets
+    void addAssetToWorldCheckModelSize();
     void onAssetToWorldMessageBoxClosed();
     void addAssetToWorldInfoTimeout();
     void addAssetToWorldErrorTimeout();
 
-    void handleSandboxStatus(QNetworkReply* reply);
-    void switchDisplayMode();
-
-    void setShowBulletWireframe(bool value);
-    void setShowBulletAABBs(bool value);
-    void setShowBulletContactPoints(bool value);
-    void setShowBulletConstraints(bool value);
-    void setShowBulletConstraintLimits(bool value);
 
-    void onDismissedLoginDialog();
+    // Physics
+    void setShowBulletWireframe(bool value) { _physicsEngine->setShowBulletWireframe(value); }
+    void setShowBulletAABBs(bool value) { _physicsEngine->setShowBulletAABBs(value); }
+    void setShowBulletContactPoints(bool value) { _physicsEngine->setShowBulletContactPoints(value); }
+    void setShowBulletConstraints(bool value) { _physicsEngine->setShowBulletConstraints(value); }
+    void setShowBulletConstraintLimits(bool value) { _physicsEngine->setShowBulletConstraintLimits(value); }
 
-    void setShowTrackedObjects(bool value);
+    void setShowTrackedObjects(bool value) { _showTrackedObjects = value; }
 
 private:
-    void init();
-    bool initMenu();
-    void pauseUntilLoginDetermined();
-    void resumeAfterLoginDialogActionTaken();
-    bool handleInputMethodEventForFocusedEntity(QEvent* event);
-    bool handleKeyEventForFocusedEntity(QEvent* event);
-    bool handleFileOpenEvent(QFileOpenEvent* event);
     void cleanupBeforeQuit();
 
     void idle();
-    void tryToEnablePhysics();
     void update(float deltaTime);
-
-    // Various helper functions called during update()
     void updateLOD(float deltaTime) const;
     void updateThreads(float deltaTime);
-    void updateDialogs(float deltaTime) const;
 
-    void queryOctree(NodeType_t serverType, PacketType packetType);
-    void queryAvatars();
+    void userKickConfirmation(const QUuid& nodeID, unsigned int banFlags = ModerationFlags::getDefaultBanFlags());
 
-    int sendNackPackets();
 
-    std::shared_ptr<MyAvatar> getMyAvatar() const;
+    // Setup
+    void init();
+    void setupSignalsAndOperators();
 
-    void checkSkeleton() const;
 
-    void initializeAcceptedFiles();
+    // UI
+    bool initMenu();
+    void pauseUntilLoginDetermined();
+    void resumeAfterLoginDialogActionTaken();
 
-    bool importJSONFromURL(const QString& urlString);
-    bool importSVOFromURL(const QString& urlString);
-    bool importFromZIP(const QString& filePath);
-    bool importImage(const QString& urlString);
+    static QSharedPointer<OffscreenUi> getOffscreenUI();
 
-    int processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode);
-    void trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket);
+    void updateDialogs(float deltaTime) const;
 
-    void resizeEvent(QResizeEvent* size);
+    void maybeToggleMenuVisible(QMouseEvent* event) const;
+    void toggleTabletUI(bool shouldOpen = false) const;
+
+    bool shouldCaptureMouse() const;
+    void checkChangeCursor();
+
+    void addAssetToWorldInfo(QString modelName, QString infoText);
+    void addAssetToWorldInfoClear(QString modelName);
+    void addAssetToWorldInfoDone(QString modelName);
+    void addAssetToWorldError(QString modelName, QString errorText);
+
+
+    // Events
+    void resizeEvent(QResizeEvent* size) { resizeGL(); }
 
     void keyPressEvent(QKeyEvent* event);
     void keyReleaseEvent(QKeyEvent* event);
 
     void focusOutEvent(QFocusEvent* event);
     void synthesizeKeyReleasEvents();
-    void focusInEvent(QFocusEvent* event);
 
     void mouseMoveEvent(QMouseEvent* event);
     void mousePressEvent(QMouseEvent* event);
@@ -640,78 +626,152 @@ private slots:
 
     void wheelEvent(QWheelEvent* event) const;
     void dropEvent(QDropEvent* event);
-    static void dragEnterEvent(QDragEnterEvent* event);
+    static void dragEnterEvent(QDragEnterEvent* event) { event->acceptProposedAction(); }
 
-    void maybeToggleMenuVisible(QMouseEvent* event) const;
-    void toggleTabletUI(bool shouldOpen = false) const;
-    bool shouldCaptureMouse() const;
+    bool handleInputMethodEventForFocusedEntity(QEvent* event);
+    bool handleKeyEventForFocusedEntity(QEvent* event);
+    bool handleFileOpenEvent(QFileOpenEvent* event);
 
-    void userKickConfirmation(const QUuid& nodeID, unsigned int banFlags = ModerationFlags::getDefaultBanFlags());
 
-    MainWindow* _window;
+    // Entities
+    void queryOctree(NodeType_t serverType, PacketType packetType);
+
+    int sendNackPackets();
+
+
+    // Graphics
+    void updateRenderArgs(float deltaTime);
+
+
+    // Plugins
+    void startHMDStandBySession();
+    void endHMDSession();
+
 
+    // Assets
+    bool importJSONFromURL(const QString& urlString);
+    bool importSVOFromURL(const QString& urlString);
+    bool importFromZIP(const QString& filePath);
+    bool importImage(const QString& urlString);
+
+
+    // Avatars
+    std::shared_ptr<MyAvatar> getMyAvatar() const;
+    void checkSkeleton() const;
+
+    void queryAvatars();
+
+
+    // Physics
+    void tryToEnablePhysics();
+
+
+    // Member Variables
+    // The window needs to be initialized early as other initializers try to access it
+    MainWindow* _window;
     // _isMenuInitialized: used to initialize menu early enough before it's needed by other
     // initializers. Fixes a deadlock issue with recent Qt versions.
     bool _isMenuInitialized;
-    QElapsedTimer& _sessionRunTimer;
 
+    bool _startUpFinished { false };
+    bool _quitWhenFinished { false };
+    bool _crashOnShutdown { false };
     bool _aboutToQuit { false };
+    bool _previousSessionCrashed { false };
+
+    QUrl _urlParam;
+    bool _overrideEntry { false };
+    bool _settingsLoaded { false };
+
+    bool _domainLoadingInProgress { false };
+    bool _interstitialMode { false };
+    bool _interstitialModeEnabled { false };
+
+    PerformanceManager _performanceManager;
+    RefreshRateManager _refreshRateManager;
+    GameWorkload _gameWorkload;
+
+    ConnectionMonitor _connectionMonitor;
 
 #ifndef Q_OS_ANDROID
     FileLogger* _logger { nullptr };
 #endif
 
-    bool _previousSessionCrashed;
+    QElapsedTimer& _sessionRunTimer;
+    QElapsedTimer _lastTimeUpdated;
+    QTimer _locationUpdateTimer;
+    QTimer _minimizedWindowTimer;
+    // Frame Rate Measurement
+    RateCounter<500> _gameLoopCounter;
 
-    DisplayPluginPointer _displayPlugin;
-    QMetaObject::Connection _displayPluginPresentConnection;
-    mutable std::mutex _displayPluginLock;
-    InputPluginList _activeInputPlugins;
+    using SteadyClock = std::chrono::steady_clock;
+    using TimePoint = SteadyClock::time_point;
+    TimePoint _queryExpiry;
 
-    bool _activatingDisplayPlugin { false };
+    quint64 _lastNackTime;
+    quint64 _lastSendDownstreamAudioStats;
 
-    // Frame Rate Measurement
-    RateCounter<500> _gameLoopCounter;
+    bool _notifiedPacketVersionMismatchThisDomain { false };
 
-    QTimer _minimizedWindowTimer;
-    QElapsedTimer _timerStart;
-    QElapsedTimer _lastTimeUpdated;
+    QDir _defaultScriptsLocation;
+    // If above is only set by parameter, below is unnecessary.
+    bool _overrideDefaultScriptsLocation;
 
+    qint64 _gpuTextureMemSizeStabilityCount { 0 };
+    qint64 _gpuTextureMemSizeAtLastCheck { 0 };
     int _minimumGPUTextureMemSizeStabilityCount { 30 };
 
-    ShapeManager _shapeManager;
-    PhysicalEntitySimulationPointer _entitySimulation;
-    PhysicsEnginePointer _physicsEngine;
+    SharedSoundPointer _sampleSound { nullptr };
 
-    EntityTreePointer _entityClipboard;
+    VisionSqueeze _visionSqueeze;
 
-    mutable QRecursiveMutex _viewMutex;
-    ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
-    ViewFrustum _displayViewFrustum;
+    DiscordPresence* _discordPresence { nullptr };
 
-    ConicalViewFrustums _conicalViews;
-    ConicalViewFrustums _lastQueriedViews; // last views used to query servers
+    Setting::Handle<bool> _firstRun;
+    Setting::Handle<QString> _previousScriptLocation;
 
-    using SteadyClock = std::chrono::steady_clock;
-    using TimePoint = SteadyClock::time_point;
-    TimePoint _queryExpiry;
 
-    OctreeQuery _octreeQuery { true }; // NodeData derived class for querying octee cells from octree servers
+    // UI
+    GLCanvas* _glWidget { nullptr };
 
-    std::shared_ptr<controller::StateController> _applicationStateDevice; // Default ApplicationDevice reflecting the state of different properties of the session
-    std::shared_ptr<KeyboardMouseDevice> _keyboardMouseDevice;   // Default input device, the good old keyboard mouse and maybe touchpad
-    std::shared_ptr<TouchscreenDevice> _touchscreenDevice;   // the good old touchscreen
-    std::shared_ptr<TouchscreenVirtualPadDevice> _touchscreenVirtualPadDevice;
-    SimpleMovingAverage _avatarSimsPerSecond {10};
-    int _avatarSimsPerSecondReport {0};
-    quint64 _lastAvatarSimsPerSecondUpdate {0};
-    FancyCamera _myCamera;                            // My view onto the world
+    Overlays _overlays;
+    std::shared_ptr<ApplicationOverlay> _applicationOverlay;
+    OverlayConductor _overlayConductor;
+
+    mutable QRecursiveMutex _changeCursorLock;
+    Qt::CursorShape _desiredCursor { Qt::BlankCursor };
+    bool _cursorNeedsChanging { false };
+    bool _useSystemCursor { false };
+
+    DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface { new DialogsManagerScriptingInterface() };
+
+    QPointer<LogDialog> _logDialog;
+    QPointer<EntityScriptServerLogDialog> _entityScriptServerLogDialog;
+    ModalDialogListener* _confirmConnectWithoutAvatarEntitiesDialog { nullptr };
+
+    QUuid _loginDialogID;
+    QUuid _avatarInputsBarID;
+    LoginStateManager _loginStateManager;
+
+    QQuickItem* _addAssetToWorldMessageBox { nullptr };
+    QStringList _addAssetToWorldInfoKeys;  // Model name
+    QStringList _addAssetToWorldInfoMessages;  // Info message
+    QTimer _addAssetToWorldInfoTimer;
+    QTimer _addAssetToWorldErrorTimer;
+
+    ArchiveDownloadInterface* _fileDownload;
+
+    bool _loginDialogPoppedUp { false };
+    bool _developerMenuVisible { false };
+    bool _noLoginSuggestion { false };
+
+    bool _resumeAfterLoginDialogActionTaken_WasPostponed { false };
+    bool _resumeAfterLoginDialogActionTaken_SafeToRun { false };
+
+    bool _isForeground { true }; // starts out assumed to be in foreground
 
-    Setting::Handle<QString> _previousScriptLocation;
-    Setting::Handle<float> _fieldOfView;
     Setting::Handle<float> _hmdTabletScale;
     Setting::Handle<float> _desktopTabletScale;
-    Setting::Handle<bool> _firstRun;
     Setting::Handle<bool> _desktopTabletBecomesToolbarSetting;
     Setting::Handle<bool> _hmdTabletBecomesToolbarSetting;
     Setting::Handle<bool> _preferStylusOverLaserSetting;
@@ -722,167 +782,124 @@ private slots:
     Setting::Handle<bool> _miniTabletEnabledSetting;
     Setting::Handle<bool> _keepLogWindowOnTop { "keepLogWindowOnTop", false };
 
-    float _scaleMirror;
-    float _mirrorYawOffset;
-    float _raiseMirror;
 
-    QHash<int, QKeyEvent> _keysPressed;
+    // Plugins
+    DisplayPluginPointer _displayPlugin;
+    mutable std::mutex _displayPluginLock;
 
-    bool _enableProcessOctreeThread;
-    bool _interstitialMode { false };
+    std::shared_ptr<controller::StateController> _applicationStateDevice; // Default ApplicationDevice reflecting the state of different properties of the session
+    std::shared_ptr<KeyboardMouseDevice> _keyboardMouseDevice;   // Default input device, the good old keyboard mouse and maybe touchpad
+    std::shared_ptr<TouchscreenDevice> _touchscreenDevice;   // the good old touchscreen
+    std::shared_ptr<TouchscreenVirtualPadDevice> _touchscreenVirtualPadDevice;
+    bool _keyboardDeviceHasFocus { true };
 
-    std::shared_ptr<OctreePacketProcessor> _octreeProcessor;
-    std::shared_ptr<EntityEditPacketSender> _entityEditSender;
+    ControllerScriptingInterface* _controllerScriptingInterface { nullptr };
 
-    StDev _idleLoopStdev;
-    float _idleLoopMeasuredJitter;
+    DisplayPluginPointer _autoSwitchDisplayModeSupportedHMDPlugin { nullptr };
+    QString _autoSwitchDisplayModeSupportedHMDPluginName;
+    bool _previousHMDWornStatus { false };
 
-    NodeToOctreeSceneStats _octreeServerSceneStats;
-    ControllerScriptingInterface* _controllerScriptingInterface{ nullptr };
-    QPointer<LogDialog> _logDialog;
-    QPointer<EntityScriptServerLogDialog> _entityScriptServerLogDialog;
-    QDir _defaultScriptsLocation;
-    // If above is only set by parameter, below is unnecessary.
-    bool _overrideDefaultScriptsLocation;
 
+    // Events
+    QHash<int, QKeyEvent> _keysPressed;
     TouchEvent _lastTouchEvent;
+    quint64 _lastAcceptedKeyPress { 0 };
 
-    quint64 _lastNackTime;
-    quint64 _lastSendDownstreamAudioStats;
-
-    bool _notifiedPacketVersionMismatchThisDomain;
-
-    GLCanvas* _glWidget{ nullptr };
-
-    typedef bool (Application::* AcceptURLMethod)(const QString &);
-    static const std::vector<std::pair<QString, Application::AcceptURLMethod>> _acceptedExtensions;
+    ThreadSafeValueCache<EntityItemID> _keyboardFocusedEntity;
 
-    glm::uvec2 _renderResolution;
+    bool _reticleClickPressed { false };
+    bool _keyboardFocusWaitingOnRenderable { false };
 
-    int _maxOctreePPS = DEFAULT_MAX_OCTREE_PPS;
-    bool _interstitialModeEnabled{ false };
+    bool _captureMouse { false };
+    bool _ignoreMouseMove { false };
+    QPointF _mouseCaptureTarget { NAN, NAN };
 
-    bool _loginDialogPoppedUp{ false };
-    bool _desktopRootItemCreated{ false };
+    std::map<void*, std::function<void()>> _postUpdateLambdas;
+    std::mutex _postUpdateLambdasLock;
 
-    ModalDialogListener* _confirmConnectWithoutAvatarEntitiesDialog { nullptr };
+    std::atomic<bool> _pendingIdleEvent { true };
 
-    bool _developerMenuVisible{ false };
-    QString _previousAvatarSkeletonModel;
-    float _previousAvatarTargetScale;
-    CameraMode _previousCameraMode;
-    QUuid _loginDialogID;
-    QUuid _avatarInputsBarID;
-    LoginStateManager _loginStateManager;
-    PerformanceManager _performanceManager;
-    RefreshRateManager _refreshRateManager;
 
-    GameWorkload _gameWorkload;
+    // Entities
+    EntityTreePointer _entityClipboard;
 
-    std::shared_ptr<GraphicsEngine> _graphicsEngine;
-    void updateRenderArgs(float deltaTime);
+    std::shared_ptr<OctreePacketProcessor> _octreeProcessor;
+    std::shared_ptr<EntityEditPacketSender> _entityEditSender;
+    OctreeQuery _octreeQuery { true };  // NodeData derived class for querying octee cells from octree servers
+    bool _enableProcessOctreeThread { true };
 
-    bool _disableLoginScreen { true };
+    uint32_t _fullSceneCounterAtLastPhysicsCheck { 0 };     // _fullSceneReceivedCounter last time we checked physics ready
 
-    Overlays _overlays;
-    std::shared_ptr<ApplicationOverlay> _applicationOverlay;
-    OverlayConductor _overlayConductor;
+    mutable QTimer _entityServerConnectionTimer;
 
-    DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface = new DialogsManagerScriptingInterface();
+    QUuid _keyboardFocusHighlightID;
 
-    ThreadSafeValueCache<EntityItemID> _keyboardFocusedEntity;
-    quint64 _lastAcceptedKeyPress = 0;
-    bool _isForeground = true; // starts out assumed to be in foreground
-    bool _isGLInitialized { false };
-    bool _physicsEnabled { false };
     bool _failedToConnectToEntityServer { false };
+    bool _isMissingSequenceNumbers { false };
 
-    bool _reticleClickPressed { false };
-    bool _keyboardFocusWaitingOnRenderable { false };
-
-    int _avatarAttachmentRequest = 0;
+    Setting::Handle<int> _maxOctreePacketsPerSecond;
+    int _maxOctreePPS { DEFAULT_MAX_OCTREE_PPS };
 
-    bool _settingsLoaded { false };
 
-    bool _captureMouse { false };
-    bool _ignoreMouseMove { false };
-    QPointF _mouseCaptureTarget { NAN, NAN };
+    // Assets
+    typedef bool (Application::*AcceptURLMethod)(const QString&);
+    static const std::vector<std::pair<QString, AcceptURLMethod>> _acceptedExtensions;
 
-    bool _isMissingSequenceNumbers { false };
+    QTimer _addAssetToWorldResizeTimer;
+    QHash<QUuid, int> _addAssetToWorldResizeList;
 
-    void checkChangeCursor();
-    mutable QRecursiveMutex _changeCursorLock;
-    Qt::CursorShape _desiredCursor{ Qt::BlankCursor };
-    bool _cursorNeedsChanging { false };
 
-    std::map<void*, std::function<void()>> _postUpdateLambdas;
-    std::mutex _postUpdateLambdasLock;
+    // Camera
+    FancyCamera _myCamera;  // My view onto the world
 
-    std::atomic<uint32_t> _fullSceneReceivedCounter { 0 }; // how many times have we received a full-scene octree stats packet
-    uint32_t _fullSceneCounterAtLastPhysicsCheck { 0 }; // _fullSceneReceivedCounter last time we checked physics ready
+    CameraMode _previousCameraMode;
+    glm::vec3 _thirdPersonHMDCameraBoom { 0.0f, 0.0f, -1.0f };
+    bool _thirdPersonHMDCameraBoomValid { true };
+    float _scaleMirror { 1.0f };
+    float _mirrorYawOffset { 0.0f };
+    float _raiseMirror { 0.0f };
 
-    qint64 _gpuTextureMemSizeStabilityCount { 0 };
-    qint64 _gpuTextureMemSizeAtLastCheck { 0 };
+    mutable QRecursiveMutex _viewMutex;
+    ViewFrustum _viewFrustum;  // current state of view frustum, perspective, orientation, etc.
+    ViewFrustum _displayViewFrustum;
 
-    bool _keyboardDeviceHasFocus { true };
+    ConicalViewFrustums _conicalViews;
+    ConicalViewFrustums _lastQueriedViews;  // last views used to query servers
 
-    ConnectionMonitor _connectionMonitor;
+    Setting::Handle<float> _fieldOfView;
 
-    QTimer _addAssetToWorldResizeTimer;
-    QHash<QUuid, int> _addAssetToWorldResizeList;
 
-    void addAssetToWorldInfo(QString modelName, QString infoText);
-    void addAssetToWorldInfoClear(QString modelName);
-    void addAssetToWorldInfoDone(QString modelName);
-    void addAssetToWorldError(QString modelName, QString errorText);
+    // Graphics
+    std::shared_ptr<GraphicsEngine> _graphicsEngine;
+    glm::uvec2 _renderResolution;
 
-    QQuickItem* _addAssetToWorldMessageBox{ nullptr };
-    QStringList _addAssetToWorldInfoKeys;  // Model name
-    QStringList _addAssetToWorldInfoMessages;  // Info message
-    QTimer _addAssetToWorldInfoTimer;
-    QTimer _addAssetToWorldErrorTimer;
-    mutable QTimer _entityServerConnectionTimer;
+    bool _isGLInitialized { false };
 
-    ArchiveDownloadInterface* _fileDownload;
-    AudioInjectorPointer _snapshotSoundInjector;
-    SharedSoundPointer _snapshotSound;
-    SharedSoundPointer _sampleSound;
-    std::mutex _snapshotMutex;
-    std::queue<SnapshotOperator> _snapshotOperators;
-    bool _hasPrimarySnapshot { false };
 
-    DisplayPluginPointer _autoSwitchDisplayModeSupportedHMDPlugin { nullptr };
-    QString _autoSwitchDisplayModeSupportedHMDPluginName;
-    bool _previousHMDWornStatus;
-    void startHMDStandBySession();
-    void endHMDSession();
+    // Avatars
+    QString _previousAvatarSkeletonModel;
+    float _previousAvatarTargetScale;
 
-    glm::vec3 _thirdPersonHMDCameraBoom { 0.0f, 0.0f, -1.0f };
-    bool _thirdPersonHMDCameraBoomValid { true };
+    int _avatarAttachmentRequest { 0 };
 
     QUrl _avatarOverrideUrl;
     bool _saveAvatarOverrideUrl { false };
 
-    std::atomic<bool> _pendingIdleEvent { true };
 
-    bool quitWhenFinished { false };
+    // Physics
+    ShapeManager _shapeManager;
+    PhysicalEntitySimulationPointer _entitySimulation;
+    PhysicsEnginePointer _physicsEngine;
 
-    QUrl _urlParam;
+    bool _physicsEnabled { false };
 
     bool _showTrackedObjects { false };
     bool _prevShowTrackedObjects { false };
 
-    bool _resumeAfterLoginDialogActionTaken_WasPostponed { false };
-    bool _resumeAfterLoginDialogActionTaken_SafeToRun { false };
-    bool _startUpFinished { false };
-    bool _overrideEntry { false };
-
-    VisionSqueeze _visionSqueeze;
-
-    bool _crashOnShutdown { false };
-
-    DiscordPresence* _discordPresence{ nullptr };
 
-    bool _profilingInitialized { false };
+    // Snapshots
+    std::mutex _snapshotMutex;
+    std::queue<SnapshotOperator> _snapshotOperators;
+    bool _hasPrimarySnapshot { false };
 };
 #endif // hifi_Application_h
diff --git a/interface/src/ApplicationEventHandler.h b/interface/src/ApplicationEventHandler.h
new file mode 100644
index 00000000000..d7e5bf171c7
--- /dev/null
+++ b/interface/src/ApplicationEventHandler.h
@@ -0,0 +1,77 @@
+//
+//  ApplicationEventHandler.h
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef hifi_ApplicationEventHandler_h
+#define hifi_ApplicationEventHandler_h
+
+#include <QtCore/QAbstractNativeEventFilter>
+#include <qsystemdetection.h>
+
+#include <MainWindow.h>
+
+#include "Application.h"
+
+#ifdef Q_OS_WIN
+static const UINT UWM_IDENTIFY_INSTANCES =
+    RegisterWindowMessage("UWM_IDENTIFY_INSTANCES_{8AB82783-B74A-4258-955B-8188C22AA0D6}_" + qgetenv("USERNAME"));
+static const UINT UWM_SHOW_APPLICATION =
+    RegisterWindowMessage("UWM_SHOW_APPLICATION_{71123FD6-3DA8-4DC1-9C27-8A12A6250CBA}_" + qgetenv("USERNAME"));
+
+class MyNativeEventFilter : public QAbstractNativeEventFilter {
+public:
+    static MyNativeEventFilter& getInstance() {
+        static MyNativeEventFilter staticInstance;
+        return staticInstance;
+    }
+
+    bool nativeEventFilter(const QByteArray &eventType, void* msg, long* result) Q_DECL_OVERRIDE {
+        if (eventType == "windows_generic_MSG") {
+            MSG* message = (MSG*)msg;
+
+            if (message->message == UWM_IDENTIFY_INSTANCES) {
+                *result = UWM_IDENTIFY_INSTANCES;
+                return true;
+            }
+
+            if (message->message == UWM_SHOW_APPLICATION) {
+                MainWindow* applicationWindow = qApp->getWindow();
+                if (applicationWindow->isMinimized()) {
+                    applicationWindow->showNormal();  // Restores to windowed or maximized state appropriately.
+                }
+                qApp->setActiveWindow(applicationWindow);  // Flashes the taskbar icon if not focus.
+                return true;
+            }
+
+            // Attempting to close MIDI interfaces of a hot-unplugged device can result in audio-driver deadlock.
+            // Detecting MIDI devices that have been added/removed after starting Inteface has been disabled.
+            // https://support.microsoft.com/en-us/help/4460006/midi-device-app-hangs-when-former-midi-api-is-used
+#if 0
+            if (message->message == WM_DEVICECHANGE) {
+                const float MIN_DELTA_SECONDS = 2.0f; // de-bounce signal
+                static float lastTriggerTime = 0.0f;
+                const float deltaSeconds = secTimestampNow() - lastTriggerTime;
+                lastTriggerTime = secTimestampNow();
+                if (deltaSeconds > MIN_DELTA_SECONDS) {
+                    Midi::USBchanged();                // re-scan the MIDI bus
+                }
+            }
+#endif
+        }
+        return false;
+    }
+};
+#endif
+
+#endif  // hifi_ApplicationEventHandler_h
diff --git a/interface/src/ApplicationMeshProvider.h b/interface/src/ApplicationMeshProvider.h
new file mode 100644
index 00000000000..d8df4b35189
--- /dev/null
+++ b/interface/src/ApplicationMeshProvider.h
@@ -0,0 +1,67 @@
+//
+//  ApplicationMeshProvider.h
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef hifi_ApplicationMeshProvider_h
+#define hifi_ApplicationMeshProvider_h
+
+#include <graphics/Forward.h>
+
+class ApplicationMeshProvider : public scriptable::ModelProviderFactory  {
+public:
+    virtual scriptable::ModelProviderPointer lookupModelProvider(const QUuid& uuid) override {
+        bool success;
+        if (auto nestable = DependencyManager::get<SpatialParentFinder>()->find(uuid, success).lock()) {
+            auto type = nestable->getNestableType();
+#ifdef SCRIPTABLE_MESH_DEBUG
+            qCDebug(interfaceapp) << "ApplicationMeshProvider::lookupModelProvider" << uuid << SpatiallyNestable::nestableTypeToString(type);
+#endif
+            switch (type) {
+            case NestableType::Entity:
+                return getEntityModelProvider(static_cast<EntityItemID>(uuid));
+            case NestableType::Avatar:
+                return getAvatarModelProvider(uuid);
+            }
+        }
+        return nullptr;
+    }
+
+private:
+    scriptable::ModelProviderPointer getEntityModelProvider(EntityItemID entityID) {
+        scriptable::ModelProviderPointer provider;
+        auto entityTreeRenderer = qApp->getEntities();
+        auto entityTree = entityTreeRenderer->getTree();
+        if (auto entity = entityTree->findEntityByID(entityID)) {
+            if (auto renderer = entityTreeRenderer->renderableForEntityId(entityID)) {
+                provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(renderer);
+                provider->modelProviderType = NestableType::Entity;
+            } else {
+                qCWarning(interfaceapp) << "no renderer for entity ID" << entityID.toString();
+            }
+        }
+        return provider;
+    }
+
+    scriptable::ModelProviderPointer getAvatarModelProvider(QUuid sessionUUID) {
+        scriptable::ModelProviderPointer provider;
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        if (auto avatar = avatarManager->getAvatarBySessionID(sessionUUID)) {
+            provider = std::dynamic_pointer_cast<scriptable::ModelProvider>(avatar);
+            provider->modelProviderType = NestableType::Avatar;
+        }
+        return provider;
+    }
+};
+
+#endif  // hifi_ApplicationMeshProvider_h
diff --git a/interface/src/Application_Assets.cpp b/interface/src/Application_Assets.cpp
new file mode 100644
index 00000000000..3a9d641e005
--- /dev/null
+++ b/interface/src/Application_Assets.cpp
@@ -0,0 +1,525 @@
+//
+//  Application_Assets.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <QQuickItem>
+#include <QTemporaryDir>
+
+#include <AddressManager.h>
+#include <AssetUpload.h>
+#include <MappingRequest.h>
+
+#include "ArchiveDownloadInterface.h"
+#include "InterfaceLogging.h"
+#include "Menu.h"
+#include "ModelPackager.h"
+
+static const QString SVO_EXTENSION = ".svo";
+static const QString SVO_JSON_EXTENSION = ".svo.json";
+static const QString AVA_JSON_EXTENSION = ".ava.json";
+static const QString JSON_EXTENSION = ".json";
+static const QString JS_EXTENSION = ".js";
+static const QString FST_EXTENSION = ".fst";
+static const QString FBX_EXTENSION = ".fbx";
+static const QString OBJ_EXTENSION = ".obj";
+static const QString JSON_GZ_EXTENSION = ".json.gz";
+static const QString CONTENT_ZIP_EXTENSION = ".content.zip";
+static const QString ZIP_EXTENSION = ".zip";
+static const QString JPG_EXTENSION = ".jpg";
+static const QString PNG_EXTENSION = ".png";
+
+static const QString WEB_VIEW_TAG = "noDownload=true";
+
+const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application::_acceptedExtensions {
+    { SVO_EXTENSION, &Application::importSVOFromURL },
+    { SVO_JSON_EXTENSION, &Application::importSVOFromURL },
+    { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl },
+    { JSON_EXTENSION, &Application::importJSONFromURL },
+    { JS_EXTENSION, &Application::askToLoadScript },
+    { FST_EXTENSION, &Application::askToSetAvatarUrl },
+    { JSON_GZ_EXTENSION, &Application::askToReplaceDomainContent },
+    { CONTENT_ZIP_EXTENSION, &Application::askToReplaceDomainContent },
+    { ZIP_EXTENSION, &Application::importFromZIP },
+    { JPG_EXTENSION, &Application::importImage },
+    { PNG_EXTENSION, &Application::importImage }
+};
+
+bool Application::canAcceptURL(const QString& urlString) const {
+    QUrl url(urlString);
+    if (url.query().contains(WEB_VIEW_TAG)) {
+        return false;
+    } else if (urlString.startsWith(URL_SCHEME_OVERTE)) {
+        return true;
+    }
+    QString lowerPath = url.path().toLower();
+    for (auto& pair : _acceptedExtensions) {
+        if (lowerPath.endsWith(pair.first, Qt::CaseInsensitive)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool Application::acceptURL(const QString& urlString, bool defaultUpload) {
+    QUrl url(urlString);
+
+    if (url.scheme() == URL_SCHEME_OVERTE) {
+        // this is a hifi URL - have the AddressManager handle it
+        QMetaObject::invokeMethod(DependencyManager::get<AddressManager>().data(), "handleLookupString",
+                                  Qt::AutoConnection, Q_ARG(const QString&, urlString));
+        return true;
+    }
+
+    QString lowerPath = url.path().toLower();
+    for (auto& pair : _acceptedExtensions) {
+        if (lowerPath.endsWith(pair.first, Qt::CaseInsensitive)) {
+            AcceptURLMethod method = pair.second;
+            return (this->*method)(urlString);
+        }
+    }
+
+    if (defaultUpload && !url.fileName().isEmpty() && url.isLocalFile()) {
+        showAssetServerWidget(urlString);
+    }
+    return defaultUpload;
+}
+
+void Application::addAssetToWorldFromURL(QString url) {
+
+    QString filename;
+    if (url.contains("filename")) {
+        filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
+    }
+    if (url.contains("poly.google.com/downloads")) {
+        filename = url.section('/', -1);
+        if (url.contains("noDownload")) {
+            filename.remove(".zip?noDownload=false");
+        } else {
+            filename.remove(".zip");
+        }
+
+    }
+
+    if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
+        QString errorInfo = "You do not have permissions to write to the Asset Server.";
+        qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+        addAssetToWorldError(filename, errorInfo);
+        return;
+    }
+
+    addAssetToWorldInfo(filename, "Downloading model file " + filename + ".");
+
+    auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
+        nullptr, QUrl(url), true, -1, "Application::addAssetToWorldFromURL");
+    connect(request, &ResourceRequest::finished, this, &Application::addAssetToWorldFromURLRequestFinished);
+    request->send();
+}
+
+void Application::addAssetToWorldFromURLRequestFinished() {
+    auto request = qobject_cast<ResourceRequest*>(sender());
+    Q_ASSERT(request != nullptr);
+    auto url = request->getUrl().toString();
+    auto result = request->getResult();
+
+    QString filename;
+    bool isBlocks = false;
+
+    if (url.contains("filename")) {
+        filename = url.section("filename=", 1, 1);  // Filename is in "?filename=" parameter at end of URL.
+    }
+    if (url.contains("poly.google.com/downloads")) {
+        filename = url.section('/', -1);
+        if (url.contains("noDownload")) {
+            filename.remove(".zip?noDownload=false");
+        } else {
+            filename.remove(".zip");
+        }
+        isBlocks = true;
+    }
+
+    if (result == ResourceRequest::Success) {
+        QTemporaryDir temporaryDir;
+        temporaryDir.setAutoRemove(false);
+        if (temporaryDir.isValid()) {
+            QString temporaryDirPath = temporaryDir.path();
+            QString downloadPath = temporaryDirPath + "/" + filename;
+
+            QFile tempFile(downloadPath);
+            if (tempFile.open(QIODevice::WriteOnly)) {
+                tempFile.write(request->getData());
+                addAssetToWorldInfoClear(filename);  // Remove message from list; next one added will have a different key.
+                tempFile.close();
+                qApp->getFileDownloadInterface()->runUnzip(downloadPath, url, true, false, isBlocks);
+            } else {
+                QString errorInfo = "Couldn't open temporary file for download";
+                qWarning(interfaceapp) << errorInfo;
+                addAssetToWorldError(filename, errorInfo);
+            }
+        } else {
+            QString errorInfo = "Couldn't create temporary directory for download";
+            qWarning(interfaceapp) << errorInfo;
+            addAssetToWorldError(filename, errorInfo);
+        }
+    } else {
+        qWarning(interfaceapp) << "Error downloading" << url << ":" << request->getResultString();
+        addAssetToWorldError(filename, "Error downloading " + filename + " : " + request->getResultString());
+    }
+
+    request->deleteLater();
+}
+
+QString filenameFromPath(QString filePath) {
+    return filePath.right(filePath.length() - filePath.lastIndexOf("/") - 1);
+}
+
+void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, bool isBlocks) {
+    // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
+    QString mapping;
+    QString filename = filenameFromPath(path);
+    if (isZip || isBlocks) {
+        QString assetName = zipFile.section("/", -1).remove(QRegExp("[.]zip(.*)$"));
+        QString assetFolder = path.section("model_repo/", -1);
+        mapping = "/" + assetName + "/" + assetFolder;
+    } else {
+        mapping = "/" + filename;
+    }
+
+    // Test repeated because possibly different code paths.
+    if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
+        QString errorInfo = "You do not have permissions to write to the Asset Server.";
+        qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+        addAssetToWorldError(filename, errorInfo);
+        return;
+    }
+
+    addAssetToWorldInfo(filename, "Adding " + mapping.mid(1) + " to the Asset Server.");
+
+    addAssetToWorldWithNewMapping(path, mapping, 0, isZip, isBlocks);
+}
+
+void Application::addAssetToWorldUnzipFailure(QString filePath) {
+    QString filename = filenameFromPath(QUrl(filePath).toLocalFile());
+    qWarning(interfaceapp) << "Couldn't unzip file" << filePath;
+    addAssetToWorldError(filename, "Couldn't unzip file " + filename + ".");
+}
+
+void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isZip, bool isBlocks) {
+    auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
+
+    QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
+        const int MAX_COPY_COUNT = 100;  // Limit number of duplicate assets; recursion guard.
+        auto result = request->getError();
+        if (result == GetMappingRequest::NotFound) {
+            addAssetToWorldUpload(filePath, mapping, isZip, isBlocks);
+        } else if (result != GetMappingRequest::NoError) {
+            QString errorInfo = "Could not map asset name: "
+                + mapping.left(mapping.length() - QString::number(copy).length() - 1);
+            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
+        } else if (copy < MAX_COPY_COUNT - 1) {
+            if (copy > 0) {
+                mapping = mapping.remove(mapping.lastIndexOf("-"), QString::number(copy).length() + 1);
+            }
+            copy++;
+            mapping = mapping.insert(mapping.lastIndexOf("."), "-" + QString::number(copy));
+            addAssetToWorldWithNewMapping(filePath, mapping, copy, isZip, isBlocks);
+        } else {
+            QString errorInfo = "Too many copies of asset name: "
+                + mapping.left(mapping.length() - QString::number(copy).length() - 1);
+            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
+        }
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool isZip, bool isBlocks) {
+    qInfo(interfaceapp) << "Uploading" << filePath << "to Asset Server as" << mapping;
+    auto upload = DependencyManager::get<AssetClient>()->createUpload(filePath);
+    QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
+        if (upload->getError() != AssetUpload::NoError) {
+            QString errorInfo = "Could not upload model to the Asset Server.";
+            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
+        } else {
+            addAssetToWorldSetMapping(filePath, mapping, hash, isZip, isBlocks);
+        }
+
+        // Remove temporary directory created by Clara.io market place download.
+        int index = filePath.lastIndexOf("/model_repo/");
+        if (index > 0) {
+            QString tempDir = filePath.left(index);
+            qCDebug(interfaceapp) << "Removing temporary directory at: " + tempDir;
+            QDir(tempDir).removeRecursively();
+        }
+
+        upload->deleteLater();
+    });
+
+    upload->start();
+}
+
+void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isZip, bool isBlocks) {
+    auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash);
+    connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
+        if (request->getError() != SetMappingRequest::NoError) {
+            QString errorInfo = "Could not set asset mapping.";
+            qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
+            addAssetToWorldError(filenameFromPath(filePath), errorInfo);
+        } else {
+            // to prevent files that aren't models or texture files from being loaded into world automatically
+            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) ||
+                ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) &&
+                ((!isBlocks) && (!isZip)))) {
+                addAssetToWorldAddEntity(filePath, mapping);
+            } else {
+                qCDebug(interfaceapp) << "Zipped contents are not supported entity files";
+                addAssetToWorldInfoDone(filenameFromPath(filePath));
+            }
+        }
+        request->deleteLater();
+    });
+
+    request->start();
+}
+
+void Application::addAssetToWorldAddEntity(QString filePath, QString mapping) {
+    EntityItemProperties properties;
+    properties.setName(mapping.right(mapping.length() - 1));
+    if (filePath.toLower().endsWith(PNG_EXTENSION) || filePath.toLower().endsWith(JPG_EXTENSION)) {
+        properties.setType(EntityTypes::Image);
+        properties.setImageURL(QString("atp:" + mapping));
+        properties.setKeepAspectRatio(false);
+    } else {
+        properties.setType(EntityTypes::Model);
+        properties.setModelURL("atp:" + mapping);
+        properties.setShapeType(SHAPE_TYPE_SIMPLE_COMPOUND);
+    }
+    properties.setCollisionless(true);  // Temporarily set so that doesn't collide with avatar.
+    properties.setVisible(false);  // Temporarily set so that don't see at large unresized dimensions.
+    bool grabbable = (Menu::getInstance()->isOptionChecked(MenuOption::CreateEntitiesGrabbable));
+    properties.setUserData(grabbable ? GRABBABLE_USER_DATA : NOT_GRABBABLE_USER_DATA);
+    glm::vec3 positionOffset = getMyAvatar()->getWorldOrientation() * (getMyAvatar()->getSensorToWorldScale() * glm::vec3(0.0f, 0.0f, -2.0f));
+    properties.setPosition(getMyAvatar()->getWorldPosition() + positionOffset);
+    properties.setRotation(getMyAvatar()->getWorldOrientation());
+    properties.setGravity(glm::vec3(0.0f, 0.0f, 0.0f));
+    auto entityID = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties);
+
+    // Note: Model dimensions are not available here; model is scaled per FBX mesh in RenderableModelEntityItem::update() later
+    // on. But FBX dimensions may be in cm, so we monitor for the dimension change and rescale again if warranted.
+
+    if (entityID == QUuid()) {
+        QString errorInfo = "Could not add model " + mapping + " to world.";
+        qWarning(interfaceapp) << "Could not add model to world: " + errorInfo;
+        addAssetToWorldError(filenameFromPath(filePath), errorInfo);
+    } else {
+        // Monitor when asset is rendered in world so that can resize if necessary.
+        _addAssetToWorldResizeList.insert(entityID, 0);  // List value is count of checks performed.
+        if (!_addAssetToWorldResizeTimer.isActive()) {
+            _addAssetToWorldResizeTimer.start();
+        }
+
+        // Close progress message box.
+        addAssetToWorldInfoDone(filenameFromPath(filePath));
+    }
+}
+
+void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoAdd, bool isZip, bool isBlocks) {
+    if (autoAdd) {
+        if (!unzipFile.isEmpty()) {
+            for (int i = 0; i < unzipFile.length(); i++) {
+                if (QFileInfo(unzipFile.at(i)).isFile()) {
+                    qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
+                    addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks);
+                }
+            }
+        } else {
+            addAssetToWorldUnzipFailure(zipFile);
+        }
+    } else {
+        showAssetServerWidget(unzipFile.first());
+    }
+}
+
+void Application::packageModel() {
+    ModelPackager::package();
+}
+
+void Application::addAssetToWorldCheckModelSize() {
+    if (_addAssetToWorldResizeList.size() == 0) {
+        return;
+    }
+
+    auto item = _addAssetToWorldResizeList.begin();
+    while (item != _addAssetToWorldResizeList.end()) {
+        auto entityID = item.key();
+
+        EntityPropertyFlags propertyFlags;
+        propertyFlags += PROP_NAME;
+        propertyFlags += PROP_DIMENSIONS;
+        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        auto properties = entityScriptingInterface->getEntityPropertiesInternal(entityID, propertyFlags, false);
+        auto name = properties.getName();
+        auto dimensions = properties.getDimensions();
+
+        bool doResize = false;
+
+        const glm::vec3 DEFAULT_DIMENSIONS = glm::vec3(0.1f, 0.1f, 0.1f);
+        if (dimensions != DEFAULT_DIMENSIONS) {
+
+            // Scale model so that its maximum is exactly specific size.
+            const float MAXIMUM_DIMENSION = getMyAvatar()->getSensorToWorldScale();
+            auto previousDimensions = dimensions;
+            auto scale = std::min(MAXIMUM_DIMENSION / dimensions.x, std::min(MAXIMUM_DIMENSION / dimensions.y,
+                MAXIMUM_DIMENSION / dimensions.z));
+            dimensions *= scale;
+            qInfo(interfaceapp) << "Model" << name << "auto-resized from" << previousDimensions << " to " << dimensions;
+            doResize = true;
+
+            item = _addAssetToWorldResizeList.erase(item);  // Finished with this entity; advance to next.
+        } else {
+            // Increment count of checks done.
+            _addAssetToWorldResizeList[entityID]++;
+
+            const int CHECK_MODEL_SIZE_MAX_CHECKS = 300;
+            if (_addAssetToWorldResizeList[entityID] > CHECK_MODEL_SIZE_MAX_CHECKS) {
+                // Have done enough checks; model was either the default size or something's gone wrong.
+
+                // Rescale all dimensions.
+                const glm::vec3 UNIT_DIMENSIONS = glm::vec3(1.0f, 1.0f, 1.0f);
+                dimensions = UNIT_DIMENSIONS;
+                qInfo(interfaceapp) << "Model" << name << "auto-resize timed out; resized to " << dimensions;
+                doResize = true;
+
+                item = _addAssetToWorldResizeList.erase(item);  // Finished with this entity; advance to next.
+            } else {
+                // No action on this entity; advance to next.
+                ++item;
+            }
+        }
+
+        if (doResize) {
+            EntityItemProperties properties;
+            properties.setDimensions(dimensions);
+            properties.setVisible(true);
+            if (!name.toLower().endsWith(PNG_EXTENSION) && !name.toLower().endsWith(JPG_EXTENSION)) {
+                properties.setCollisionless(false);
+            }
+            bool grabbable = (Menu::getInstance()->isOptionChecked(MenuOption::CreateEntitiesGrabbable));
+            properties.setUserData(grabbable ? GRABBABLE_USER_DATA : NOT_GRABBABLE_USER_DATA);
+            properties.setLastEdited(usecTimestampNow());
+            entityScriptingInterface->editEntity(entityID, properties);
+        }
+    }
+
+    // Stop timer if nothing in list to check.
+    if (_addAssetToWorldResizeList.size() == 0) {
+        _addAssetToWorldResizeTimer.stop();
+    }
+}
+
+void Application::onAssetToWorldMessageBoxClosed() {
+    if (_addAssetToWorldMessageBox) {
+        // User manually closed message box; perhaps because it has become stuck, so reset all messages.
+        qInfo(interfaceapp) << "User manually closed download status message box";
+        disconnect(_addAssetToWorldMessageBox);
+        _addAssetToWorldMessageBox = nullptr;
+        addAssetToWorldMessageClose();
+    }
+}
+
+void Application::addAssetToWorldInfoTimeout() {
+    if (_aboutToQuit) {
+        return;
+    }
+
+    /*
+    If list not empty, display last message in list (may already be displayed ) unless an error is being displayed.
+    If list empty, close the message box unless an error is being displayed.
+    */
+
+    if (!_addAssetToWorldErrorTimer.isActive() && _addAssetToWorldMessageBox) {
+        if (_addAssetToWorldInfoKeys.length() > 0) {
+            _addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last());
+        } else {
+            disconnect(_addAssetToWorldMessageBox);
+            _addAssetToWorldMessageBox->setVisible(false);
+            _addAssetToWorldMessageBox->deleteLater();
+            _addAssetToWorldMessageBox = nullptr;
+        }
+    }
+}
+
+void Application::addAssetToWorldErrorTimeout() {
+    if (_aboutToQuit) {
+        return;
+    }
+
+    /*
+    If list is not empty, display message from last entry.
+    If list is empty, close the message box.
+    */
+
+    if (_addAssetToWorldMessageBox) {
+        if (_addAssetToWorldInfoKeys.length() > 0) {
+            _addAssetToWorldMessageBox->setProperty("text", "\n" + _addAssetToWorldInfoMessages.last());
+        } else {
+            disconnect(_addAssetToWorldMessageBox);
+            _addAssetToWorldMessageBox->setVisible(false);
+            _addAssetToWorldMessageBox->deleteLater();
+            _addAssetToWorldMessageBox = nullptr;
+        }
+    }
+}
+
+bool Application::importJSONFromURL(const QString& urlString) {
+    // we only load files that terminate in just .json (not .svo.json and not .ava.json)
+    QUrl jsonURL { urlString };
+
+    emit svoImportRequested(urlString);
+    return true;
+}
+
+bool Application::importSVOFromURL(const QString& urlString) {
+    emit svoImportRequested(urlString);
+    return true;
+}
+
+bool Application::importFromZIP(const QString& filePath) {
+    qDebug() << "A zip file has been dropped in: " << filePath;
+    QUrl empty;
+    // handle Blocks download from Marketplace
+    if (filePath.contains("poly.google.com/downloads")) {
+        addAssetToWorldFromURL(filePath);
+    } else {
+        qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true, false);
+    }
+    return true;
+}
+
+bool Application::importImage(const QString& urlString) {
+    qCDebug(interfaceapp) << "An image file has been dropped in";
+    QString filepath(urlString);
+#if defined(Q_OS_WIN)
+    filepath.remove("file:///");
+#else
+    filepath.remove("file://");
+#endif
+    addAssetToWorld(filepath, "", false, false);
+    return true;
+}
diff --git a/interface/src/Application_Camera.cpp b/interface/src/Application_Camera.cpp
new file mode 100644
index 00000000000..c989ed5dc6d
--- /dev/null
+++ b/interface/src/Application_Camera.cpp
@@ -0,0 +1,374 @@
+//
+//  Application_Camera.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <glm/gtx/transform.hpp>
+
+#include <controllers/UserInputMapper.h>
+#include <SecondaryCamera.h>
+
+#include "avatar/MyAvatar.h"
+#include "avatar/MyHead.h"
+#include "Menu.h"
+
+static const float MIRROR_FULLSCREEN_DISTANCE = 0.789f;
+
+void Application::copyViewFrustum(ViewFrustum& viewOut) const {
+    QMutexLocker viewLocker(&_viewMutex);
+    viewOut = _viewFrustum;
+}
+
+void Application::copyDisplayViewFrustum(ViewFrustum& viewOut) const {
+    QMutexLocker viewLocker(&_viewMutex);
+    viewOut = _displayViewFrustum;
+}
+
+void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
+    PROFILE_RANGE(render, __FUNCTION__);
+    PerformanceTimer perfTimer("updateCamera");
+
+    glm::vec3 boomOffset;
+    auto myAvatar = getMyAvatar();
+    boomOffset = myAvatar->getModelScale() * myAvatar->getBoomLength() * -IDENTITY_FORWARD;
+
+    // The render mode is default or mirror if the camera is in mirror mode, assigned further below
+    renderArgs._renderMode = RenderArgs::DEFAULT_RENDER_MODE;
+
+    // Always use the default eye position, not the actual head eye position.
+    // Using the latter will cause the camera to wobble with idle animations,
+    // or with changes from the face tracker
+    CameraMode mode = _myCamera.getMode();
+    if (mode == CAMERA_MODE_FIRST_PERSON || mode == CAMERA_MODE_FIRST_PERSON_LOOK_AT) {
+        _thirdPersonHMDCameraBoomValid= false;
+        if (isHMDMode()) {
+            mat4 camMat = myAvatar->getSensorToWorldMatrix() * myAvatar->getHMDSensorMatrix();
+            _myCamera.setPosition(extractTranslation(camMat));
+            _myCamera.setOrientation(glmExtractRotation(camMat));
+        } else if (mode == CAMERA_MODE_FIRST_PERSON) {
+            _myCamera.setPosition(myAvatar->getDefaultEyePosition());
+            _myCamera.setOrientation(myAvatar->getMyHead()->getHeadOrientation());
+        } else {
+            _myCamera.setPosition(myAvatar->getCameraEyesPosition(deltaTime));
+            _myCamera.setOrientation(myAvatar->getLookAtRotation());
+        }
+    } else if (mode == CAMERA_MODE_THIRD_PERSON || mode == CAMERA_MODE_LOOK_AT || mode == CAMERA_MODE_SELFIE) {
+        if (isHMDMode()) {
+            if (!_thirdPersonHMDCameraBoomValid) {
+                const glm::vec3 CAMERA_OFFSET = glm::vec3(0.0f, 0.0f, 0.7f);
+                _thirdPersonHMDCameraBoom = cancelOutRollAndPitch(myAvatar->getHMDSensorOrientation()) * CAMERA_OFFSET;
+                _thirdPersonHMDCameraBoomValid = true;
+            }
+
+            glm::mat4 thirdPersonCameraSensorToWorldMatrix = myAvatar->getSensorToWorldMatrix();
+
+            const glm::vec3 cameraPos = myAvatar->getHMDSensorPosition() + _thirdPersonHMDCameraBoom * myAvatar->getBoomLength();
+            glm::mat4 sensorCameraMat = createMatFromQuatAndPos(myAvatar->getHMDSensorOrientation(), cameraPos);
+            glm::mat4 worldCameraMat = thirdPersonCameraSensorToWorldMatrix * sensorCameraMat;
+
+            _myCamera.setOrientation(glm::normalize(glmExtractRotation(worldCameraMat)));
+            _myCamera.setPosition(extractTranslation(worldCameraMat));
+        } else {
+            _thirdPersonHMDCameraBoomValid = false;
+            if (mode == CAMERA_MODE_THIRD_PERSON) {
+                _myCamera.setOrientation(myAvatar->getHead()->getOrientation());
+                if (isOptionChecked(MenuOption::CenterPlayerInView)) {
+                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                        + _myCamera.getOrientation() * boomOffset);
+                } else {
+                    _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                        + myAvatar->getWorldOrientation() * boomOffset);
+                }
+            } else {
+                glm::quat lookAtRotation = myAvatar->getLookAtRotation();
+                if (mode == CAMERA_MODE_SELFIE) {
+                    lookAtRotation = lookAtRotation * glm::angleAxis(PI, myAvatar->getWorldOrientation() * Vectors::UP);
+                }
+                _myCamera.setPosition(myAvatar->getLookAtPivotPoint()
+                    + lookAtRotation * boomOffset);
+                _myCamera.lookAt(myAvatar->getLookAtPivotPoint());
+            }
+        }
+    } else if (mode == CAMERA_MODE_MIRROR) {
+        _thirdPersonHMDCameraBoomValid= false;
+
+        if (isHMDMode()) {
+            auto mirrorBodyOrientation = myAvatar->getWorldOrientation() * glm::quat(glm::vec3(0.0f, PI + _mirrorYawOffset, 0.0f));
+
+            glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
+            // Mirror HMD yaw and roll
+            glm::vec3 mirrorHmdEulers = glm::eulerAngles(hmdRotation);
+            mirrorHmdEulers.y = -mirrorHmdEulers.y;
+            mirrorHmdEulers.z = -mirrorHmdEulers.z;
+            glm::quat mirrorHmdRotation = glm::quat(mirrorHmdEulers);
+
+            glm::quat worldMirrorRotation = mirrorBodyOrientation * mirrorHmdRotation;
+
+            _myCamera.setOrientation(worldMirrorRotation);
+
+            glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
+            // Mirror HMD lateral offsets
+            hmdOffset.x = -hmdOffset.x;
+
+            _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                + glm::vec3(0, _raiseMirror * myAvatar->getModelScale(), 0)
+                + mirrorBodyOrientation * glm::vec3(0.0f, 0.0f, 1.0f) * MIRROR_FULLSCREEN_DISTANCE * _scaleMirror
+                + mirrorBodyOrientation * hmdOffset);
+        } else {
+            auto userInputMapper = DependencyManager::get<UserInputMapper>();
+            const float YAW_SPEED = TWO_PI / 5.0f;
+            float deltaYaw = userInputMapper->getActionState(controller::Action::YAW) * YAW_SPEED * deltaTime;
+            _mirrorYawOffset += deltaYaw;
+            _myCamera.setOrientation(myAvatar->getWorldOrientation() * glm::quat(glm::vec3(0.0f, PI + _mirrorYawOffset, 0.0f)));
+            _myCamera.setPosition(myAvatar->getDefaultEyePosition()
+                + glm::vec3(0, _raiseMirror * myAvatar->getModelScale(), 0)
+                + (myAvatar->getWorldOrientation() * glm::quat(glm::vec3(0.0f, _mirrorYawOffset, 0.0f))) *
+                glm::vec3(0.0f, 0.0f, -1.0f) * myAvatar->getBoomLength() * _scaleMirror);
+        }
+        renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
+    } else if (mode == CAMERA_MODE_ENTITY) {
+        _thirdPersonHMDCameraBoomValid= false;
+        EntityItemPointer cameraEntity = _myCamera.getCameraEntityPointer();
+        if (cameraEntity != nullptr) {
+            if (isHMDMode()) {
+                glm::quat hmdRotation = extractRotation(myAvatar->getHMDSensorMatrix());
+                _myCamera.setOrientation(cameraEntity->getWorldOrientation() * hmdRotation);
+                glm::vec3 hmdOffset = extractTranslation(myAvatar->getHMDSensorMatrix());
+                _myCamera.setPosition(cameraEntity->getWorldPosition() + (hmdRotation * hmdOffset));
+            } else {
+                _myCamera.setOrientation(cameraEntity->getWorldOrientation());
+                _myCamera.setPosition(cameraEntity->getWorldPosition());
+            }
+        }
+    }
+    // Update camera position
+    if (!isHMDMode()) {
+        _myCamera.update();
+    }
+
+    renderArgs._cameraMode = (int8_t)_myCamera.getMode();
+}
+
+void Application::updateSecondaryCameraViewFrustum() {
+    // TODO: Fix this by modeling the way the secondary camera works on how the main camera works
+    // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary
+    // camera should be.
+
+    // Code based on SecondaryCameraJob
+    auto renderConfig = _graphicsEngine->getRenderEngine()->getConfiguration();
+    assert(renderConfig);
+    auto camera = dynamic_cast<SecondaryCameraJobConfig*>(renderConfig->getConfig("SecondaryCamera"));
+
+    if (!camera || !camera->isEnabled()) {
+        return;
+    }
+
+    ViewFrustum secondaryViewFrustum;
+    if (camera->portalProjection && !camera->attachedEntityId.isNull() && !camera->portalEntranceEntityId.isNull()) {
+        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        EntityItemPointer portalEntrance = qApp->getEntities()->getTree()->findEntityByID(camera->portalEntranceEntityId);
+        EntityItemPointer portalExit = qApp->getEntities()->getTree()->findEntityByID(camera->attachedEntityId);
+
+        glm::vec3 portalEntrancePropertiesPosition = portalEntrance->getWorldPosition();
+        glm::quat portalEntrancePropertiesRotation = portalEntrance->getWorldOrientation();
+        glm::mat4 worldFromPortalEntranceRotation = glm::mat4_cast(portalEntrancePropertiesRotation);
+        glm::mat4 worldFromPortalEntranceTranslation = glm::translate(portalEntrancePropertiesPosition);
+        glm::mat4 worldFromPortalEntrance = worldFromPortalEntranceTranslation * worldFromPortalEntranceRotation;
+        glm::mat4 portalEntranceFromWorld = glm::inverse(worldFromPortalEntrance);
+
+        glm::vec3 portalExitPropertiesPosition = portalExit->getWorldPosition();
+        glm::quat portalExitPropertiesRotation = portalExit->getWorldOrientation();
+        glm::vec3 portalExitPropertiesDimensions = portalExit->getScaledDimensions();
+        glm::vec3 halfPortalExitPropertiesDimensions = 0.5f * portalExitPropertiesDimensions;
+
+        glm::mat4 worldFromPortalExitRotation = glm::mat4_cast(portalExitPropertiesRotation);
+        glm::mat4 worldFromPortalExitTranslation = glm::translate(portalExitPropertiesPosition);
+        glm::mat4 worldFromPortalExit = worldFromPortalExitTranslation * worldFromPortalExitRotation;
+
+        glm::vec3 mainCameraPositionWorld = getCamera().getPosition();
+        glm::vec3 mainCameraPositionPortalEntrance = vec3(portalEntranceFromWorld * vec4(mainCameraPositionWorld, 1.0f));
+        mainCameraPositionPortalEntrance = vec3(-mainCameraPositionPortalEntrance.x, mainCameraPositionPortalEntrance.y,
+            -mainCameraPositionPortalEntrance.z);
+        glm::vec3 portalExitCameraPositionWorld = vec3(worldFromPortalExit * vec4(mainCameraPositionPortalEntrance, 1.0f));
+
+        secondaryViewFrustum.setPosition(portalExitCameraPositionWorld);
+        secondaryViewFrustum.setOrientation(portalExitPropertiesRotation);
+
+        float nearClip = mainCameraPositionPortalEntrance.z + portalExitPropertiesDimensions.z * 2.0f;
+        // `mainCameraPositionPortalEntrance` should technically be `mainCameraPositionPortalExit`,
+        // but the values are the same.
+        glm::vec3 upperRight = halfPortalExitPropertiesDimensions - mainCameraPositionPortalEntrance;
+        glm::vec3 bottomLeft = -halfPortalExitPropertiesDimensions - mainCameraPositionPortalEntrance;
+        glm::mat4 frustum = glm::frustum(bottomLeft.x, upperRight.x, bottomLeft.y, upperRight.y, nearClip, camera->farClipPlaneDistance);
+        secondaryViewFrustum.setProjection(frustum);
+    } else if (camera->mirrorProjection && !camera->attachedEntityId.isNull()) {
+        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        auto entityProperties = entityScriptingInterface->getEntityProperties(camera->attachedEntityId);
+        glm::vec3 mirrorPropertiesPosition = entityProperties.getPosition();
+        glm::quat mirrorPropertiesRotation = entityProperties.getRotation();
+        glm::vec3 mirrorPropertiesDimensions = entityProperties.getDimensions();
+        glm::vec3 halfMirrorPropertiesDimensions = 0.5f * mirrorPropertiesDimensions;
+
+        // setup mirror from world as inverse of world from mirror transformation using inverted x and z for mirrored image
+        // TODO: we are assuming here that UP is world y-axis
+        glm::mat4 worldFromMirrorRotation = glm::mat4_cast(mirrorPropertiesRotation) * glm::scale(vec3(-1.0f, 1.0f, -1.0f));
+        glm::mat4 worldFromMirrorTranslation = glm::translate(mirrorPropertiesPosition);
+        glm::mat4 worldFromMirror = worldFromMirrorTranslation * worldFromMirrorRotation;
+        glm::mat4 mirrorFromWorld = glm::inverse(worldFromMirror);
+
+        // get mirror camera position by reflecting main camera position's z coordinate in mirror space
+        glm::vec3 mainCameraPositionWorld = getCamera().getPosition();
+        glm::vec3 mainCameraPositionMirror = vec3(mirrorFromWorld * vec4(mainCameraPositionWorld, 1.0f));
+        glm::vec3 mirrorCameraPositionMirror = vec3(mainCameraPositionMirror.x, mainCameraPositionMirror.y,
+                                                    -mainCameraPositionMirror.z);
+        glm::vec3 mirrorCameraPositionWorld = vec3(worldFromMirror * vec4(mirrorCameraPositionMirror, 1.0f));
+
+        // set frustum position to be mirrored camera and set orientation to mirror's adjusted rotation
+        glm::quat mirrorCameraOrientation = glm::quat_cast(worldFromMirrorRotation);
+        secondaryViewFrustum.setPosition(mirrorCameraPositionWorld);
+        secondaryViewFrustum.setOrientation(mirrorCameraOrientation);
+
+        // build frustum using mirror space translation of mirrored camera
+        float nearClip = mirrorCameraPositionMirror.z + mirrorPropertiesDimensions.z * 2.0f;
+        glm::vec3 upperRight = halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
+        glm::vec3 bottomLeft = -halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
+        glm::mat4 frustum = glm::frustum(bottomLeft.x, upperRight.x, bottomLeft.y, upperRight.y, nearClip, camera->farClipPlaneDistance);
+        secondaryViewFrustum.setProjection(frustum);
+    } else {
+        if (!camera->attachedEntityId.isNull()) {
+            auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+            auto entityProperties = entityScriptingInterface->getEntityProperties(camera->attachedEntityId);
+            secondaryViewFrustum.setPosition(entityProperties.getPosition());
+            secondaryViewFrustum.setOrientation(entityProperties.getRotation());
+        } else {
+            secondaryViewFrustum.setPosition(camera->position);
+            secondaryViewFrustum.setOrientation(camera->orientation);
+        }
+
+        float aspectRatio = (float)camera->textureWidth / (float)camera->textureHeight;
+        secondaryViewFrustum.setProjection(camera->vFoV,
+                                            aspectRatio,
+                                            camera->nearClipPlaneDistance,
+                                            camera->farClipPlaneDistance);
+    }
+    // Without calculating the bound planes, the secondary camera will use the same culling frustum as the main camera,
+    // which is not what we want here.
+    secondaryViewFrustum.calculate();
+
+    _conicalViews.push_back(secondaryViewFrustum);
+}
+
+void Application::setFieldOfView(float fov) {
+    if (fov != _fieldOfView.get()) {
+        _fieldOfView.set(fov);
+        resizeGL();
+    }
+}
+
+// Called during Application::update immediately before AvatarManager::updateMyAvatar, updating my data that is then sent
+// to everyone.
+// The principal result is to call updateLookAtTargetAvatar() and then setLookAtPosition().
+// Note that it is called BEFORE we update position or joints based on sensors, etc.
+void Application::updateMyAvatarLookAtPosition(float deltaTime) {
+    PerformanceTimer perfTimer("lookAt");
+    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
+    PerformanceWarning warn(showWarnings, "Application::updateMyAvatarLookAtPosition()");
+
+    auto myAvatar = getMyAvatar();
+    myAvatar->updateEyesLookAtPosition(deltaTime);
+}
+
+void Application::cycleCamera() {
+    auto menu = Menu::getInstance();
+    if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) {
+
+        menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, false);
+        menu->setIsOptionChecked(MenuOption::LookAtCamera, true);
+
+    } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
+
+        menu->setIsOptionChecked(MenuOption::LookAtCamera, false);
+        if (menu->getActionForOption(MenuOption::SelfieCamera)->isVisible()) {
+            menu->setIsOptionChecked(MenuOption::SelfieCamera, true);
+        } else {
+            menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
+        }
+
+    } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
+
+        menu->setIsOptionChecked(MenuOption::SelfieCamera, false);
+        menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
+
+    }
+    cameraMenuChanged(); // handle the menu change
+}
+
+void Application::cameraModeChanged() {
+    switch (_myCamera.getMode()) {
+        case CAMERA_MODE_FIRST_PERSON_LOOK_AT:
+            Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
+            break;
+        case CAMERA_MODE_LOOK_AT:
+            Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, true);
+            break;
+        case CAMERA_MODE_SELFIE:
+            Menu::getInstance()->setIsOptionChecked(MenuOption::SelfieCamera, true);
+            break;
+        default:
+            // we don't have menu items for the others, so just leave it alone.
+            return;
+    }
+    cameraMenuChanged();
+}
+
+void Application::cameraMenuChanged() {
+    auto menu = Menu::getInstance();
+    if (menu->isOptionChecked(MenuOption::FirstPersonLookAt)) {
+        if (_myCamera.getMode() != CAMERA_MODE_FIRST_PERSON_LOOK_AT) {
+            _myCamera.setMode(CAMERA_MODE_FIRST_PERSON_LOOK_AT);
+            getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);
+        }
+    } else if (menu->isOptionChecked(MenuOption::LookAtCamera)) {
+        if (_myCamera.getMode() != CAMERA_MODE_LOOK_AT) {
+            _myCamera.setMode(CAMERA_MODE_LOOK_AT);
+            if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
+                getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
+            }
+        }
+    } else if (menu->isOptionChecked(MenuOption::SelfieCamera)) {
+        if (_myCamera.getMode() != CAMERA_MODE_SELFIE) {
+            _myCamera.setMode(CAMERA_MODE_SELFIE);
+            if (getMyAvatar()->getBoomLength() == MyAvatar::ZOOM_MIN) {
+                getMyAvatar()->setBoomLength(MyAvatar::ZOOM_DEFAULT);
+            }
+        }
+    }
+}
+
+void Application::changeViewAsNeeded(float boomLength) {
+    // Switch between first and third person views as needed
+    // This is called when the boom length has changed
+    bool boomLengthGreaterThanMinimum = (boomLength > MyAvatar::ZOOM_MIN);
+
+    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON_LOOK_AT && boomLengthGreaterThanMinimum) {
+        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, false);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, true);
+        cameraMenuChanged();
+    } else if (_myCamera.getMode() == CAMERA_MODE_LOOK_AT && !boomLengthGreaterThanMinimum) {
+        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::LookAtCamera, false);
+        cameraMenuChanged();
+    }
+}
diff --git a/interface/src/Application_Entities.cpp b/interface/src/Application_Entities.cpp
new file mode 100644
index 00000000000..899cea65ed4
--- /dev/null
+++ b/interface/src/Application_Entities.cpp
@@ -0,0 +1,359 @@
+//
+//  Application_Entities.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <AnimationCache.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+#include <MainWindow.h>
+#include <recording/ClipCache.h>
+#include <RenderableEntityItem.h>
+#include <SoundCache.h>
+
+#include "InterfaceLogging.h"
+#include "LODManager.h"
+
+static const float FOCUS_HIGHLIGHT_EXPANSION_FACTOR = 1.05f;
+
+static const float INITIAL_QUERY_RADIUS = 10.0f;  // priority radius for entities before physics enabled
+
+void Application::setMaxOctreePacketsPerSecond(int maxOctreePPS) {
+    if (maxOctreePPS != _maxOctreePPS) {
+        _maxOctreePPS = maxOctreePPS;
+        _maxOctreePacketsPerSecond.set(_maxOctreePPS);
+    }
+}
+
+QVector<EntityItemID> Application::pasteEntities(const QString& entityHostType, float x, float y, float z) {
+    return _entityClipboard->sendEntities(_entityEditSender.get(), getEntities()->getTree(), entityHostType, x, y, z);
+}
+
+bool Application::exportEntities(const QString& filename,
+                                 const QVector<QUuid>& entityIDs,
+                                 const glm::vec3* givenOffset) {
+    QHash<EntityItemID, EntityItemPointer> entities;
+
+    auto nodeList = DependencyManager::get<NodeList>();
+    const QUuid myAvatarID = nodeList->getSessionUUID();
+
+    auto entityTree = getEntities()->getTree();
+    auto exportTree = std::make_shared<EntityTree>();
+    exportTree->setMyAvatar(getMyAvatar());
+    exportTree->createRootElement();
+    glm::vec3 root(TREE_SCALE, TREE_SCALE, TREE_SCALE);
+    bool success = true;
+    entityTree->withReadLock([entityIDs, entityTree, givenOffset, myAvatarID, &root, &entities, &success, &exportTree] {
+        for (auto entityID : entityIDs) { // Gather entities and properties.
+            auto entityItem = entityTree->findEntityByEntityItemID(entityID);
+            if (!entityItem) {
+                qCWarning(interfaceapp) << "Skipping export of" << entityID << "that is not in scene.";
+                continue;
+            }
+
+            if (!givenOffset) {
+                EntityItemID parentID = entityItem->getParentID();
+                bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
+                if (!parentIsAvatar && (parentID.isInvalidID() ||
+                                        !entityIDs.contains(parentID) ||
+                                        !entityTree->findEntityByEntityItemID(parentID))) {
+                    // If parent wasn't selected, we want absolute position, which isn't in properties.
+                    auto position = entityItem->getWorldPosition();
+                    root.x = glm::min(root.x, position.x);
+                    root.y = glm::min(root.y, position.y);
+                    root.z = glm::min(root.z, position.z);
+                }
+            }
+            entities[entityID] = entityItem;
+        }
+
+        if (entities.size() == 0) {
+            success = false;
+            return;
+        }
+
+        if (givenOffset) {
+            root = *givenOffset;
+        }
+        for (EntityItemPointer& entityDatum : entities) {
+            auto properties = entityDatum->getProperties();
+            EntityItemID parentID = properties.getParentID();
+            bool parentIsAvatar = (parentID == AVATAR_SELF_ID || parentID == myAvatarID);
+            if (parentIsAvatar) {
+                properties.setParentID(AVATAR_SELF_ID);
+            } else {
+                if (parentID.isInvalidID()) {
+                    properties.setPosition(properties.getPosition() - root);
+                } else if (!entities.contains(parentID)) {
+                    entityDatum->globalizeProperties(properties, "Parent %3 of %2 %1 is not selected for export.", -root);
+                } // else valid parent -- don't offset
+            }
+            exportTree->addEntity(entityDatum->getEntityItemID(), properties);
+        }
+    });
+    if (success) {
+        success = exportTree->writeToJSONFile(filename.toLocal8Bit().constData());
+
+        // restore the main window's active state
+        _window->activateWindow();
+    }
+    return success;
+}
+
+bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
+    glm::vec3 center(x, y, z);
+    glm::vec3 minCorner = center - vec3(scale);
+    float cubeSize = scale * 2;
+    AACube boundingCube(minCorner, cubeSize);
+    QVector<QUuid> entities;
+    auto entityTree = getEntities()->getTree();
+    entityTree->withReadLock([&] {
+        entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities);
+    });
+    return exportEntities(filename, entities, &center);
+}
+
+bool Application::importEntities(const QString& urlOrFilename, const bool isObservable, const qint64 callerId) {
+    bool success = false;
+    _entityClipboard->withWriteLock([&] {
+        _entityClipboard->eraseAllOctreeElements();
+
+        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON
+        // from the Web.
+        success = _entityClipboard->readFromURL(urlOrFilename, isObservable, callerId, true);
+        if (success) {
+            _entityClipboard->reaverageOctreeElements();
+        }
+    });
+    return success;
+}
+
+void Application::setKeyboardFocusHighlight(const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions) {
+    if (qApp->getLoginDialogPoppedUp()) {
+        return;
+    }
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    if (_keyboardFocusHighlightID == UNKNOWN_ENTITY_ID || !entityScriptingInterface->isAddedEntity(_keyboardFocusHighlightID)) {
+        EntityItemProperties properties;
+        properties.setType(EntityTypes::Box);
+        properties.setAlpha(1.0f);
+        properties.setColor({ 0xFF, 0xEF, 0x00 });
+        properties.setPrimitiveMode(PrimitiveMode::LINES);
+        properties.getPulse().setMin(0.5);
+        properties.getPulse().setMax(1.0f);
+        properties.getPulse().setColorMode(PulseMode::IN_PHASE);
+        properties.setIgnorePickIntersection(true);
+        _keyboardFocusHighlightID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
+    }
+
+    // Position focus
+    EntityItemProperties properties;
+    properties.setPosition(position);
+    properties.setRotation(rotation);
+    properties.setDimensions(dimensions);
+    properties.setVisible(true);
+    entityScriptingInterface->editEntity(_keyboardFocusHighlightID, properties);
+}
+
+void Application::setKeyboardFocusEntity(const QUuid& id) {
+    if (_keyboardFocusedEntity.get() != id) {
+        if (qApp->getLoginDialogPoppedUp() && !_loginDialogID.isNull()) {
+            if (id == _loginDialogID) {
+                emit loginDialogFocusEnabled();
+            } else if (!_keyboardFocusWaitingOnRenderable) {
+                // that's the only entity we want in focus;
+                return;
+            }
+        }
+
+        _keyboardFocusedEntity.set(id);
+
+        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        if (id != UNKNOWN_ENTITY_ID) {
+            EntityPropertyFlags desiredProperties;
+            desiredProperties += PROP_VISIBLE;
+            desiredProperties += PROP_SHOW_KEYBOARD_FOCUS_HIGHLIGHT;
+            auto properties = entityScriptingInterface->getEntityProperties(id);
+            if (properties.getVisible()) {
+                auto entities = getEntities();
+                auto entityId = _keyboardFocusedEntity.get();
+                auto entityItemRenderable = entities->renderableForEntityId(entityId);
+                if (!entityItemRenderable) {
+                    _keyboardFocusWaitingOnRenderable = true;
+                } else if (entityItemRenderable->wantsKeyboardFocus()) {
+                    entities->setProxyWindow(entityId, _window->windowHandle());
+                    if (_keyboardMouseDevice->isActive()) {
+                        _keyboardMouseDevice->pluginFocusOutEvent();
+                    }
+                    _lastAcceptedKeyPress = usecTimestampNow();
+
+                    if (properties.getShowKeyboardFocusHighlight()) {
+                        if (auto entity = entities->getEntity(entityId)) {
+                            setKeyboardFocusHighlight(entity->getWorldPosition(), entity->getWorldOrientation(),
+                                entity->getScaledDimensions() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        EntityItemProperties properties;
+        properties.setVisible(false);
+        entityScriptingInterface->editEntity(_keyboardFocusHighlightID, properties);
+    }
+}
+
+void Application::clearDomainOctreeDetails(bool clearAll) {
+    // if we're about to quit, we really don't need to do the rest of these things...
+    if (_aboutToQuit) {
+        return;
+    }
+
+    qCDebug(interfaceapp) << "Clearing domain octree details...";
+
+    resetPhysicsReadyInformation();
+    setIsInterstitialMode(true);
+
+    auto octreeServerSceneStats = getOcteeSceneStats();
+    octreeServerSceneStats->withWriteLock([&] {
+        octreeServerSceneStats->clear();
+    });
+
+    // reset the model renderer
+    clearAll ? getEntities()->clear() : getEntities()->clearDomainAndNonOwnedEntities();
+
+    DependencyManager::get<AnimationCache>()->clearUnusedResources();
+    DependencyManager::get<SoundCache>()->clearUnusedResources();
+    DependencyManager::get<MaterialCache>()->clearUnusedResources();
+    DependencyManager::get<ModelCache>()->clearUnusedResources();
+    ShaderCache::instance().clearUnusedResources();
+    DependencyManager::get<TextureCache>()->clearUnusedResources();
+    DependencyManager::get<recording::ClipCache>()->clearUnusedResources();
+}
+
+void Application::resettingDomain() {
+    _notifiedPacketVersionMismatchThisDomain = false;
+
+    clearDomainOctreeDetails(false);
+}
+
+void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
+    if (!_settingsLoaded) {
+        return; // bail early if settings are not loaded
+    }
+
+    const bool isModifiedQuery = !_physicsEnabled;
+    if (isModifiedQuery) {
+        if (!_octreeProcessor->safeLandingIsActive()) {
+            // don't send the octreeQuery until SafeLanding knows it has started
+            return;
+        }
+        // Create modified view that is a simple sphere.
+        bool interstitialModeEnabled = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
+
+        ConicalViewFrustum sphericalView;
+        AABox box = getMyAvatar()->getGlobalBoundingBox();
+        float radius = glm::max(INITIAL_QUERY_RADIUS, 0.5f * glm::length(box.getDimensions()));
+        sphericalView.setPositionAndSimpleRadius(box.calcCenter(), radius);
+
+        if (interstitialModeEnabled) {
+            ConicalViewFrustum farView;
+            farView.set(_viewFrustum);
+            _octreeQuery.setConicalViews({ sphericalView, farView });
+        } else {
+            _octreeQuery.setConicalViews({ sphericalView });
+        }
+
+        _octreeQuery.setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);
+        static constexpr float MIN_LOD_ADJUST = -20.0f;
+        _octreeQuery.setBoundaryLevelAdjust(MIN_LOD_ADJUST);
+    } else {
+        _octreeQuery.setConicalViews(_conicalViews);
+        auto lodManager = DependencyManager::get<LODManager>();
+        _octreeQuery.setOctreeSizeScale(lodManager->getOctreeSizeScale());
+        _octreeQuery.setBoundaryLevelAdjust(lodManager->getBoundaryLevelAdjust());
+    }
+    _octreeQuery.setReportInitialCompletion(isModifiedQuery);
+
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    auto node = nodeList->soloNodeOfType(serverType);
+    if (node && node->getActiveSocket()) {
+        _octreeQuery.setMaxQueryPacketsPerSecond(getMaxOctreePacketsPerSecond());
+
+        auto queryPacket = NLPacket::create(packetType);
+
+        // encode the query data
+        auto packetData = reinterpret_cast<unsigned char*>(queryPacket->getPayload());
+        int packetSize = _octreeQuery.getBroadcastData(packetData);
+        queryPacket->setPayloadSize(packetSize);
+
+        // make sure we still have an active socket
+        nodeList->sendUnreliablePacket(*queryPacket, *node);
+    }
+}
+
+int Application::sendNackPackets() {
+    // iterates through all nodes in NodeList
+    auto nodeList = DependencyManager::get<NodeList>();
+
+    int packetsSent = 0;
+
+    nodeList->eachNode([&](const SharedNodePointer& node){
+
+        if (node->getActiveSocket() && node->getType() == NodeType::EntityServer) {
+
+            auto nackPacketList = NLPacketList::create(PacketType::OctreeDataNack);
+
+            QUuid nodeUUID = node->getUUID();
+
+            // if there are octree packets from this node that are waiting to be processed,
+            // don't send a NACK since the missing packets may be among those waiting packets.
+            if (_octreeProcessor->hasPacketsToProcessFrom(nodeUUID)) {
+                return;
+            }
+
+            QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers;
+            auto octreeServerSceneStats = getOcteeSceneStats();
+            octreeServerSceneStats->withReadLock([&] {
+                // retrieve octree scene stats of this node
+                if (octreeServerSceneStats->find(nodeUUID) == octreeServerSceneStats->end()) {
+                    return;
+                }
+                // get sequence number stats of node, prune its missing set, and make a copy of the missing set
+                SequenceNumberStats& sequenceNumberStats = (*octreeServerSceneStats)[nodeUUID].getIncomingOctreeSequenceNumberStats();
+                sequenceNumberStats.pruneMissingSet();
+                missingSequenceNumbers = sequenceNumberStats.getMissingSet();
+            });
+
+            _isMissingSequenceNumbers = (missingSequenceNumbers.size() != 0);
+
+            // construct nack packet(s) for this node
+            foreach(const OCTREE_PACKET_SEQUENCE& missingNumber, missingSequenceNumbers) {
+                nackPacketList->writePrimitive(missingNumber);
+            }
+
+            if (nackPacketList->getNumPackets()) {
+                packetsSent += (int)nackPacketList->getNumPackets();
+
+                // send the packet list
+                nodeList->sendPacketList(std::move(nackPacketList), *node);
+            }
+        }
+    });
+
+    return packetsSent;
+}
\ No newline at end of file
diff --git a/interface/src/Application_Events.cpp b/interface/src/Application_Events.cpp
new file mode 100644
index 00000000000..eda0e0039c5
--- /dev/null
+++ b/interface/src/Application_Events.cpp
@@ -0,0 +1,931 @@
+//
+//  Application_Events.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <QtCore/QMimeData>
+
+#include <controllers/InputRecorder.h>
+#include <display-plugins/CompositorHelper.h>
+#include <graphics/RenderEventHandler.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+#include <input-plugins/TouchscreenDevice.h>
+#include <input-plugins/TouchscreenVirtualPadDevice.h>
+#include <MainWindow.h>
+#include <OffscreenUi.h>
+#include <plugins/PluginManager.h>
+#include <ScriptEngines.h>
+#include <scripting/Audio.h>
+#include <scripting/ControllerScriptingInterface.h>
+#include <shared/FileUtils.h>
+#include <ui/DialogsManager.h>
+
+#include "AudioClient.h"
+#include "GLCanvas.h"
+#include "Menu.h"
+
+#if defined(Q_OS_ANDROID)
+#include "AndroidHelper.h"
+#endif
+
+Q_LOGGING_CATEGORY(trace_app_input_mouse, "trace.app.input.mouse")
+
+static const unsigned int THROTTLED_SIM_FRAMERATE = 15;
+static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SIM_FRAMERATE;
+
+class LambdaEvent : public QEvent {
+    std::function<void()> _fun;
+public:
+    LambdaEvent(const std::function<void()> & fun) :
+        QEvent(static_cast<QEvent::Type>(ApplicationEvent::Lambda)), _fun(fun) {}
+    LambdaEvent(std::function<void()> && fun) :
+        QEvent(static_cast<QEvent::Type>(ApplicationEvent::Lambda)), _fun(fun) {}
+    void call() const { _fun(); }
+};
+
+bool Application::notify(QObject* object, QEvent* event) {
+    if (thread() == QThread::currentThread()) {
+        PROFILE_RANGE_IF_LONGER(app, "notify", 2)
+        return QApplication::notify(object, event);
+    }
+
+    return QApplication::notify(object, event);
+}
+
+static inline bool isKeyEvent(QEvent::Type type) {
+    return type == QEvent::KeyPress || type == QEvent::KeyRelease;
+}
+
+bool Application::event(QEvent* event) {
+    if (_aboutToQuit) {
+        return false;
+    }
+
+    // This helps avoid deadlock issue early during Application initialization
+    if (!_isMenuInitialized) {
+        return QApplication::event(event);
+    }
+
+    if (!Menu::getInstance()) {
+        return false;
+    }
+
+    if ((event->type() == QEvent::InputMethod || event->type() == QEvent::InputMethodQuery) && handleInputMethodEventForFocusedEntity(event)) {
+        return true;
+    }
+
+    // Allow focused Entities to handle keyboard input
+    if (isKeyEvent(event->type()) && handleKeyEventForFocusedEntity(event)) {
+        return true;
+    }
+
+    int type = event->type();
+    switch (type) {
+        case ApplicationEvent::Lambda:
+            static_cast<LambdaEvent*>(event)->call();
+            return true;
+
+        // Explicit idle keeps the idle running at a lower interval, but without any rendering
+        // see (windowMinimizedChanged)
+        case ApplicationEvent::Idle:
+            idle();
+
+#ifdef DEBUG_EVENT_QUEUE_DEPTH
+            // The event queue may very well grow beyond 400, so
+            // this code should only be enabled on local builds
+            {
+                int count = ::hifi::qt::getEventQueueSize(QThread::currentThread());
+                if (count > 400) {
+                    ::hifi::qt::dumpEventQueue(QThread::currentThread());
+                }
+            }
+#endif // DEBUG_EVENT_QUEUE_DEPTH
+
+            _pendingIdleEvent.store(false);
+
+            return true;
+
+        case QEvent::MouseMove:
+            mouseMoveEvent(static_cast<QMouseEvent*>(event));
+            return true;
+        case QEvent::MouseButtonPress:
+            mousePressEvent(static_cast<QMouseEvent*>(event));
+            return true;
+        case QEvent::MouseButtonDblClick:
+            mouseDoublePressEvent(static_cast<QMouseEvent*>(event));
+            return true;
+        case QEvent::MouseButtonRelease:
+            mouseReleaseEvent(static_cast<QMouseEvent*>(event));
+            return true;
+        case QEvent::KeyPress:
+            keyPressEvent(static_cast<QKeyEvent*>(event));
+            return true;
+        case QEvent::KeyRelease:
+            keyReleaseEvent(static_cast<QKeyEvent*>(event));
+            return true;
+        case QEvent::FocusOut:
+            focusOutEvent(static_cast<QFocusEvent*>(event));
+            return true;
+        case QEvent::FocusIn:
+        { //testing to see if we can set focus when focus is not set to root window.
+            _glWidget->activateWindow();
+            _glWidget->setFocus();
+            return true;
+        }
+
+        case QEvent::TouchBegin:
+            touchBeginEvent(static_cast<QTouchEvent*>(event));
+            event->accept();
+            return true;
+        case QEvent::TouchEnd:
+            touchEndEvent(static_cast<QTouchEvent*>(event));
+            return true;
+        case QEvent::TouchUpdate:
+            touchUpdateEvent(static_cast<QTouchEvent*>(event));
+            return true;
+        case QEvent::Gesture:
+            touchGestureEvent((QGestureEvent*)event);
+            return true;
+        case QEvent::Wheel:
+            wheelEvent(static_cast<QWheelEvent*>(event));
+            return true;
+        case QEvent::Drop:
+            dropEvent(static_cast<QDropEvent*>(event));
+            return true;
+
+        case QEvent::FileOpen:
+            if (handleFileOpenEvent(static_cast<QFileOpenEvent*>(event))) {
+                return true;
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return QApplication::event(event);
+}
+
+bool Application::eventFilter(QObject* object, QEvent* event) {
+    auto eventType = event->type();
+
+    if (_aboutToQuit && eventType != QEvent::DeferredDelete && eventType != QEvent::Destroy) {
+        return true;
+    }
+
+#if defined(Q_OS_MAC)
+    // On Mac OS, Cmd+LeftClick is treated as a RightClick (more specifically, it seems to
+    // be Cmd+RightClick without the modifier being dropped). Starting in Qt 5.12, only
+    // on Mac, the MouseButtonRelease event for these mouse presses is sent to the top
+    // level QWidgetWindow, but are not propagated further. This means that the Application
+    // will see a MouseButtonPress, but no MouseButtonRelease, causing the client to get
+    // stuck in "mouse-look." The cause of the problem is in the way QWidgetWindow processes
+    // events where QMouseEvent::button() is not equal to QMouseEvent::buttons(). In this case
+    // QMouseEvent::button() is Qt::RightButton, while QMouseEvent::buttons() is (correctly?)
+    // Qt::LeftButton.
+    //
+    // The change here gets around this problem by capturing these
+    // pseudo-RightClicks, and re-emitting them as "pure" RightClicks, where
+    // QMouseEvent::button() == QMouseEvent::buttons() == Qt::RightButton.
+    //
+    if (eventType == QEvent::MouseButtonPress) {
+        auto mouseEvent = static_cast<QMouseEvent*>(event);
+        if (mouseEvent->button() == Qt::RightButton
+            && mouseEvent->buttons() == Qt::LeftButton
+            && mouseEvent->modifiers() == Qt::MetaModifier) {
+
+            QMouseEvent* newEvent = new QMouseEvent(
+                    QEvent::MouseButtonPress, mouseEvent->localPos(), mouseEvent->windowPos(),
+                    mouseEvent->screenPos(), Qt::RightButton, Qt::MouseButtons(Qt::RightButton),
+                    mouseEvent->modifiers());
+            QApplication::postEvent(object, newEvent);
+            return true;
+        }
+    }
+#endif
+
+    if (eventType == QEvent::KeyPress || eventType == QEvent::KeyRelease || eventType == QEvent::MouseMove) {
+        getRefreshRateManager().resetInactiveTimer();
+    }
+
+    if (event->type() == QEvent::Leave) {
+        getApplicationCompositor().handleLeaveEvent();
+    }
+
+    if (event->type() == QEvent::ShortcutOverride) {
+#if !defined(DISABLE_QML)
+        if (getOffscreenUI()->shouldSwallowShortcut(event)) {
+            event->accept();
+            return true;
+        }
+#endif
+
+        // Filter out captured keys before they're used for shortcut actions.
+        if (_controllerScriptingInterface->isKeyCaptured(static_cast<QKeyEvent*>(event))) {
+            event->accept();
+            return true;
+        }
+    }
+
+    if (event->type() == QEvent::WindowStateChange) {
+        if (getWindow()->windowState() & Qt::WindowMinimized) {
+            getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::MINIMIZED);
+        } else {
+            auto* windowStateChangeEvent = static_cast<QWindowStateChangeEvent*>(event);
+            if (windowStateChangeEvent->oldState() & Qt::WindowMinimized) {
+                getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::FOCUS_ACTIVE);
+                getRefreshRateManager().resetInactiveTimer();
+            }
+        }
+    }
+
+    return false;
+}
+
+void Application::postLambdaEvent(const std::function<void()>& f) {
+    if (this->thread() == QThread::currentThread()) {
+        f();
+    } else {
+        QCoreApplication::postEvent(this, new LambdaEvent(f));
+    }
+}
+
+void Application::sendLambdaEvent(const std::function<void()>& f) {
+    if (this->thread() == QThread::currentThread()) {
+        f();
+    } else {
+        LambdaEvent event(f);
+        QCoreApplication::sendEvent(this, &event);
+    }
+}
+
+void Application::pushPostUpdateLambda(void* key, const std::function<void()>& func) {
+    std::unique_lock<std::mutex> guard(_postUpdateLambdasLock);
+    _postUpdateLambdas[key] = func;
+}
+
+// thread-safe
+void Application::onPresent(quint32 frameCount) {
+    bool expected = false;
+    if (_pendingIdleEvent.compare_exchange_strong(expected, true)) {
+        postEvent(this, new QEvent((QEvent::Type)ApplicationEvent::Idle), Qt::HighEventPriority);
+    }
+    expected = false;
+    if (_graphicsEngine->checkPendingRenderEvent() && !isAboutToQuit()) {
+        postEvent(_graphicsEngine->_renderEventHandler, new QEvent((QEvent::Type)ApplicationEvent::Render));
+    }
+}
+
+void Application::activeChanged(Qt::ApplicationState state) {
+    switch (state) {
+        case Qt::ApplicationActive:
+            _isForeground = true;
+            if (!_aboutToQuit && _startUpFinished) {
+                getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::FOCUS_ACTIVE);
+            }
+            break;
+
+        case Qt::ApplicationSuspended:
+            break;
+        case Qt::ApplicationHidden:
+            break;
+        case Qt::ApplicationInactive:
+            if (!_aboutToQuit && _startUpFinished) {
+                getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::UNFOCUS);
+            }
+            break;
+        default:
+            _isForeground = false;
+            break;
+    }
+}
+
+void Application::windowMinimizedChanged(bool minimized) {
+    // initialize the _minimizedWindowTimer
+    static std::once_flag once;
+    std::call_once(once, [&] {
+        connect(&_minimizedWindowTimer, &QTimer::timeout, this, [] {
+            QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(static_cast<QEvent::Type>(Idle)), Qt::HighEventPriority);
+        });
+    });
+
+    // avoid rendering to the display plugin but continue posting Idle events,
+    // so that physics continues to simulate and the deadlock watchdog knows we're alive
+    if (!minimized && !getActiveDisplayPlugin()->isActive()) {
+        _minimizedWindowTimer.stop();
+        getActiveDisplayPlugin()->activate();
+    } else if (minimized && getActiveDisplayPlugin()->isActive()) {
+        getActiveDisplayPlugin()->deactivate();
+        _minimizedWindowTimer.start(THROTTLED_SIM_FRAME_PERIOD_MS);
+    }
+}
+
+void Application::keyPressEvent(QKeyEvent* event) {
+    if (!event->isAutoRepeat()) {
+        _keysPressed.insert(event->key(), *event);
+    }
+
+    _controllerScriptingInterface->emitKeyPressEvent(event); // send events to any registered scripts
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isKeyCaptured(event) || isInterstitialMode()) {
+        return;
+    }
+
+    if (hasFocus() && getLoginDialogPoppedUp()) {
+        if (_keyboardMouseDevice->isActive()) {
+            _keyboardMouseDevice->keyReleaseEvent(event);
+        }
+
+        bool isControlOrCommand = event->modifiers().testFlag(Qt::ControlModifier);
+        bool isOption = event->modifiers().testFlag(Qt::AltModifier);
+        switch (event->key()) {
+            case Qt::Key_4:
+            case Qt::Key_5:
+            case Qt::Key_6:
+            case Qt::Key_7:
+                if (isControlOrCommand || isOption) {
+                    unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
+                    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+                    if (index < displayPlugins.size()) {
+                        auto targetPlugin = displayPlugins.at(index);
+                        QString targetName = targetPlugin->getName();
+                        auto menu = Menu::getInstance();
+                        QAction* action = menu->getActionForOption(targetName);
+                        if (action && !action->isChecked()) {
+                            action->trigger();
+                        }
+                    }
+                }
+                break;
+        }
+    } else if (hasFocus()) {
+        if (_keyboardMouseDevice->isActive()) {
+            _keyboardMouseDevice->keyPressEvent(event);
+        }
+
+        bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
+        bool isControlOrCommand = event->modifiers().testFlag(Qt::ControlModifier);
+        bool isMetaOrMacControl = event->modifiers().testFlag(Qt::MetaModifier);
+        bool isOption = event->modifiers().testFlag(Qt::AltModifier);
+        switch (event->key()) {
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
+                if (isOption) {
+                    if (_window->isFullScreen()) {
+                        unsetFullscreen();
+                    } else {
+                        setFullscreen(nullptr);
+                    }
+                }
+                break;
+
+            case Qt::Key_1: {
+                Menu* menu = Menu::getInstance();
+                menu->triggerOption(MenuOption::FirstPersonLookAt);
+                break;
+            }
+            case Qt::Key_2: {
+                Menu* menu = Menu::getInstance();
+                menu->triggerOption(MenuOption::SelfieCamera);
+                break;
+            }
+            case Qt::Key_3: {
+                Menu* menu = Menu::getInstance();
+                menu->triggerOption(MenuOption::LookAtCamera);
+                break;
+            }
+            case Qt::Key_4:
+            case Qt::Key_5:
+            case Qt::Key_6:
+            case Qt::Key_7:
+                if (isControlOrCommand || isOption) {
+                    unsigned int index = static_cast<unsigned int>(event->key() - Qt::Key_1);
+                    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+                    if (index < displayPlugins.size()) {
+                        auto targetPlugin = displayPlugins.at(index);
+                        QString targetName = targetPlugin->getName();
+                        auto menu = Menu::getInstance();
+                        QAction* action = menu->getActionForOption(targetName);
+                        if (action && !action->isChecked()) {
+                            action->trigger();
+                        }
+                    }
+                }
+                break;
+
+            case Qt::Key_G:
+                if (isShifted && isControlOrCommand && isOption && isMetaOrMacControl) {
+                    static const QString HIFI_FRAMES_FOLDER_VAR = "HIFI_FRAMES_FOLDER";
+                    static const QString GPU_FRAME_FOLDER = QProcessEnvironment::systemEnvironment().contains(HIFI_FRAMES_FOLDER_VAR)
+                        ? QProcessEnvironment::systemEnvironment().value(HIFI_FRAMES_FOLDER_VAR)
+                        : "hifiFrames";
+                    static QString GPU_FRAME_TEMPLATE = GPU_FRAME_FOLDER + "/{DATE}_{TIME}";
+                    QString fullPath = FileUtils::computeDocumentPath(FileUtils::replaceDateTimeTokens(GPU_FRAME_TEMPLATE));
+                    if (FileUtils::canCreateFile(fullPath)) {
+                        getActiveDisplayPlugin()->captureFrame(fullPath.toStdString());
+                    }
+                }
+                break;
+            case Qt::Key_X:
+                if (isShifted && isControlOrCommand) {
+                    auto offscreenUi = getOffscreenUI();
+                    offscreenUi->togglePinned();
+                    //offscreenUi->getSurfaceContext()->engine()->clearComponentCache();
+                    //OffscreenUi::information("Debugging", "Component cache cleared");
+                    // placeholder for dialogs being converted to QML.
+                }
+                break;
+
+            case Qt::Key_Y:
+                if (isShifted && isControlOrCommand) {
+                    getActiveDisplayPlugin()->cycleDebugOutput();
+                }
+                break;
+
+            case Qt::Key_B:
+                if (isOption) {
+                    controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
+                    inputRecorder->stopPlayback();
+                }
+                break;
+
+            case Qt::Key_L:
+                if (isShifted && isControlOrCommand) {
+                    Menu::getInstance()->triggerOption(MenuOption::Log);
+                } else if (isControlOrCommand) {
+                    auto dialogsManager = DependencyManager::get<DialogsManager>();
+                    dialogsManager->toggleAddressBar();
+                }
+                break;
+
+            case Qt::Key_R:
+                if (isControlOrCommand && !event->isAutoRepeat()) {
+                    DependencyManager::get<ScriptEngines>()->reloadAllScripts();
+                    getOffscreenUI()->clearCache();
+                }
+                break;
+
+            case Qt::Key_Asterisk:
+                Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox);
+                break;
+
+            case Qt::Key_M:
+                if (isControlOrCommand) {
+                    auto audioClient = DependencyManager::get<AudioClient>();
+                    audioClient->setMuted(!audioClient->isMuted());
+                    QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
+                    if (audioScriptingInterface && audioScriptingInterface->getPTT()) {
+                       audioScriptingInterface->setPushingToTalk(!audioClient->isMuted());
+                    }
+                }
+                break;
+
+            case Qt::Key_S:
+                if (isShifted && isControlOrCommand && !isOption) {
+                    Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings);
+                }
+                break;
+
+            case Qt::Key_Apostrophe: {
+                if (isControlOrCommand) {
+                    auto cursor = Cursor::Manager::instance().getCursor();
+                    auto curIcon = cursor->getIcon();
+                    if (curIcon == Cursor::Icon::DEFAULT) {
+                        showCursor(Cursor::Icon::RETICLE);
+                    } else if (curIcon == Cursor::Icon::RETICLE) {
+                        showCursor(Cursor::Icon::SYSTEM);
+                    } else if (curIcon == Cursor::Icon::SYSTEM) {
+                        showCursor(Cursor::Icon::LINK);
+                    } else {
+                        showCursor(Cursor::Icon::DEFAULT);
+                    }
+                } else if (!event->isAutoRepeat()){
+                    resetSensors(true);
+                }
+                break;
+            }
+
+            case Qt::Key_Backslash:
+                Menu::getInstance()->triggerOption(MenuOption::Chat);
+                break;
+
+            case Qt::Key_Slash:
+                Menu::getInstance()->triggerOption(MenuOption::Stats);
+                break;
+
+            case Qt::Key_Plus: {
+                if (isControlOrCommand && event->modifiers().testFlag(Qt::KeypadModifier)) {
+                    auto& cursorManager = Cursor::Manager::instance();
+                    cursorManager.setScale(cursorManager.getScale() * 1.1f);
+                } else {
+                    getMyAvatar()->increaseSize();
+                }
+                break;
+            }
+
+            case Qt::Key_Minus: {
+                if (isControlOrCommand && event->modifiers().testFlag(Qt::KeypadModifier)) {
+                    auto& cursorManager = Cursor::Manager::instance();
+                    cursorManager.setScale(cursorManager.getScale() / 1.1f);
+                } else {
+                    getMyAvatar()->decreaseSize();
+                }
+                break;
+            }
+
+            case Qt::Key_Equal:
+                getMyAvatar()->resetSize();
+                break;
+            case Qt::Key_Escape: {
+                getActiveDisplayPlugin()->abandonCalibration();
+                break;
+            }
+
+            default:
+                event->ignore();
+                break;
+        }
+    }
+}
+
+void Application::keyReleaseEvent(QKeyEvent* event) {
+    if (!event->isAutoRepeat()) {
+        _keysPressed.remove(event->key());
+    }
+
+#if defined(Q_OS_ANDROID)
+    if (event->key() == Qt::Key_Back) {
+        event->accept();
+        AndroidHelper::instance().requestActivity("Home", false);
+    }
+#endif
+    _controllerScriptingInterface->emitKeyReleaseEvent(event); // send events to any registered scripts
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isKeyCaptured(event)) {
+        return;
+    }
+
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->keyReleaseEvent(event);
+    }
+
+}
+
+void Application::focusOutEvent(QFocusEvent* event) {
+    const auto& inputPlugins = PluginManager::getInstance()->getInputPlugins();
+    for(const auto& inputPlugin : inputPlugins) {
+        if (inputPlugin->isActive()) {
+            inputPlugin->pluginFocusOutEvent();
+        }
+    }
+// FIXME spacemouse code still needs cleanup
+#if 0
+    //SpacemouseDevice::getInstance().focusOutEvent();
+    //SpacemouseManager::getInstance().getDevice()->focusOutEvent();
+    SpacemouseManager::getInstance().ManagerFocusOutEvent();
+#endif
+
+    synthesizeKeyReleasEvents();
+}
+
+void Application::synthesizeKeyReleasEvents() {
+    // synthesize events for keys currently pressed, since we may not get their release events
+    // Because our key event handlers may manipulate _keysPressed, lets swap the keys pressed into a local copy,
+    // clearing the existing list.
+    QHash<int, QKeyEvent> keysPressed;
+    std::swap(keysPressed, _keysPressed);
+    for (auto& ev : keysPressed) {
+        QKeyEvent synthesizedEvent { QKeyEvent::KeyRelease, ev.key(), Qt::NoModifier, ev.text() };
+        keyReleaseEvent(&synthesizedEvent);
+    }
+}
+
+void Application::mouseMoveEvent(QMouseEvent* event) {
+    PROFILE_RANGE(app_input_mouse, __FUNCTION__);
+
+    if (_ignoreMouseMove) {
+        _ignoreMouseMove = false;
+        return;
+    }
+
+    maybeToggleMenuVisible(event);
+
+    auto& compositor = getApplicationCompositor();
+    // if this is a real mouse event, and we're in HMD mode, then we should use it to move the
+    // compositor reticle
+    // handleRealMouseMoveEvent() will return true, if we shouldn't process the event further
+    if (!compositor.fakeEventActive() && compositor.handleRealMouseMoveEvent()) {
+        return; // bail
+    }
+
+#if !defined(DISABLE_QML)
+    auto offscreenUi = getOffscreenUI();
+    auto eventPosition = compositor.getMouseEventPosition(event);
+    QPointF transformedPos = offscreenUi ? offscreenUi->mapToVirtualScreen(eventPosition) : QPointF();
+#else
+    QPointF transformedPos;
+#endif
+    auto button = event->button();
+    auto buttons = event->buttons();
+    // Determine if the ReticleClick Action is 1 and if so, fake include the LeftMouseButton
+    if (_reticleClickPressed) {
+        if (button == Qt::NoButton) {
+            button = Qt::LeftButton;
+        }
+        buttons |= Qt::LeftButton;
+    }
+
+    QMouseEvent mappedEvent(event->type(),
+        transformedPos,
+        event->screenPos(), button,
+        buttons, event->modifiers());
+
+    if (compositor.getReticleVisible() || !isHMDMode() || !compositor.getReticleOverDesktop() ||
+        getOverlays().getOverlayAtPoint(glm::vec2(transformedPos.x(), transformedPos.y())) != UNKNOWN_ENTITY_ID) {
+        getEntities()->mouseMoveEvent(&mappedEvent);
+    }
+
+    _controllerScriptingInterface->emitMouseMoveEvent(&mappedEvent); // send events to any registered scripts
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isMouseCaptured()) {
+        return;
+    }
+
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->mouseMoveEvent(event, _captureMouse, _mouseCaptureTarget);
+    }
+}
+
+void Application::mousePressEvent(QMouseEvent* event) {
+#if !defined(DISABLE_QML)
+    auto offscreenUi = getOffscreenUI();
+    // If we get a mouse press event it means it wasn't consumed by the offscreen UI,
+    // hence, we should defocus all of the offscreen UI windows, in order to allow
+    // keyboard shortcuts not to be swallowed by them.  In particular, WebEngineViews
+    // will consume all keyboard events.
+    offscreenUi->unfocusWindows();
+
+    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
+    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition);
+#else
+    QPointF transformedPos;
+#endif
+
+    QMouseEvent mappedEvent(event->type(), transformedPos, event->screenPos(), event->button(), event->buttons(), event->modifiers());
+    QUuid result = getEntities()->mousePressEvent(&mappedEvent);
+    setKeyboardFocusEntity(getEntities()->wantsKeyboardFocus(result) ? result : UNKNOWN_ENTITY_ID);
+
+    _controllerScriptingInterface->emitMousePressEvent(&mappedEvent); // send events to any registered scripts
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isMouseCaptured()) {
+        return;
+    }
+
+#if defined(Q_OS_MAC)
+    // Fix for OSX right click dragging on window when coming from a native window
+    bool isFocussed = hasFocus();
+    if (!isFocussed && event->button() == Qt::MouseButton::RightButton) {
+        setFocus();
+        isFocussed = true;
+    }
+
+    if (isFocussed) {
+#else
+    if (hasFocus()) {
+#endif
+        if (_keyboardMouseDevice->isActive()) {
+            _keyboardMouseDevice->mousePressEvent(event);
+        }
+    }
+}
+
+void Application::mouseDoublePressEvent(QMouseEvent* event) {
+#if !defined(DISABLE_QML)
+    auto offscreenUi = getOffscreenUI();
+    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
+    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition);
+#else
+    QPointF transformedPos;
+#endif
+    QMouseEvent mappedEvent(event->type(),
+        transformedPos,
+        event->screenPos(), event->button(),
+        event->buttons(), event->modifiers());
+    getEntities()->mouseDoublePressEvent(&mappedEvent);
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isMouseCaptured()) {
+        return;
+    }
+
+    _controllerScriptingInterface->emitMouseDoublePressEvent(event);
+}
+
+void Application::mouseReleaseEvent(QMouseEvent* event) {
+#if !defined(DISABLE_QML)
+    auto offscreenUi = getOffscreenUI();
+    auto eventPosition = getApplicationCompositor().getMouseEventPosition(event);
+    QPointF transformedPos = offscreenUi->mapToVirtualScreen(eventPosition);
+#else
+    QPointF transformedPos;
+#endif
+    QMouseEvent mappedEvent(event->type(),
+        transformedPos,
+        event->screenPos(), event->button(),
+        event->buttons(), event->modifiers());
+
+    getEntities()->mouseReleaseEvent(&mappedEvent);
+
+    _controllerScriptingInterface->emitMouseReleaseEvent(&mappedEvent); // send events to any registered scripts
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isMouseCaptured()) {
+        return;
+    }
+
+    if (hasFocus()) {
+        if (_keyboardMouseDevice->isActive()) {
+            _keyboardMouseDevice->mouseReleaseEvent(event);
+        }
+    }
+}
+
+void Application::touchBeginEvent(QTouchEvent* event) {
+    TouchEvent thisEvent(*event); // on touch begin, we don't compare to last event
+    _controllerScriptingInterface->emitTouchBeginEvent(thisEvent); // send events to any registered scripts
+
+    _lastTouchEvent = thisEvent; // and we reset our last event to this event before we call our update
+    touchUpdateEvent(event);
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isTouchCaptured()) {
+        return;
+    }
+
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->touchBeginEvent(event);
+    }
+    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
+        _touchscreenDevice->touchBeginEvent(event);
+    }
+    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
+        _touchscreenVirtualPadDevice->touchBeginEvent(event);
+    }
+
+}
+
+void Application::touchEndEvent(QTouchEvent* event) {
+    TouchEvent thisEvent(*event, _lastTouchEvent);
+    _controllerScriptingInterface->emitTouchEndEvent(thisEvent); // send events to any registered scripts
+    _lastTouchEvent = thisEvent;
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isTouchCaptured()) {
+        return;
+    }
+
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->touchEndEvent(event);
+    }
+    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
+        _touchscreenDevice->touchEndEvent(event);
+    }
+    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
+        _touchscreenVirtualPadDevice->touchEndEvent(event);
+    }
+    // put any application specific touch behavior below here..
+}
+
+void Application::touchUpdateEvent(QTouchEvent* event) {
+    if (event->type() == QEvent::TouchUpdate) {
+        TouchEvent thisEvent(*event, _lastTouchEvent);
+        _controllerScriptingInterface->emitTouchUpdateEvent(thisEvent); // send events to any registered scripts
+        _lastTouchEvent = thisEvent;
+    }
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isTouchCaptured()) {
+        return;
+    }
+
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->touchUpdateEvent(event);
+    }
+    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
+        _touchscreenDevice->touchUpdateEvent(event);
+    }
+    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
+        _touchscreenVirtualPadDevice->touchUpdateEvent(event);
+    }
+}
+
+void Application::touchGestureEvent(QGestureEvent* event) {
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->touchGestureEvent(event);
+    }
+    if (_touchscreenDevice && _touchscreenDevice->isActive()) {
+        _touchscreenDevice->touchGestureEvent(event);
+    }
+    if (_touchscreenVirtualPadDevice && _touchscreenVirtualPadDevice->isActive()) {
+        _touchscreenVirtualPadDevice->touchGestureEvent(event);
+    }
+}
+
+void Application::wheelEvent(QWheelEvent* event) const {
+    _controllerScriptingInterface->emitWheelEvent(event); // send events to any registered scripts
+
+    // if one of our scripts have asked to capture this event, then stop processing it
+    if (_controllerScriptingInterface->isWheelCaptured() || getLoginDialogPoppedUp()) {
+        return;
+    }
+
+    if (_keyboardMouseDevice->isActive()) {
+        _keyboardMouseDevice->wheelEvent(event);
+    }
+}
+
+void Application::dropEvent(QDropEvent *event) {
+    const QMimeData* mimeData = event->mimeData();
+    for (auto& url : mimeData->urls()) {
+        QString urlString = url.toString();
+        if (acceptURL(urlString, true)) {
+            event->acceptProposedAction();
+        }
+    }
+}
+
+bool Application::handleInputMethodEventForFocusedEntity(QEvent* event) {
+    if (_keyboardFocusedEntity.get() != UNKNOWN_ENTITY_ID) {
+        switch (event->type()) {
+            case QEvent::InputMethod:
+            case QEvent::InputMethodQuery:
+            {
+                auto eventHandler = getEntities()->getEventHandler(_keyboardFocusedEntity.get());
+                if (eventHandler) {
+                    event->setAccepted(false);
+                    QCoreApplication::sendEvent(eventHandler, event);
+                    if (event->isAccepted()) {
+                        _lastAcceptedKeyPress = usecTimestampNow();
+                        return true;
+                    }
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    return false;
+}
+
+bool Application::handleKeyEventForFocusedEntity(QEvent* event) {
+    if (_keyboardFocusedEntity.get() != UNKNOWN_ENTITY_ID) {
+        switch (event->type()) {
+            case QEvent::KeyPress:
+            case QEvent::KeyRelease:
+                {
+                    auto eventHandler = getEntities()->getEventHandler(_keyboardFocusedEntity.get());
+                    if (eventHandler) {
+                        event->setAccepted(false);
+                        QCoreApplication::sendEvent(eventHandler, event);
+                        if (event->isAccepted()) {
+                            _lastAcceptedKeyPress = usecTimestampNow();
+                            return true;
+                        }
+                    }
+                    break;
+                }
+            default:
+                break;
+        }
+    }
+
+    return false;
+}
+
+bool Application::handleFileOpenEvent(QFileOpenEvent* fileEvent) {
+    QUrl url = fileEvent->url();
+    if (!url.isEmpty()) {
+        QString urlString = url.toString();
+        if (canAcceptURL(urlString)) {
+            return acceptURL(urlString);
+        }
+    }
+    return false;
+}
diff --git a/interface/src/Application_Graphics.cpp b/interface/src/Application_Graphics.cpp
new file mode 100644
index 00000000000..d081d2941b3
--- /dev/null
+++ b/interface/src/Application_Graphics.cpp
@@ -0,0 +1,597 @@
+//
+//  Application_Graphics.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <memory>
+
+#include <QtQml/QQmlContext>
+
+#include <AudioScriptingInterface.h>
+#include <display-plugins/CompositorHelper.h>
+#include <ErrorDialog.h>
+#include <FramebufferCache.h>
+#include <gl/GLHelpers.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+#include <input-plugins/TouchscreenDevice.h>
+#include <input-plugins/TouchscreenVirtualPadDevice.h>
+#include <MainWindow.h>
+#include <plugins/PluginManager.h>
+#include <Preferences.h>
+#include <RenderableWebEntityItem.h>
+#include <scripting/AccountServicesScriptingInterface.h>
+#include <scripting/HMDScriptingInterface.h>
+#include <scripting/PlatformInfoScriptingInterface.h>
+#include <scripting/RenderScriptingInterface.h>
+#include <scripting/TTSScriptingInterface.h>
+#include <Tooltip.h>
+#include <ui/AddressBarDialog.h>
+#include <ui/Keyboard.h>
+#include <ui/LoginDialog.h>
+#include <ui/OffscreenQmlSurfaceCache.h>
+#include <ui/PreferencesDialog.h>
+#include <ui/ResourceImageItem.h>
+#include <ui/TabletScriptingInterface.h>
+#include <ui/types/ContextAwareProfile.h>
+#include <ui/UpdateDialog.h>
+
+#include "DeadlockWatchdog.h"
+#include "GLCanvas.h"
+#include "InterfaceLogging.h"
+#include "LODManager.h"
+#include "Menu.h"
+#include "webbrowser/WebBrowserSuggestionsEngine.h"
+
+#if defined(Q_OS_ANDROID)
+#include "AndroidHelper.h"
+#endif
+
+Q_GUI_EXPORT void qt_gl_set_global_share_context(QOpenGLContext *context);
+Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
+
+static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
+
+static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE{ "https://more.overte.org/applications" };
+
+void Application::initializeGL() {
+    qCDebug(interfaceapp) << "Created Display Window.";
+
+#ifdef DISABLE_QML
+    setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
+#endif
+
+    // initialize glut for shape drawing; Qt apparently initializes it on OS X
+    if (_isGLInitialized) {
+        return;
+    } else {
+        _isGLInitialized = true;
+    }
+
+    _glWidget->windowHandle()->setFormat(getDefaultOpenGLSurfaceFormat());
+
+    // When loading QtWebEngineWidgets, it creates a global share context on startup.
+    // We have to account for this possibility by checking here for an existing
+    // global share context
+    auto globalShareContext = qt_gl_global_share_context();
+
+#if !defined(DISABLE_QML)
+    // Build a shared canvas / context for the Chromium processes
+    if (!globalShareContext) {
+        // Chromium rendering uses some GL functions that prevent nSight from capturing
+        // frames, so we only create the shared context if nsight is NOT active.
+        if (!nsightActive()) {
+            // FIXME hack access to the internal share context for the Chromium helper
+            // Normally we'd want to use QWebEngine::initialize(), but we can't because
+            // our primary context is a QGLWidget, which can't easily be initialized to share
+            // from a QOpenGLContext.
+            //
+            // So instead we create a new offscreen context to share with the QGLWidget,
+            // and manually set THAT to be the shared context for the Chromium helper
+            OffscreenGLCanvas* chromiumShareContext = new OffscreenGLCanvas();
+            chromiumShareContext->setObjectName("ChromiumShareContext");
+            auto format = QSurfaceFormat::defaultFormat();
+#ifdef Q_OS_MAC
+            // On mac, the primary shared OpenGL context must be a 3.2 core context,
+            // or chromium flips out and spews error spam (but renders fine)
+            format.setMajorVersion(3);
+            format.setMinorVersion(2);
+#endif
+            chromiumShareContext->setFormat(format);
+            chromiumShareContext->create();
+            if (!chromiumShareContext->makeCurrent()) {
+                qCWarning(interfaceapp, "Unable to make chromium shared context current");
+            }
+            globalShareContext = chromiumShareContext->getContext();
+            qt_gl_set_global_share_context(globalShareContext);
+            chromiumShareContext->doneCurrent();
+        }
+    }
+#endif
+
+    _glWidget->createContext(globalShareContext);
+
+    if (!_glWidget->makeCurrent()) {
+        qCWarning(interfaceapp, "Unable to make window context current");
+    }
+
+    // Populate the global OpenGL context based on the information for the primary window GL context
+    gl::ContextInfo::get(true);
+
+#if !defined(DISABLE_QML)
+    QStringList chromiumFlags;
+    // HACK: re-expose mic and camera to prevent crash on domain-change in chromium's media::FakeAudioInputStream::ReadAudioFromSource()
+    // Bug 21993: disable microphone and camera input
+    //chromiumFlags << "--use-fake-device-for-media-stream";
+
+    // Disable signed distance field font rendering on ATI/AMD GPUs, due to
+    // https://highfidelity.manuscript.com/f/cases/13677/Text-showing-up-white-on-Marketplace-app
+    std::string vendor{ (const char*)glGetString(GL_VENDOR) };
+    if ((vendor.find("AMD") != std::string::npos) || (vendor.find("ATI") != std::string::npos)) {
+        chromiumFlags << "--disable-distance-field-text";
+    }
+
+    // Ensure all Qt webengine processes launched from us have the appropriate command line flags
+    if (!chromiumFlags.empty()) {
+        qputenv("QTWEBENGINE_CHROMIUM_FLAGS", chromiumFlags.join(' ').toLocal8Bit());
+    }
+#endif
+
+    if (!globalShareContext) {
+        globalShareContext = _glWidget->qglContext();
+        qt_gl_set_global_share_context(globalShareContext);
+    }
+
+    // Build a shared canvas / context for the QML rendering
+#if !defined(DISABLE_QML)
+    {
+        OffscreenGLCanvas* qmlShareContext = new OffscreenGLCanvas();
+        qmlShareContext->setObjectName("QmlShareContext");
+        qmlShareContext->create(globalShareContext);
+        if (!qmlShareContext->makeCurrent()) {
+            qCWarning(interfaceapp, "Unable to make QML shared context current");
+        }
+        OffscreenQmlSurface::setSharedContext(qmlShareContext->getContext());
+        qmlShareContext->doneCurrent();
+        if (!_glWidget->makeCurrent()) {
+            qCWarning(interfaceapp, "Unable to make window context current");
+        }
+    }
+#endif
+
+    // Build an offscreen GL context for the main thread.
+    _glWidget->makeCurrent();
+    glClearColor(0.2f, 0.2f, 0.2f, 1);
+    glClear(GL_COLOR_BUFFER_BIT);
+    _glWidget->swapBuffers();
+
+    _graphicsEngine->initializeGPU(_glWidget);
+}
+
+void Application::initializeRenderEngine() {
+    // FIXME: on low end systems os the shaders take up to 1 minute to compile, so we pause the deadlock watchdog thread.
+    DeadlockWatchdogThread::withPause([&] {
+        _graphicsEngine->initializeRender();
+        DependencyManager::get<Keyboard>()->registerKeyboardHighlighting();
+    });
+}
+
+#if !defined(DISABLE_QML)
+static const char* EXCLUSION_GROUP_KEY = "exclusionGroup";
+
+static void addDisplayPluginToMenu(const DisplayPluginPointer& displayPlugin, int index, bool active) {
+    auto menu = Menu::getInstance();
+    QString name = displayPlugin->getName();
+    auto grouping = displayPlugin->getGrouping();
+    QString groupingMenu { "" };
+    Q_ASSERT(!menu->menuItemExists(MenuOption::OutputMenu, name));
+
+    // assign the meny grouping based on plugin grouping
+    switch (grouping) {
+        case Plugin::ADVANCED:
+            groupingMenu = "Advanced";
+            break;
+        case Plugin::DEVELOPER:
+            groupingMenu = "Developer";
+            break;
+        default:
+            groupingMenu = "Standard";
+            break;
+    }
+
+    static QActionGroup* displayPluginGroup = nullptr;
+    if (!displayPluginGroup) {
+        displayPluginGroup = new QActionGroup(menu);
+        displayPluginGroup->setExclusive(true);
+    }
+    auto parent = menu->getMenu(MenuOption::OutputMenu);
+    auto action = menu->addActionToQMenuAndActionHash(parent,
+        name, QKeySequence(Qt::CTRL + (Qt::Key_0 + index)), qApp,
+        SLOT(updateDisplayMode()),
+        QAction::NoRole, Menu::UNSPECIFIED_POSITION, groupingMenu);
+
+    action->setCheckable(true);
+    action->setChecked(active);
+    displayPluginGroup->addAction(action);
+
+    action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup));
+    Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name));
+}
+#endif
+
+void Application::initializeUi() {
+
+    // Allow remote QML content from trusted sources ONLY
+    {
+        auto defaultUrlValidator = OffscreenQmlSurface::getUrlValidator();
+        auto newValidator = [=](const QUrl& url) -> bool {
+            QString whitelistPrefix = "[WHITELIST ENTITY SCRIPTS]";
+            QList<QString> safeURLS = { "" };
+            safeURLS += qEnvironmentVariable("EXTRA_WHITELIST").trimmed().split(QRegExp("\\s*,\\s*"), Qt::SkipEmptyParts);
+
+            // PULL SAFEURLS FROM INTERFACE.JSON Settings
+
+            QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
+            QStringList settingsSafeURLS = raw.toString().trimmed().split(QRegExp("\\s*[,\r\n]+\\s*"), Qt::SkipEmptyParts);
+            safeURLS += settingsSafeURLS;
+
+            // END PULL SAFEURLS FROM INTERFACE.JSON Settings
+
+            if (AUTHORIZED_EXTERNAL_QML_SOURCE.isParentOf(url)) {
+                return true;
+            } else {
+                for (const auto& str : safeURLS) {
+                    if (!str.isEmpty() && url.toString().endsWith(".qml") &&
+                        url.toString().startsWith(str)) {
+                        qCDebug(interfaceapp) << "Found matching url!" << url.host();
+                        return true;
+                    }
+                }
+            }
+
+            qCDebug(interfaceapp) << "No matching url" << url.host();
+            return defaultUrlValidator(url);
+        };
+        OffscreenQmlSurface::setUrlValidator(newValidator);
+    }
+
+    AddressBarDialog::registerType();
+    ErrorDialog::registerType();
+    LoginDialog::registerType();
+    Tooltip::registerType();
+    UpdateDialog::registerType();
+
+    QmlContextCallback platformInfoCallback = [](QQmlContext* context) {
+        context->setContextProperty("PlatformInfo", new PlatformInfoScriptingInterface());
+    };
+    OffscreenQmlSurface::addWhitelistContextHandler({
+        QUrl{ "hifi/tablet/TabletAddressDialog.qml" },
+        QUrl{ "hifi/Card.qml" },
+        QUrl{ "hifi/Pal.qml" },
+        QUrl{ "hifi/NameCard.qml" },
+        }, platformInfoCallback);
+
+    QmlContextCallback ttsCallback = [](QQmlContext* context) {
+        context->setContextProperty("TextToSpeech", DependencyManager::get<TTSScriptingInterface>().data());
+    };
+    OffscreenQmlSurface::addWhitelistContextHandler({
+        QUrl{ "hifi/tts/TTS.qml" }
+    }, ttsCallback);
+    qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem");
+    qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
+    qmlRegisterType<WebBrowserSuggestionsEngine>("HifiWeb", 1, 0, "WebBrowserSuggestionsEngine");
+
+    {
+        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+        tabletScriptingInterface->getTablet(SYSTEM_TABLET);
+    }
+
+    auto offscreenUi = getOffscreenUI();
+    connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated,
+        this, &Application::onDesktopRootContextCreated);
+    connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated,
+        this, &Application::onDesktopRootItemCreated);
+
+#if !defined(DISABLE_QML)
+    offscreenUi->setProxyWindow(_window->windowHandle());
+    // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
+    // support the window management and scripting proxies for VR use
+    DeadlockWatchdogThread::withPause([&] {
+        offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml"));
+    });
+    // FIXME either expose so that dialogs can set this themselves or
+    // do better detection in the offscreen UI of what has focus
+    offscreenUi->setNavigationFocused(false);
+#else
+    _window->setMenuBar(new Menu());
+#endif
+
+    setupPreferences();
+
+#if !defined(DISABLE_QML)
+    _glWidget->installEventFilter(offscreenUi.data());
+    offscreenUi->setMouseTranslator([=](const QPointF& pt) {
+        QPointF result = pt;
+        auto displayPlugin = getActiveDisplayPlugin();
+        if (displayPlugin->isHmd()) {
+            getApplicationCompositor().handleRealMouseMoveEvent(false);
+            auto resultVec = getApplicationCompositor().getReticlePosition();
+            result = QPointF(resultVec.x, resultVec.y);
+        }
+        return result.toPoint();
+    });
+
+    // BUGZ-1365 - the root context should explicitly default to being unable to load local HTML content
+    ContextAwareProfile::restrictContext(offscreenUi->getSurfaceContext(), true);
+    offscreenUi->resume();
+#endif
+    connect(_window, &MainWindow::windowGeometryChanged, [this](const QRect& r){
+        resizeGL();
+        if (_touchscreenVirtualPadDevice) {
+            _touchscreenVirtualPadDevice->resize();
+        }
+    });
+
+    // This will set up the input plugins UI
+    for(const auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
+        if (KeyboardMouseDevice::NAME == inputPlugin->getName()) {
+            _keyboardMouseDevice = std::dynamic_pointer_cast<KeyboardMouseDevice>(inputPlugin);
+        }
+        if (TouchscreenDevice::NAME == inputPlugin->getName()) {
+            _touchscreenDevice = std::dynamic_pointer_cast<TouchscreenDevice>(inputPlugin);
+        }
+        if (TouchscreenVirtualPadDevice::NAME == inputPlugin->getName()) {
+            _touchscreenVirtualPadDevice = std::dynamic_pointer_cast<TouchscreenVirtualPadDevice>(inputPlugin);
+#if defined(ANDROID_APP_INTERFACE)
+            auto& virtualPadManager = VirtualPad::Manager::instance();
+            connect(&virtualPadManager, &VirtualPad::Manager::hapticFeedbackRequested,
+                    this, [](int duration) {
+                        AndroidHelper::instance().performHapticFeedback(duration);
+                    });
+#endif
+        }
+    }
+
+    auto compositorHelper = DependencyManager::get<CompositorHelper>();
+    connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
+        if (isHMDMode()) {
+            auto compositorHelper = DependencyManager::get<CompositorHelper>(); // don't capture outer smartpointer
+            showCursor(compositorHelper->getAllowMouseCapture() ?
+                       Cursor::Manager::lookupIcon(_preferredCursor.get()) :
+                       Cursor::Icon::SYSTEM);
+        }
+    });
+
+#if !defined(DISABLE_QML)
+    // Pre-create a couple of offscreen surfaces to speed up tablet UI
+    auto offscreenSurfaceCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
+    offscreenSurfaceCache->setOnRootContextCreated([&](const QString& rootObject, QQmlContext* surfaceContext) {
+        if (rootObject == TabletScriptingInterface::QML) {
+            // in Qt 5.10.0 there is already an "Audio" object in the QML context
+            // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
+            surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
+            surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        }
+    });
+
+    offscreenSurfaceCache->reserve(TabletScriptingInterface::QML, 1);
+    offscreenSurfaceCache->reserve(render::entities::WebEntityRenderer::QML, 2);
+#endif
+
+    flushMenuUpdates();
+
+#if !defined(DISABLE_QML)
+    // Now that the menu is instantiated, ensure the display plugin menu is properly updated
+    {
+        DisplayPluginList displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+        // first sort the plugins into groupings: standard, advanced, developer
+        std::stable_sort(displayPlugins.begin(), displayPlugins.end(),
+            [](const DisplayPluginPointer& a, const DisplayPluginPointer& b) -> bool { return a->getGrouping() < b->getGrouping(); });
+        int dpIndex = 1;
+        // concatenate the groupings into a single list in the order: standard, advanced, developer
+        for(const auto& displayPlugin : displayPlugins) {
+            addDisplayPluginToMenu(displayPlugin, dpIndex, _displayPlugin == displayPlugin);
+            dpIndex++;
+        }
+
+        // after all plugins have been added to the menu, add a separator to the menu
+        auto parent = getPrimaryMenu()->getMenu(MenuOption::OutputMenu);
+        parent->addSeparator();
+    }
+#endif
+
+
+    // The display plugins are created before the menu now, so we need to do this here to hide the menu bar
+    // now that it exists
+    if (_window && _window->isFullScreen()) {
+        setFullscreen(nullptr, true);
+    }
+
+
+    setIsInterstitialMode(true);
+
+#if defined(DISABLE_QML) && defined(Q_OS_LINUX)
+    resumeAfterLoginDialogActionTaken();
+#endif
+}
+
+void Application::resizeGL() {
+    PROFILE_RANGE(render, __FUNCTION__);
+    if (nullptr == _displayPlugin) {
+        return;
+    }
+
+    auto displayPlugin = getActiveDisplayPlugin();
+    // Set the desired FBO texture size. If it hasn't changed, this does nothing.
+    // Otherwise, it must rebuild the FBOs
+    uvec2 framebufferSize = displayPlugin->getRecommendedRenderSize();
+    uvec2 renderSize = uvec2(framebufferSize);
+    if (_renderResolution != renderSize) {
+        _renderResolution = renderSize;
+        DependencyManager::get<FramebufferCache>()->setFrameBufferSize(fromGlm(renderSize));
+    }
+
+    // FIXME the aspect ratio for stereo displays is incorrect based on this.
+    float aspectRatio = displayPlugin->getRecommendedAspectRatio();
+    _myCamera.setProjection(glm::perspective(glm::radians(_fieldOfView.get()), aspectRatio,
+                                             DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP));
+    // Possible change in aspect ratio
+    {
+        QMutexLocker viewLocker(&_viewMutex);
+        _myCamera.loadViewFrustum(_viewFrustum);
+    }
+
+#if !defined(DISABLE_QML)
+    getOffscreenUI()->resize(fromGlm(displayPlugin->getRecommendedUiSize()));
+#endif
+}
+
+glm::uvec2 Application::getCanvasSize() const {
+    return glm::uvec2(_glWidget->width(), _glWidget->height());
+}
+
+float Application::getRenderResolutionScale() const {
+    return RenderScriptingInterface::getInstance()->getViewportResolutionScale();
+}
+
+void Application::updateRenderArgs(float deltaTime) {
+    _graphicsEngine->editRenderArgs([this, deltaTime](AppRenderArgs& appRenderArgs) {
+        PerformanceTimer perfTimer("editRenderArgs");
+        appRenderArgs._headPose = getHMDSensorPose();
+
+        auto myAvatar = getMyAvatar();
+
+        // update the avatar with a fresh HMD pose
+        {
+            PROFILE_RANGE(render, "/updateAvatar");
+            myAvatar->updateFromHMDSensorMatrix(appRenderArgs._headPose);
+        }
+
+        auto lodManager = DependencyManager::get<LODManager>();
+
+        float sensorToWorldScale = getMyAvatar()->getSensorToWorldScale();
+        appRenderArgs._sensorToWorldScale = sensorToWorldScale;
+        appRenderArgs._sensorToWorld = getMyAvatar()->getSensorToWorldMatrix();
+        {
+            PROFILE_RANGE(render, "/buildFrustrumAndArgs");
+            {
+                QMutexLocker viewLocker(&_viewMutex);
+                // adjust near clip plane to account for sensor scaling.
+                auto adjustedProjection = glm::perspective(glm::radians(_fieldOfView.get()),
+                    getActiveDisplayPlugin()->getRecommendedAspectRatio(),
+                    DEFAULT_NEAR_CLIP * sensorToWorldScale,
+                    DEFAULT_FAR_CLIP);
+                _viewFrustum.setProjection(adjustedProjection);
+                _viewFrustum.calculate();
+            }
+            appRenderArgs._renderArgs = RenderArgs(_graphicsEngine->getGPUContext(), lodManager->getVisibilityDistance(),
+                lodManager->getBoundaryLevelAdjust(), lodManager->getLODFarHalfAngleTan(), lodManager->getLODNearHalfAngleTan(),
+                lodManager->getLODFarDistance(), lodManager->getLODNearDistance(), RenderArgs::DEFAULT_RENDER_MODE,
+                RenderArgs::MONO, RenderArgs::DEFERRED, RenderArgs::RENDER_DEBUG_NONE);
+            appRenderArgs._renderArgs._scene = getMain3DScene();
+
+            {
+                QMutexLocker viewLocker(&_viewMutex);
+                appRenderArgs._renderArgs.setViewFrustum(_viewFrustum);
+            }
+        }
+        {
+            PROFILE_RANGE(render, "/resizeGL");
+            bool showWarnings = false;
+            bool suppressShortTimings = false;
+            auto menu = Menu::getInstance();
+            if (menu) {
+                suppressShortTimings = menu->isOptionChecked(MenuOption::SuppressShortTimings);
+                showWarnings = menu->isOptionChecked(MenuOption::PipelineWarnings);
+            }
+            PerformanceWarning::setSuppressShortTimings(suppressShortTimings);
+            PerformanceWarning warn(showWarnings, "Application::paintGL()");
+            resizeGL();
+        }
+
+        this->updateCamera(appRenderArgs._renderArgs, deltaTime);
+        appRenderArgs._eyeToWorld = _myCamera.getTransform();
+        appRenderArgs._isStereo = false;
+
+        {
+            auto hmdInterface = DependencyManager::get<HMDScriptingInterface>();
+            float ipdScale = hmdInterface->getIPDScale();
+
+            // scale IPD by sensorToWorldScale, to make the world seem larger or smaller accordingly.
+            ipdScale *= sensorToWorldScale;
+
+            auto baseProjection = appRenderArgs._renderArgs.getViewFrustum().getProjection();
+
+            if (getActiveDisplayPlugin()->isStereo()) {
+                // Stereo modes will typically have a larger projection matrix overall,
+                // so we ask for the 'mono' projection matrix, which for stereo and HMD
+                // plugins will imply the combined projection for both eyes.
+                //
+                // This is properly implemented for the Oculus plugins, but for OpenVR
+                // and Stereo displays I'm not sure how to get / calculate it, so we're
+                // just relying on the left FOV in each case and hoping that the
+                // overall culling margin of error doesn't cause popping in the
+                // right eye.  There are FIXMEs in the relevant plugins
+                _myCamera.setProjection(getActiveDisplayPlugin()->getCullingProjection(baseProjection));
+                appRenderArgs._isStereo = true;
+
+                auto& eyeOffsets = appRenderArgs._eyeOffsets;
+                auto& eyeProjections = appRenderArgs._eyeProjections;
+
+                // FIXME we probably don't need to set the projection matrix every frame,
+                // only when the display plugin changes (or in non-HMD modes when the user
+                // changes the FOV manually, which right now I don't think they can.
+                for_each_eye([&](Eye eye) {
+                    // For providing the stereo eye views, the HMD head pose has already been
+                    // applied to the avatar, so we need to get the difference between the head
+                    // pose applied to the avatar and the per eye pose, and use THAT as
+                    // the per-eye stereo matrix adjustment.
+                    mat4 eyeToHead = getActiveDisplayPlugin()->getEyeToHeadTransform(eye);
+                    // Grab the translation
+                    vec3 eyeOffset = glm::vec3(eyeToHead[3]);
+                    // Apply IPD scaling
+                    mat4 eyeOffsetTransform = glm::translate(mat4(), eyeOffset * -1.0f * ipdScale);
+                    eyeOffsets[eye] = eyeOffsetTransform;
+                    eyeProjections[eye] = getActiveDisplayPlugin()->getEyeProjection(eye, baseProjection);
+                });
+
+                // Configure the type of display / stereo
+                appRenderArgs._renderArgs._displayMode = (isHMDMode() ? RenderArgs::STEREO_HMD : RenderArgs::STEREO_MONITOR);
+            }
+        }
+
+        appRenderArgs._renderArgs._stencilMaskMode = getActiveDisplayPlugin()->getStencilMaskMode();
+        if (appRenderArgs._renderArgs._stencilMaskMode == StencilMaskMode::MESH) {
+            appRenderArgs._renderArgs._stencilMaskOperator = getActiveDisplayPlugin()->getStencilMaskMeshOperator();
+        }
+
+        {
+            QMutexLocker viewLocker(&_viewMutex);
+            _myCamera.loadViewFrustum(_displayViewFrustum);
+            appRenderArgs._view = glm::inverse(_displayViewFrustum.getView());
+        }
+
+        {
+            QMutexLocker viewLocker(&_viewMutex);
+            appRenderArgs._renderArgs.setViewFrustum(_displayViewFrustum);
+        }
+
+
+        // HACK
+        // load the view frustum
+        // FIXME: This preDisplayRender call is temporary until we create a separate render::scene for the mirror rendering.
+        // Then we can move this logic into the Avatar::simulate call.
+        myAvatar->preDisplaySide(&appRenderArgs._renderArgs);
+    });
+}
diff --git a/interface/src/Application_Plugins.cpp b/interface/src/Application_Plugins.cpp
new file mode 100644
index 00000000000..77786da4248
--- /dev/null
+++ b/interface/src/Application_Plugins.cpp
@@ -0,0 +1,418 @@
+//
+//  Application_Plugins.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <QtCore/QCommandLineParser>
+
+#include <input-plugins/InputPlugin.h>
+#include <display-plugins/DisplayPlugin.h>
+#include <display-plugins/hmd/HmdDisplayPlugin.h>
+#include <OffscreenUi.h>
+#include <plugins/PluginManager.h>
+#include <plugins/PluginUtils.h>
+#include <scripting/HMDScriptingInterface.h>
+#include <UserActivityLogger.h>
+
+#include "AudioClient.h"
+#include "InterfaceLogging.h"
+#include "Menu.h"
+
+static const int INTERVAL_TO_CHECK_HMD_WORN_STATUS = 500;  // milliseconds
+static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin";
+static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
+
+// Statically provided display and input plugins
+extern DisplayPluginList getDisplayPlugins();
+extern InputPluginList getInputPlugins();
+extern void saveInputPluginSettings(const InputPluginList& plugins);
+
+void Application::initializePluginManager(const QCommandLineParser& parser) {
+    DependencyManager::set<PluginManager>();
+    auto pluginManager = PluginManager::getInstance();
+
+    // To avoid any confusion: the getInputPlugins and getDisplayPlugins are not the ones
+    // from PluginManager, but functions exported by input-plugins/InputPlugin.cpp and
+    // display-plugins/DisplayPlugin.cpp.
+    //
+    // These functions provide the plugin manager with static default plugins.
+    pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
+    pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
+    pluginManager->setInputPluginSettingsPersister([](const InputPluginList& plugins) { saveInputPluginSettings(plugins); });
+
+    // This must be a member function -- PluginManager must exist, and for that
+    // QApplication must exist, or it can't find the plugin path, as QCoreApplication:applicationDirPath
+    // won't work yet.
+
+    if (parser.isSet("display")) {
+        auto preferredDisplays = parser.value("display").split(',', Qt::SkipEmptyParts);
+        qInfo() << "Setting prefered display plugins:" << preferredDisplays;
+        PluginManager::getInstance()->setPreferredDisplayPlugins(preferredDisplays);
+    }
+
+    if (parser.isSet("disableDisplayPlugins")) {
+        auto disabledDisplays = parser.value("disableDisplayPlugins").split(',', Qt::SkipEmptyParts);
+        qInfo() << "Disabling following display plugins:"  << disabledDisplays;
+        PluginManager::getInstance()->disableDisplays(disabledDisplays);
+    }
+
+    if (parser.isSet("disableInputPlugins")) {
+        auto disabledInputs = parser.value("disableInputPlugins").split(',', Qt::SkipEmptyParts);
+        qInfo() << "Disabling following input plugins:" << disabledInputs;
+        PluginManager::getInstance()->disableInputs(disabledInputs);
+    }
+}
+
+void Application::shutdownPlugins() {}
+
+void Application::initializeDisplayPlugins() {
+    const auto& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+    Setting::Handle<QString> activeDisplayPluginSetting { ACTIVE_DISPLAY_PLUGIN_SETTING_NAME, displayPlugins.at(0)->getName() };
+    auto lastActiveDisplayPluginName = activeDisplayPluginSetting.get();
+
+    auto defaultDisplayPlugin = displayPlugins.at(0);
+    // One time initialization code
+    DisplayPluginPointer targetDisplayPlugin;
+    for(const auto& displayPlugin : displayPlugins) {
+        displayPlugin->setContext(_graphicsEngine->getGPUContext());
+        if (displayPlugin->getName() == lastActiveDisplayPluginName) {
+            targetDisplayPlugin = displayPlugin;
+        }
+
+        if (!_autoSwitchDisplayModeSupportedHMDPlugin) {
+            if (displayPlugin->isHmd() && displayPlugin->getSupportsAutoSwitch()) {
+                _autoSwitchDisplayModeSupportedHMDPlugin = displayPlugin;
+                _autoSwitchDisplayModeSupportedHMDPluginName = _autoSwitchDisplayModeSupportedHMDPlugin->getName();
+                _previousHMDWornStatus = _autoSwitchDisplayModeSupportedHMDPlugin->isDisplayVisible() && _autoSwitchDisplayModeSupportedHMDPlugin->isActive();
+            }
+        }
+
+        QObject::connect(displayPlugin.get(), &DisplayPlugin::recommendedFramebufferSizeChanged,
+            [this](const QSize& size) { resizeGL(); });
+        QObject::connect(displayPlugin.get(), &DisplayPlugin::resetSensorsRequested, this, &Application::requestReset);
+
+        if (displayPlugin->isHmd()) {
+            auto hmdDisplayPlugin = dynamic_cast<HmdDisplayPlugin*>(displayPlugin.get());
+            QObject::connect(hmdDisplayPlugin, &HmdDisplayPlugin::hmdMountedChanged,
+                DependencyManager::get<HMDScriptingInterface>().data(), &HMDScriptingInterface::mountedChanged);
+            QObject::connect(hmdDisplayPlugin, &HmdDisplayPlugin::hmdVisibleChanged, this, &Application::hmdVisibleChanged);
+        }
+    }
+
+    // The default display plugin needs to be activated first, otherwise the display plugin thread
+    // may be launched by an external plugin, which is bad
+    setDisplayPlugin(defaultDisplayPlugin);
+
+    // Now set the desired plugin if it's not the same as the default plugin
+    if (targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
+        setDisplayPlugin(targetDisplayPlugin);
+    }
+
+    if (_autoSwitchDisplayModeSupportedHMDPlugin) {
+        if (getActiveDisplayPlugin() != _autoSwitchDisplayModeSupportedHMDPlugin && !_autoSwitchDisplayModeSupportedHMDPlugin->isSessionActive()) {
+            startHMDStandBySession();
+        }
+        // Poll periodically to check whether the user has worn HMD or not. Switch Display mode accordingly.
+        // If the user wears HMD then switch to VR mode. If the user removes HMD then switch to Desktop mode.
+        QTimer* autoSwitchDisplayModeTimer = new QTimer(this);
+        connect(autoSwitchDisplayModeTimer, SIGNAL(timeout()), this, SLOT(switchDisplayMode()));
+        autoSwitchDisplayModeTimer->start(INTERVAL_TO_CHECK_HMD_WORN_STATUS);
+    }
+
+    // Submit a default frame to render until the engine starts up
+    updateRenderArgs(0.0f);
+}
+
+DisplayPluginPointer Application::getActiveDisplayPlugin() const {
+    if (QThread::currentThread() != thread()) {
+        std::unique_lock<std::mutex> lock(_displayPluginLock);
+        return _displayPlugin;
+    }
+
+    if (!_aboutToQuit && !_displayPlugin) {
+        const_cast<Application*>(this)->updateDisplayMode();
+        Q_ASSERT(_displayPlugin);
+    }
+    return _displayPlugin;
+}
+
+void Application::setActiveDisplayPlugin(const QString& pluginName) {
+    DisplayPluginPointer newDisplayPlugin;
+    for (const DisplayPluginPointer& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
+        QString name = displayPlugin->getName();
+        if (pluginName == name) {
+            newDisplayPlugin = displayPlugin;
+            break;
+        }
+    }
+
+    if (newDisplayPlugin) {
+        setDisplayPlugin(newDisplayPlugin);
+    }
+}
+
+glm::uvec2 Application::getUiSize() const {
+    static const uint MIN_SIZE = 1;
+    glm::uvec2 result(MIN_SIZE);
+    if (_displayPlugin) {
+        result = getActiveDisplayPlugin()->getRecommendedUiSize();
+    }
+    return result;
+}
+
+QRect Application::getRecommendedHUDRect() const {
+    auto uiSize = getUiSize();
+    QRect result(0, 0, uiSize.x, uiSize.y);
+    if (_displayPlugin) {
+        result = getActiveDisplayPlugin()->getRecommendedHUDRect();
+    }
+    return result;
+}
+
+glm::vec2 Application::getDeviceSize() const {
+    static const int MIN_SIZE = 1;
+    glm::vec2 result(MIN_SIZE);
+    if (_displayPlugin) {
+        result = getActiveDisplayPlugin()->getRecommendedRenderSize();
+    }
+    return result;
+}
+
+bool Application::isThrottleRendering() const {
+    if (_displayPlugin) {
+        return getActiveDisplayPlugin()->isThrottled();
+    }
+    return false;
+}
+
+float Application::getTargetRenderFrameRate() const {
+    return getActiveDisplayPlugin()->getTargetFrameRate();
+}
+
+bool Application::hasRiftControllers() {
+    return PluginUtils::isOculusTouchControllerAvailable();
+}
+
+bool Application::hasViveControllers() {
+    return PluginUtils::isViveControllerAvailable();
+}
+
+bool Application::isHMDMode() const {
+    return getActiveDisplayPlugin()->isHmd();
+}
+
+mat4 Application::getHMDSensorPose() const {
+    if (isHMDMode()) {
+        return getActiveDisplayPlugin()->getHeadPose();
+    }
+    return mat4();
+}
+
+mat4 Application::getEyeOffset(int eye) const {
+    // FIXME invert?
+    return getActiveDisplayPlugin()->getEyeToHeadTransform((Eye)eye);
+}
+
+mat4 Application::getEyeProjection(int eye) const {
+    QMutexLocker viewLocker(&_viewMutex);
+    if (isHMDMode()) {
+        return getActiveDisplayPlugin()->getEyeProjection((Eye)eye, _viewFrustum.getProjection());
+    }
+    return _viewFrustum.getProjection();
+}
+
+// resentSensors() is a bit of vestigial feature. It used to be used for Oculus DK2 to recenter the view around
+// the current head orientation.  With the introduction of "room scale" tracking we no longer need that particular
+// feature.  However, we still use this to reset face trackers, eye trackers, audio and to optionally re-load the avatar
+// rig and animations from scratch.
+void Application::resetSensors(bool andReload) {
+    _overlayConductor.centerUI();
+    getActiveDisplayPlugin()->resetSensors();
+    getMyAvatar()->reset(true, andReload);
+    QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
+}
+
+void Application::updateDisplayMode() {
+    // Unsafe to call this method from anything but the main thread
+    if (QThread::currentThread() != thread()) {
+        qFatal("Attempted to switch display plugins from a non-main thread");
+    }
+
+    // Once time initialization code that depends on the UI being available
+    const auto& displayPlugins = getDisplayPlugins();
+
+    // Default to the first item on the list, in case none of the menu items match
+
+    DisplayPluginPointer newDisplayPlugin = displayPlugins.at(0);
+    auto menu = getPrimaryMenu();
+    if (menu) {
+        for (const auto& displayPlugin : PluginManager::getInstance()->getDisplayPlugins()) {
+            QString name = displayPlugin->getName();
+            QAction* action = menu->getActionForOption(name);
+            // Menu might have been removed if the display plugin lost
+            if (!action) {
+                continue;
+            }
+            if (action->isChecked()) {
+                newDisplayPlugin = displayPlugin;
+                break;
+            }
+        }
+    }
+
+    if (newDisplayPlugin == _displayPlugin) {
+        return;
+    }
+
+    setDisplayPlugin(newDisplayPlugin);
+}
+
+void Application::switchDisplayMode() {
+    if (!_autoSwitchDisplayModeSupportedHMDPlugin) {
+        return;
+    }
+
+    bool currentHMDWornStatus = _autoSwitchDisplayModeSupportedHMDPlugin->isDisplayVisible();
+    if (currentHMDWornStatus != _previousHMDWornStatus) {
+        // Switch to respective mode as soon as currentHMDWornStatus changes
+        if (currentHMDWornStatus) {
+            qCDebug(interfaceapp) << "Switching from Desktop to HMD mode";
+            endHMDSession();
+            setActiveDisplayPlugin(_autoSwitchDisplayModeSupportedHMDPluginName);
+        } else {
+            qCDebug(interfaceapp) << "Switching from HMD to desktop mode";
+            setActiveDisplayPlugin(DESKTOP_DISPLAY_PLUGIN_NAME);
+            startHMDStandBySession();
+        }
+    }
+    _previousHMDWornStatus = currentHMDWornStatus;
+}
+
+void Application::setDisplayPlugin(DisplayPluginPointer newDisplayPlugin) {
+    if (newDisplayPlugin == _displayPlugin) {
+        return;
+    }
+
+    // FIXME don't have the application directly set the state of the UI,
+    // instead emit a signal that the display plugin is changing and let
+    // the desktop lock itself.  Reduces coupling between the UI and display
+    // plugins
+    auto offscreenUi = getOffscreenUI();
+    auto desktop = offscreenUi ? offscreenUi->getDesktop() : nullptr;
+    auto menu = Menu::getInstance();
+
+    // Make the switch atomic from the perspective of other threads
+    {
+        std::unique_lock<std::mutex> lock(_displayPluginLock);
+        bool wasRepositionLocked = false;
+        if (desktop) {
+            // Tell the desktop to no reposition (which requires plugin info), until we have set the new plugin, below.
+            wasRepositionLocked = desktop->property("repositionLocked").toBool();
+            desktop->setProperty("repositionLocked", true);
+        }
+
+        if (_displayPlugin) {
+            disconnect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent);
+            _displayPlugin->deactivate();
+        }
+
+        auto oldDisplayPlugin = _displayPlugin;
+        bool active = newDisplayPlugin->activate();
+
+        if (!active) {
+            const DisplayPluginList& displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
+
+            // If the new plugin fails to activate, fallback to last display
+            qWarning() << "Failed to activate display: " << newDisplayPlugin->getName();
+            newDisplayPlugin = oldDisplayPlugin;
+
+            if (newDisplayPlugin) {
+                qWarning() << "Falling back to last display: " << newDisplayPlugin->getName();
+                active = newDisplayPlugin->activate();
+            }
+
+            // If there is no last display, or
+            // If the last display fails to activate, fallback to desktop
+            if (!active) {
+                newDisplayPlugin = displayPlugins.at(0);
+                qWarning() << "Falling back to display: " << newDisplayPlugin->getName();
+                active = newDisplayPlugin->activate();
+            }
+
+            if (!active) {
+                qFatal("Failed to activate fallback plugin");
+            }
+        }
+
+        if (offscreenUi) {
+            offscreenUi->resize(fromGlm(newDisplayPlugin->getRecommendedUiSize()));
+        }
+        getApplicationCompositor().setDisplayPlugin(newDisplayPlugin);
+        _displayPlugin = newDisplayPlugin;
+        connect(_displayPlugin.get(), &DisplayPlugin::presented, this, &Application::onPresent, Qt::DirectConnection);
+        if (desktop) {
+            desktop->setProperty("repositionLocked", wasRepositionLocked);
+        }
+
+        RefreshRateManager& refreshRateManager = getRefreshRateManager();
+        refreshRateManager.setRefreshRateOperator(OpenGLDisplayPlugin::getRefreshRateOperator());
+        bool isHmd = newDisplayPlugin->isHmd();
+        RefreshRateManager::UXMode uxMode = isHmd ? RefreshRateManager::UXMode::VR :
+            RefreshRateManager::UXMode::DESKTOP;
+
+        refreshRateManager.setUXMode(uxMode);
+    }
+
+    bool isHmd = _displayPlugin->isHmd();
+    qCDebug(interfaceapp) << "Entering into" << (isHmd ? "HMD" : "Desktop") << "Mode";
+
+    // Only log/emit after a successful change
+    UserActivityLogger::getInstance().logAction("changed_display_mode", {
+        { "previous_display_mode", _displayPlugin ? _displayPlugin->getName() : "" },
+        { "display_mode", newDisplayPlugin ? newDisplayPlugin->getName() : "" },
+        { "hmd", isHmd }
+    });
+    emit activeDisplayPluginChanged();
+
+    // reset the avatar, to set head and hand palms back to a reasonable default pose.
+    getMyAvatar()->reset(false);
+
+    // switch to first person if entering hmd and setting is checked
+    if (menu) {
+        QAction* action = menu->getActionForOption(newDisplayPlugin->getName());
+        if (action) {
+            action->setChecked(true);
+        }
+
+        if (isHmd && menu->isOptionChecked(MenuOption::FirstPersonHMD)) {
+            menu->setIsOptionChecked(MenuOption::FirstPersonLookAt, true);
+            cameraMenuChanged();
+        }
+
+        // Remove the selfie camera options from menu if in HMD mode
+        auto selfieAction = menu->getActionForOption(MenuOption::SelfieCamera);
+        selfieAction->setVisible(!isHmd);
+    }
+
+    Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
+}
+
+void Application::startHMDStandBySession() {
+    _autoSwitchDisplayModeSupportedHMDPlugin->startStandBySession();
+}
+
+void Application::endHMDSession() {
+    _autoSwitchDisplayModeSupportedHMDPlugin->endSession();
+}
diff --git a/interface/src/Application_Setup.cpp b/interface/src/Application_Setup.cpp
new file mode 100644
index 00000000000..7b87fe5df84
--- /dev/null
+++ b/interface/src/Application_Setup.cpp
@@ -0,0 +1,2153 @@
+//
+//  Application_Setup.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <functional>
+
+#include <QDesktopServices>
+#include <QFontDatabase>
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QResource>
+#include <QtQml/QQmlContext>
+#include <QtQuick/QQuickWindow>
+
+#include <AccountManager.h>
+#include <AddressManager.h>
+#include <AnimationCacheScriptingInterface.h>
+#include <AvatarBookmarks.h>
+#include <avatar/AvatarPackager.h>
+#include <avatar/GrabManager.h>
+#include <audio/AudioScope.h>
+#include <AudioScriptingInterface.h>
+#include <AutoUpdater.h>
+#include <avatar/AvatarManager.h>
+#include <BuildInfo.h>
+#include <crash-handler/CrashHandler.h>
+#include <DebugDraw.h>
+#include <DeferredLightingEffect.h>
+#include <DesktopPreviewProvider.h>
+#include <display-plugins/CompositorHelper.h>
+#include <display-plugins/DisplayPlugin.h>
+#include <DomainAccountManager.h>
+#include <EntityScriptClient.h>
+#include <EntityScriptServerLogClient.h>
+#include <FadeEffect.h>
+#include <FingerprintUtils.h>
+#include <FramebufferCache.h>
+#include <gl/GLHelpers.h>
+#include <GPUIdent.h>
+#include <graphics-scripting/GraphicsScriptingInterface.h>
+#include <hfm/ModelFormatRegistry.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+#include <input-plugins/TouchscreenDevice.h>
+#include <input-plugins/TouchscreenVirtualPadDevice.h>
+#include <networking/CloseEventSender.h>
+#include <MainWindow.h>
+#include <material-networking/TextureCacheScriptingInterface.h>
+#include <MessagesClient.h>
+#include <Midi.h>
+#include <model-networking/ModelCacheScriptingInterface.h>
+#include <OffscreenUi.h>
+#include <PickManager.h>
+#include <plugins/InputConfiguration.h>
+#include <plugins/OculusPlatformPlugin.h>
+#include <plugins/PluginManager.h>
+#include <plugins/SteamClientPlugin.h>
+#include <PointerManager.h>
+#include <Preferences.h>
+#include <procedural/MaterialCacheScriptingInterface.h>
+#include <procedural/ReferenceMaterial.h>
+#include <raypick/MouseTransformNode.h>
+#include <raypick/PickScriptingInterface.h>
+#include <raypick/PointerScriptingInterface.h>
+#include <raypick/RayPick.h>
+#include <raypick/RayPickScriptingInterface.h>
+#include <recording/ClipCache.h>
+#include <recording/Deck.h>
+#include <recording/Frame.h>
+#include <recording/Recorder.h>
+#include <recording/RecordingScriptingInterface.h>
+#include <RenderableEntityItem.h>
+#include <RenderableTextEntityItem.h>
+#include <RenderableWebEntityItem.h>
+#include <ResourceScriptingInterface.h>
+#include <SceneScriptingInterface.h>
+#include <ScriptEngines.h>
+#include <scripting/Audio.h>
+#include <scripting/AssetMappingsScriptingInterface.h>
+#include <scripting/ControllerScriptingInterface.h>
+#include <scripting/DesktopScriptingInterface.h>
+#include <scripting/GooglePolyScriptingInterface.h>
+#include <scripting/HMDScriptingInterface.h>
+#include <scripting/KeyboardScriptingInterface.h>
+#include <scripting/ScreenshareScriptingInterface.h>
+#include <scripting/SelectionScriptingInterface.h>
+#include <scripting/TestScriptingInterface.h>
+#include <scripting/TTSScriptingInterface.h>
+#include <scripting/WindowScriptingInterface.h>
+#include <ShapeEntityItem.h>
+#ifndef Q_OS_ANDROID
+#include <shared/FileLogger.h>
+#endif
+#include <shared/GlobalAppProperties.h>
+#include <shared/PlatformHelper.h>
+#include <SoundCacheScriptingInterface.h>
+#include <StatTracker.h>
+#include <StencilMaskPass.h>
+#include <ThreadHelpers.h>
+#include <ui/DialogsManager.h>
+#include <ui/DomainConnectionModel.h>
+#include <ui/Keyboard.h>
+#include <ui/LoginDialog.h>
+#include <ui/OctreeStatsProvider.h>
+#include <ui/OffscreenQmlSurfaceCache.h>
+#include <ui/Snapshot.h>
+#include <ui/StandAloneJSConsole.h>
+#include <ui/TabletScriptingInterface.h>
+#include <ui/ToolbarScriptingInterface.h>
+#include <UserActivityLogger.h>
+#include <UserActivityLoggerScriptingInterface.h>
+#include <UsersScriptingInterface.h>
+#include <VirtualPadManager.h>
+
+#include "ApplicationEventHandler.h"
+#include "ApplicationMeshProvider.h"
+#include "AudioClient.h"
+#include "CrashRecoveryHandler.h"
+#include "DeadlockWatchdog.h"
+#include "DiscordRichPresence.h"
+#include "DiscoverabilityManager.h"
+#include "FileDialogHelper.h"
+#include "GLCanvas.h"
+#include "InterfaceDynamicFactory.h"
+#include "InterfaceLogging.h"
+#include "InterfaceParentFinder.h"
+#include "LocationBookmarks.h"
+#include "LODManager.h"
+#include "Menu.h"
+#include "ResourceRequestObserver.h"
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+#include "SpeechRecognizer.h"
+#endif
+#include "Util.h"
+
+#if defined(Q_OS_WIN)
+#include <VersionHelpers.h>
+#endif
+
+#if defined(Q_OS_ANDROID)
+#include "AndroidHelper.h"
+#endif
+
+using namespace std;
+
+/*@jsdoc
+ * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property
+ * values are integer IDs, uniquely identifying each output. <em>Read-only.</em></p>
+ * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject}
+ * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or
+ * <code>0.0</code> for "false".</p>
+ * <table>
+ *   <thead>
+ *     <tr><th>Property</th><th>Type</th><th>Data</th><th>Description</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td><code>CameraFirstPerson</code></td><td>number</td><td>number</td><td>The camera is in first-person mode.
+ *       <em>Legacy first person camera mode.</em></td></tr>
+ *     <tr><td><code>CameraFirstPersonLookAt</code></td><td>number</td><td>number</td><td>The camera is in first-person mode.
+ *       <em>Default first person camera mode.</em></td></tr>
+ *     <tr><td><code>CameraThirdPerson</code></td><td>number</td><td>number</td><td>The camera is in third-person mode.
+ *       <em>Legacy third person camera mode.</em></td></tr>
+ *     <tr><td><code>CameraLookAt</code></td><td>number</td><td>number</td><td>The camera is in third-person mode.
+ *       <em>Default third person camera mode.</em></td></tr>
+ *     <tr><td><code>CameraFSM</code></td><td>number</td><td>number</td><td>The camera is in full screen mirror mode.
+ *       <em>Legacy "look at myself" behavior.</em></td></tr>
+ *     <tr><td><code>CameraSelfie</code></td><td>number</td><td>number</td><td>The camera is in selfie mode.
+ *       <em>Default "look at myself" camera mode.</em></td></tr>
+ *     <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr>
+ *     <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr>
+ *     <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr>
+ *     <tr><td><code>CaptureMouse</code></td><td>number</td><td>number</td><td>The mouse is captured.  In this mode,
+ *       the mouse is invisible and cannot leave the bounds of Interface, as long as Interface is the active window and
+ *       no menu item is selected.</td></tr>
+ *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are
+ *       enabled.</td></tr>
+ *     <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr>
+ *     <tr><td><code>LeftHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to left.</td></tr>
+ *     <tr><td><code>RightHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to right.</td></tr>
+ *     <tr><td><code>SnapTurn</code></td><td>number</td><td>number</td><td>Snap turn is enabled.</td></tr>
+ *     <tr><td><code>Grounded</code></td><td>number</td><td>number</td><td>The user's avatar is on the ground.</td></tr>
+ *     <tr><td><code>NavigationFocused</code></td><td>number</td><td>number</td><td><em>Not used.</em></td></tr>
+ *     <tr><td><code>PlatformWindows</code></td><td>number</td><td>number</td><td>The operating system is Windows.</td></tr>
+ *     <tr><td><code>PlatformMac</code></td><td>number</td><td>number</td><td>The operating system is Mac.</td></tr>
+ *     <tr><td><code>PlatformAndroid</code></td><td>number</td><td>number</td><td>The operating system is Android.</td></tr>
+ *   </tbody>
+ * </table>
+ * @typedef {object} Controller.Hardware-Application
+ */
+
+static const QString STATE_IN_HMD = "InHMD";
+static const QString STATE_CAMERA_FULL_SCREEN_MIRROR = "CameraFSM";
+static const QString STATE_CAMERA_FIRST_PERSON = "CameraFirstPerson";
+static const QString STATE_CAMERA_FIRST_PERSON_LOOK_AT = "CameraFirstPersonLookat";
+static const QString STATE_CAMERA_THIRD_PERSON = "CameraThirdPerson";
+static const QString STATE_CAMERA_ENTITY = "CameraEntity";
+static const QString STATE_CAMERA_INDEPENDENT = "CameraIndependent";
+static const QString STATE_CAMERA_LOOK_AT = "CameraLookAt";
+static const QString STATE_CAMERA_SELFIE = "CameraSelfie";
+static const QString STATE_SNAP_TURN = "SnapTurn";
+static const QString STATE_ADVANCED_MOVEMENT_CONTROLS = "AdvancedMovement";
+static const QString STATE_GROUNDED = "Grounded";
+static const QString STATE_NAV_FOCUSED = "NavigationFocused";
+static const QString STATE_PLATFORM_WINDOWS = "PlatformWindows";
+static const QString STATE_PLATFORM_MAC = "PlatformMac";
+static const QString STATE_PLATFORM_ANDROID = "PlatformAndroid";
+static const QString STATE_LEFT_HAND_DOMINANT = "LeftHandDominant";
+static const QString STATE_RIGHT_HAND_DOMINANT = "RightHandDominant";
+static const QString STATE_STRAFE_ENABLED = "StrafeEnabled";
+static const QString STATE_CAPTURE_MOUSE = "CaptureMouse";
+
+static const QUrl AVATAR_INPUTS_BAR_QML = PathUtils::qmlUrl("AvatarInputsBar.qml");
+static const QUrl BUBBLE_ICON_QML = PathUtils::qmlUrl("BubbleIcon.qml");
+
+static const int ENTITY_SERVER_ADDED_TIMEOUT = 5000;
+
+// For processing on QThreadPool, we target a number of threads after reserving some
+// based on how many are being consumed by the application and the display plugin.  However,
+// we will never drop below the 'min' value
+static const int MIN_PROCESSING_THREAD_POOL_SIZE = 2;
+
+#if !defined(Q_OS_ANDROID)
+static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 16;
+#else
+static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 4;
+#endif
+
+#if defined(Q_OS_ANDROID)
+static bool DISABLE_WATCHDOG = true;
+#else
+static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
+static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
+#endif
+static const int WATCHDOG_TIMER_TIMEOUT = 100;
+
+#if defined(Q_OS_ANDROID)
+static const QString TESTER_FILE = "/sdcard/_hifi_test_device.txt";
+#endif
+
+bool setupEssentials(const QCommandLineParser& parser, bool runningMarkerExisted) {
+    const int listenPort = parser.isSet("listenPort") ? parser.value("listenPort").toInt() : INVALID_PORT;
+
+    bool suppressPrompt = parser.isSet("suppress-settings-reset");
+
+    // set the OCULUS_STORE property so the oculus plugin can know if we ran from the Oculus Store
+    qApp->setProperty(hifi::properties::OCULUS_STORE, parser.isSet("oculus-store"));
+
+    // emulate standalone device
+    qApp->setProperty(hifi::properties::STANDALONE, parser.isSet("standalone"));
+
+    // Ignore any previous crashes if running from command line with a test script.
+    bool inTestMode = parser.isSet("testScript");
+
+    bool previousSessionCrashed { false };
+    if (!inTestMode) {
+        // TODO: FIX
+        previousSessionCrashed = CrashRecoveryHandler::checkForResetSettings(runningMarkerExisted, suppressPrompt);
+    }
+
+    // get dir to use for cache
+    if (parser.isSet("cache")) {
+        qApp->setProperty(hifi::properties::APP_LOCAL_DATA_PATH, parser.value("cache"));
+    }
+
+    {
+        const QString resourcesBinaryFile = PathUtils::getRccPath();
+        qCInfo(interfaceapp) << "Loading primary resources from" << resourcesBinaryFile;
+
+        if (!QFile::exists(resourcesBinaryFile)) {
+            throw std::runtime_error(QString("Unable to find primary resources from '%1'").arg(resourcesBinaryFile).toStdString());
+        }
+        if (!QResource::registerResource(resourcesBinaryFile)) {
+            throw std::runtime_error(QString("Unable to load primary resources from '%1'").arg(resourcesBinaryFile).toStdString());
+        }
+    }
+
+    DependencyManager::set<ScriptInitializers>();
+
+    // Tell the plugin manager about our statically linked plugins
+    auto pluginManager = PluginManager::getInstance();
+    if (auto steamClient = pluginManager->getSteamClientPlugin()) {
+        steamClient->init();
+    }
+    if (auto oculusPlatform = pluginManager->getOculusPlatformPlugin()) {
+        oculusPlatform->init();
+    }
+
+    PROFILE_SET_THREAD_NAME("Main Thread");
+
+#if defined(Q_OS_WIN)
+    // Select appropriate audio DLL
+    QString audioDLLPath = QCoreApplication::applicationDirPath();
+    if (IsWindows8OrGreater()) {
+        audioDLLPath += "/audioWin8";
+    } else {
+        audioDLLPath += "/audioWin7";
+    }
+    QCoreApplication::addLibraryPath(audioDLLPath);
+#endif
+
+    QString defaultScriptsOverrideOption = parser.value("defaultScriptsOverride");
+
+    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
+    DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>();
+    DependencyManager::registerInheritance<EntityDynamicFactoryInterface, InterfaceDynamicFactory>();
+    DependencyManager::registerInheritance<SpatialParentFinder, InterfaceParentFinder>();
+
+    // Set dependencies
+    DependencyManager::set<PickManager>();
+    DependencyManager::set<PointerManager>();
+    DependencyManager::set<RayPickScriptingInterface>();
+    DependencyManager::set<PointerScriptingInterface>();
+    DependencyManager::set<PickScriptingInterface>();
+    DependencyManager::set<Cursor::Manager>();
+    DependencyManager::set<VirtualPad::Manager>();
+    DependencyManager::set<DesktopPreviewProvider>();
+#if defined(Q_OS_ANDROID)
+    DependencyManager::set<AccountManager>(true); // use the default user agent getter
+#else
+    DependencyManager::set<AccountManager>(true, std::bind(&Application::getUserAgent, qApp));
+#endif
+    DependencyManager::set<DomainAccountManager>();
+    DependencyManager::set<StatTracker>();
+    DependencyManager::set<ScriptEngines>(ScriptManager::CLIENT_SCRIPT, defaultScriptsOverrideOption);
+    DependencyManager::set<Preferences>();
+    DependencyManager::set<recording::Deck>();
+    DependencyManager::set<recording::Recorder>();
+    DependencyManager::set<AddressManager>();
+    DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
+    DependencyManager::set<recording::ClipCache>();
+    DependencyManager::set<GeometryCache>();
+    DependencyManager::set<ModelFormatRegistry>(); // ModelFormatRegistry must be defined before ModelCache. See the ModelCache constructor.
+    DependencyManager::set<ModelCache>();
+    DependencyManager::set<ModelCacheScriptingInterface>();
+    DependencyManager::set<ScriptCache>();
+    DependencyManager::set<SoundCache>();
+    DependencyManager::set<SoundCacheScriptingInterface>();
+    DependencyManager::set<AudioClient>();
+    DependencyManager::set<AudioScope>();
+    DependencyManager::set<DeferredLightingEffect>();
+    DependencyManager::set<TextureCache>();
+    DependencyManager::set<MaterialCache>();
+    DependencyManager::set<TextureCacheScriptingInterface>();
+    DependencyManager::set<MaterialCacheScriptingInterface>();
+    DependencyManager::set<FramebufferCache>();
+    DependencyManager::set<AnimationCache>();
+    DependencyManager::set<AnimationCacheScriptingInterface>();
+    DependencyManager::set<ModelBlender>();
+    DependencyManager::set<UsersScriptingInterface>();
+    DependencyManager::set<AvatarManager>();
+    DependencyManager::set<LODManager>();
+    DependencyManager::set<StandAloneJSConsole>();
+    DependencyManager::set<DialogsManager>();
+    DependencyManager::set<ResourceCacheSharedItems>();
+    DependencyManager::set<DesktopScriptingInterface>();
+    DependencyManager::set<EntityScriptingInterface>(true);
+    DependencyManager::set<GraphicsScriptingInterface>();
+    DependencyManager::registerInheritance<scriptable::ModelProviderFactory, ApplicationMeshProvider>();
+    DependencyManager::set<ApplicationMeshProvider>();
+    DependencyManager::set<RecordingScriptingInterface>();
+    DependencyManager::set<WindowScriptingInterface>();
+    DependencyManager::set<HMDScriptingInterface>();
+    DependencyManager::set<ResourceScriptingInterface>();
+    DependencyManager::set<TabletScriptingInterface>();
+    DependencyManager::set<InputConfiguration>();
+    DependencyManager::set<ToolbarScriptingInterface>();
+    DependencyManager::set<UserActivityLoggerScriptingInterface>();
+    DependencyManager::set<AssetMappingsScriptingInterface>();
+    DependencyManager::set<DomainConnectionModel>();
+
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+    DependencyManager::set<SpeechRecognizer>();
+#endif
+    DependencyManager::set<DiscoverabilityManager>();
+    DependencyManager::set<SceneScriptingInterface>();
+#if !defined(DISABLE_QML)
+    DependencyManager::set<OffscreenUi>();
+    {
+        auto window = DependencyManager::get<OffscreenUi>()->getWindow();
+        auto desktopScriptingInterface = DependencyManager::get<DesktopScriptingInterface>();
+        QObject::connect(window, &QQuickWindow::focusObjectChanged, [desktopScriptingInterface](QObject *object) {
+            if (object) {
+                if (object->objectName() == QString("desktop")) {
+                    emit desktopScriptingInterface->uiFocusChanged(false);
+                    return;
+                }
+                // Signal with empty object name happens in addition to regular named ones and is not necessary here
+                if (!object->objectName().isEmpty()) {
+                    emit desktopScriptingInterface->uiFocusChanged(true);
+                }
+            }
+        });
+    }
+#endif
+    DependencyManager::set<Midi>();
+    DependencyManager::set<PathUtils>();
+    DependencyManager::set<InterfaceDynamicFactory>();
+    DependencyManager::set<AudioInjectorManager>();
+    DependencyManager::set<MessagesClient>();
+    controller::StateController::setStateVariables({ { STATE_IN_HMD, STATE_CAMERA_FULL_SCREEN_MIRROR,
+                    STATE_CAMERA_FIRST_PERSON, STATE_CAMERA_FIRST_PERSON_LOOK_AT, STATE_CAMERA_THIRD_PERSON,
+                    STATE_CAMERA_ENTITY, STATE_CAMERA_INDEPENDENT, STATE_CAMERA_LOOK_AT, STATE_CAMERA_SELFIE, STATE_CAPTURE_MOUSE,
+                    STATE_SNAP_TURN, STATE_ADVANCED_MOVEMENT_CONTROLS, STATE_GROUNDED, STATE_NAV_FOCUSED,
+                    STATE_PLATFORM_WINDOWS, STATE_PLATFORM_MAC, STATE_PLATFORM_ANDROID, STATE_LEFT_HAND_DOMINANT, STATE_RIGHT_HAND_DOMINANT, STATE_STRAFE_ENABLED } });
+    DependencyManager::set<UserInputMapper>();
+    DependencyManager::set<controller::ScriptingInterface, ControllerScriptingInterface>();
+    DependencyManager::set<InterfaceParentFinder>();
+    DependencyManager::set<EntityTreeRenderer>(true, qApp, qApp);
+    DependencyManager::set<CompositorHelper>();
+    DependencyManager::set<OffscreenQmlSurfaceCache>();
+    DependencyManager::set<EntityScriptClient>();
+
+    DependencyManager::set<EntityScriptServerLogClient>();
+
+    DependencyManager::set<GooglePolyScriptingInterface>();
+    DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
+    DependencyManager::set<AvatarBookmarks>();
+    DependencyManager::set<LocationBookmarks>();
+    DependencyManager::set<Snapshot>();
+    DependencyManager::set<CloseEventSender>();
+    DependencyManager::set<ResourceManager>();
+    DependencyManager::set<SelectionScriptingInterface>();
+    DependencyManager::set<TTSScriptingInterface>();
+
+    DependencyManager::set<FadeEffect>();
+    DependencyManager::set<ResourceRequestObserver>();
+    DependencyManager::set<Keyboard>();
+    DependencyManager::set<KeyboardScriptingInterface>();
+    DependencyManager::set<GrabManager>();
+    DependencyManager::set<AvatarPackager>();
+    DependencyManager::set<ScreenshareScriptingInterface>();
+    PlatformHelper::setup();
+
+    QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
+        QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "noteAwakening", Qt::QueuedConnection);
+    });
+
+    QString setBookmarkValue = parser.value("setBookmark");
+    if (!setBookmarkValue.isEmpty()) {
+        // Bookmarks are expected to be in a name=url form.
+        // An `=` character in the name or url is unsupported.
+        auto parts = setBookmarkValue.split("=");
+        if (parts.length() != 2) {
+            qWarning() << "Malformed setBookmark argument: " << setBookmarkValue;
+        } else {
+            qDebug() << "Setting bookmark" << parts[0] << "to" << parts[1];
+            DependencyManager::get<LocationBookmarks>()->insert(parts[0], parts[1]);
+        }
+    }
+
+    return previousSessionCrashed;
+}
+
+void Application::initialize(const QCommandLineParser &parser) {
+    //qCDebug(interfaceapp) << "Setting up essentials";
+    setupEssentials(parser, _previousSessionCrashed);
+    qCDebug(interfaceapp) << "Initializing application";
+
+    _entitySimulation = std::make_shared<PhysicalEntitySimulation>();
+    _physicsEngine = std::make_shared<PhysicsEngine>(Vectors::ZERO);
+    _entityClipboard = std::make_shared<EntityTree>();
+    _octreeProcessor = std::make_shared<OctreePacketProcessor>();
+    _entityEditSender = std::make_shared<EntityEditPacketSender>();
+    _graphicsEngine = std::make_shared<GraphicsEngine>();
+    _applicationOverlay = std::make_shared<ApplicationOverlay>();
+
+    auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
+    setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
+
+    constexpr auto INSTALLER_INI_NAME = "installer.ini";
+    auto iniPath = QDir(applicationDirPath()).filePath(INSTALLER_INI_NAME);
+    QFile installerFile { iniPath };
+    std::unordered_map<QString, QString> installerKeyValues;
+    if (installerFile.open(QIODevice::ReadOnly)) {
+        while (!installerFile.atEnd()) {
+            auto line = installerFile.readLine();
+            if (!line.isEmpty()) {
+                auto index = line.indexOf("=");
+                if (index >= 0) {
+                    installerKeyValues[line.mid(0, index).trimmed()] = line.mid(index + 1).trimmed();
+                }
+            }
+        }
+    }
+
+    // In practice we shouldn't run across installs that don't have a known installer type.
+    // Client or Client+Server installs should always have the installer.ini next to their
+    // respective interface.exe, and Steam installs will be detected as such. If a user were
+    // to delete the installer.ini, though, and as an example, we won't know the context of the
+    // original install.
+    constexpr auto INSTALLER_KEY_TYPE = "type";
+    constexpr auto INSTALLER_KEY_CAMPAIGN = "campaign";
+    constexpr auto INSTALLER_TYPE_UNKNOWN = "unknown";
+    constexpr auto INSTALLER_TYPE_STEAM = "steam";
+
+    auto typeIt = installerKeyValues.find(INSTALLER_KEY_TYPE);
+    QString installerType = INSTALLER_TYPE_UNKNOWN;
+    if (typeIt == installerKeyValues.end()) {
+        if (property(hifi::properties::STEAM).toBool()) {
+            installerType = INSTALLER_TYPE_STEAM;
+        }
+    } else {
+        installerType = typeIt->second;
+    }
+
+    auto campaignIt = installerKeyValues.find(INSTALLER_KEY_CAMPAIGN);
+    QString installerCampaign = campaignIt != installerKeyValues.end() ? campaignIt->second : "";
+
+    qDebug() << "Detected installer type:" << installerType;
+    qDebug() << "Detected installer campaign:" << installerCampaign;
+
+    static int SEND_STATS_INTERVAL_MS;
+    {
+        if (parser.isSet("testScript")) {
+            QString testScriptPath = parser.value("testScript");
+            // If the URL scheme is http(s) or ftp, then use as is, else - treat it as a local file
+            // This is done so as not break previous command line scripts
+            if (testScriptPath.left(HIFI_URL_SCHEME_HTTP.length()) == HIFI_URL_SCHEME_HTTP ||
+                testScriptPath.left(HIFI_URL_SCHEME_FTP.length()) == HIFI_URL_SCHEME_FTP) {
+
+                setProperty(hifi::properties::TEST, QUrl::fromUserInput(testScriptPath));
+            } else if (QFileInfo(testScriptPath).exists()) {
+                setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath));
+            }
+
+            if (parser.isSet("quitWhenFinished")) {
+                _quitWhenFinished = true;
+            }
+        }
+
+        if (parser.isSet("testResultsLocation")) {
+            // Set test snapshot location only if it is a writeable directory
+            QString path = parser.value("testResultsLocation");
+
+            QFileInfo fileInfo(path);
+            if (fileInfo.isDir() && fileInfo.isWritable()) {
+                TestScriptingInterface::getInstance()->setTestResultsLocation(path);
+            }
+        }
+        _urlParam = parser.value("url");
+
+        if (parser.isSet("disableWatchdog")) {
+            DISABLE_WATCHDOG = true;
+        }
+
+        if (parser.isSet("system-cursor")) {
+            _preferredCursor.set(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
+            _useSystemCursor = true;
+        }
+
+        if (parser.isSet("concurrent-downloads")) {
+            bool success;
+            uint32_t concurrentDownloads = parser.value("concurrent-downloads").toUInt(&success);
+            if (!success) {
+                concurrentDownloads = MAX_CONCURRENT_RESOURCE_DOWNLOADS;
+            }
+            ResourceCache::setRequestLimit(concurrentDownloads);
+        }
+
+        // perhaps override the avatar url.  Since we will test later for validity
+        // we don't need to do so here.
+        if (parser.isSet("avatarURL")) {
+            _avatarOverrideUrl = QUrl::fromUserInput(parser.value("avatarURL"));
+        }
+
+        // If someone specifies both --avatarURL and --replaceAvatarURL,
+        // the replaceAvatarURL wins.  So only set the _overrideUrl if this
+        // does have a non-empty string.
+        if (parser.isSet("replaceAvatarURL")) {
+            QString replaceURL = parser.value("replaceAvatarURL");
+            _avatarOverrideUrl = QUrl::fromUserInput(replaceURL);
+            _saveAvatarOverrideUrl = true;
+        }
+
+#if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
+        // Do not show login dialog if requested not to on the command line
+        if (parser.isSet("no-login-suggestion")) {
+            _noLoginSuggestion = true;
+        }
+#endif
+
+        if (parser.isSet("scripts")) {
+            _defaultScriptsLocation.setPath(parser.value("scripts")); // Might need to be done in "main.cpp".
+            _overrideDefaultScriptsLocation = true;
+        } else {
+            _overrideDefaultScriptsLocation = false;
+        }
+
+        // If launched from Steam, let it handle updates
+        bool buildCanUpdate = BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable
+            || BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Master;
+        if (!parser.isSet("no-updater") && buildCanUpdate) {
+            constexpr auto INSTALLER_TYPE_CLIENT_ONLY = "client_only";
+
+            auto applicationUpdater = DependencyManager::set<AutoUpdater>();
+
+            AutoUpdater::InstallerType type = installerType == INSTALLER_TYPE_CLIENT_ONLY
+                ? AutoUpdater::InstallerType::CLIENT_ONLY : AutoUpdater::InstallerType::FULL;
+
+            applicationUpdater->setInstallerType(type);
+            applicationUpdater->setInstallerCampaign(installerCampaign);
+            auto dialogsManager = DependencyManager::get<DialogsManager>();
+            connect(applicationUpdater.data(), &AutoUpdater::newVersionIsAvailable, dialogsManager.data(), &DialogsManager::showUpdateDialog);
+            applicationUpdater->checkForUpdate();
+        }
+
+        // setup the stats interval depending on if the 1s faster hearbeat was requested
+        if (parser.isSet("fast-heartbeat")) {
+            SEND_STATS_INTERVAL_MS = 1000;
+        } else {
+            SEND_STATS_INTERVAL_MS = 10000;
+        }
+    }
+
+    {
+        // identify gpu as early as possible to help identify OpenGL initialization errors.
+        auto gpuIdent = GPUIdent::getInstance();
+        auto &ch = CrashHandler::getInstance();
+
+        ch.setAnnotation("sentry[contexts][gpu][name]", gpuIdent->getName().toStdString());
+        ch.setAnnotation("sentry[contexts][gpu][version]", gpuIdent->getDriver().toStdString());
+        ch.setAnnotation("gpu_memory", std::to_string(gpuIdent->getMemory()));
+    }
+
+    // make sure the debug draw singleton is initialized on the main thread.
+    DebugDraw::getInstance().removeMarker("");
+
+    PluginContainer* pluginContainer = dynamic_cast<PluginContainer*>(this); // set the container for any plugins that care
+    PluginManager::getInstance()->setContainer(pluginContainer);
+
+    QThreadPool::globalInstance()->setMaxThreadCount(MIN_PROCESSING_THREAD_POOL_SIZE);
+    thread()->setPriority(QThread::HighPriority);
+    thread()->setObjectName("Main Thread");
+
+    setInstance(this);
+
+    auto controllerScriptingInterface = DependencyManager::get<controller::ScriptingInterface>().data();
+    _controllerScriptingInterface = dynamic_cast<ControllerScriptingInterface*>(controllerScriptingInterface);
+
+    _entityClipboard->createRootElement();
+
+#ifdef Q_OS_WIN
+    installNativeEventFilter(&MyNativeEventFilter::getInstance());
+#endif
+
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "styles/Inconsolata.otf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/fontawesome-webfont.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/hifi-glyphs.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/AnonymousPro-Regular.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Light.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Regular.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/rawline-500.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf");
+    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Medium.ttf");
+    _window->setWindowTitle("Overte");
+
+    Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
+
+    auto nodeList = DependencyManager::get<NodeList>();
+    nodeList->startThread();
+    nodeList->setFlagTimeForConnectionStep(true);
+
+    // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur
+    // before we tell MyAvatar to go to a new location in the new domain
+    auto addressManager = DependencyManager::get<AddressManager>();
+    addressManager->moveToThread(nodeList->thread());
+
+    // Set up a watchdog thread to intentionally crash the application on deadlocks
+    if (!DISABLE_WATCHDOG) {
+        auto deadlockWatchdogThread = new DeadlockWatchdogThread();
+        deadlockWatchdogThread->setMainThreadID(QThread::currentThreadId());
+        connect(deadlockWatchdogThread, &QThread::started, [] { setThreadName("DeadlockWatchdogThread"); });
+        deadlockWatchdogThread->start();
+
+        // Pause the deadlock watchdog when we sleep, or it might
+        // trigger a false positive when we wake back up
+        auto platformHelper = PlatformHelper::instance();
+
+        connect(platformHelper, &PlatformHelper::systemWillSleep, [] {
+            DeadlockWatchdogThread::pause();
+        });
+
+        connect(platformHelper, &PlatformHelper::systemWillWake, [] {
+            DeadlockWatchdogThread::resume();
+        });
+
+        // Main thread timer to keep the watchdog updated
+        QTimer* watchdogUpdateTimer = new QTimer(this);
+        connect(watchdogUpdateTimer, &QTimer::timeout, [this] { updateHeartbeat(); });
+        connect(this, &QCoreApplication::aboutToQuit, [watchdogUpdateTimer] {
+            watchdogUpdateTimer->stop();
+            watchdogUpdateTimer->deleteLater();
+        });
+        watchdogUpdateTimer->setSingleShot(false);
+        watchdogUpdateTimer->setInterval(WATCHDOG_TIMER_TIMEOUT); // 100ms, Qt::CoarseTimer acceptable
+        watchdogUpdateTimer->start();
+    }
+
+    // Set File Logger Session UUID
+    auto avatarManager = DependencyManager::get<AvatarManager>();
+    auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+    if (avatarManager) {
+        workload::SpacePointer space = getEntities()->getWorkloadSpace();
+        avatarManager->setSpace(space);
+    }
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+    // set the account manager's root URL and trigger a login request if we don't have the access token
+    accountManager->setIsAgent(true);
+    accountManager->setAuthURL(MetaverseAPI::getCurrentMetaverseServerURL());
+    if (!accountManager->hasKeyPair()) {
+        accountManager->generateNewUserKeypair();
+    }
+
+#ifndef Q_OS_ANDROID
+    _logger->setSessionID(accountManager->getSessionID());
+#endif
+
+    auto &ch = CrashHandler::getInstance();
+    ch.setAnnotation("metaverse_session_id", accountManager->getSessionID().toString().toStdString());
+    ch.setAnnotation("main_thread_id", std::to_string((size_t)QThread::currentThreadId()));
+
+    if (steamClient) {
+        qCDebug(interfaceapp) << "[VERSION] SteamVR buildID:" << steamClient->getSteamVRBuildID();
+    }
+    ch.setAnnotation("steam", property(hifi::properties::STEAM).toBool() ? "1" : "0");
+
+    qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
+    qCDebug(interfaceapp) << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
+    qCDebug(interfaceapp) << "[VERSION] VERSION:" << BuildInfo::VERSION;
+    qCDebug(interfaceapp) << "[VERSION] BUILD_TYPE_STRING:" << BuildInfo::BUILD_TYPE_STRING;
+    qCDebug(interfaceapp) << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
+#if USE_STABLE_GLOBAL_SERVICES
+    qCDebug(interfaceapp) << "[VERSION] We will use STABLE global services.";
+#else
+    qCDebug(interfaceapp) << "[VERSION] We will use DEVELOPMENT global services.";
+#endif
+
+    updateHeartbeat();
+
+    // Setup MessagesClient
+    DependencyManager::get<MessagesClient>()->startThread();
+
+    nodeList->getDomainHandler().setErrorDomainURL(QUrl(REDIRECT_HIFI_ADDRESS));
+
+    // Inititalize sample before registering
+    _sampleSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/sample.wav"));
+
+#ifdef _WIN32
+    WSADATA WsaData;
+    int wsaresult = WSAStartup(MAKEWORD(2, 2), &WsaData);
+#endif
+
+    // tell the NodeList instance who to tell the domain server we care about
+    nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
+        << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer << NodeType::EntityScriptServer);
+
+    // setDefaultFormat has no effect after the platform window has been created, so call it here.
+    QSurfaceFormat::setDefaultFormat(getDefaultOpenGLSurfaceFormat());
+
+    _glWidget = new GLCanvas();
+    getApplicationCompositor().setRenderingWidget(_glWidget);
+    _window->setCentralWidget(_glWidget);
+
+    _window->restoreGeometry();
+    _window->setVisible(true);
+
+    _glWidget->setFocusPolicy(Qt::StrongFocus);
+    _glWidget->setFocus();
+
+    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
+
+    // enable mouse tracking; otherwise, we only get drag events
+    _glWidget->setMouseTracking(true);
+    // Make sure the window is set to the correct size by processing the pending events
+    QCoreApplication::processEvents();
+
+    // Create the main thread context, the GPU backend
+    initializeGL();
+    qCDebug(interfaceapp, "Initialized GL");
+
+    // Initialize the display plugin architecture
+    initializeDisplayPlugins();
+    qCDebug(interfaceapp, "Initialized Display");
+
+    if (_displayPlugin && !_displayPlugin->isHmd()) {
+        showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
+    }
+
+    // Create the rendering engine.  This can be slow on some machines due to lots of
+    // GPU pipeline creation.
+    initializeRenderEngine();
+    qCDebug(interfaceapp, "Initialized Render Engine.");
+
+    _overlays.init(); // do this before scripts load
+
+    // Initialize the user interface and menu system
+    // Needs to happen AFTER the render engine initialization to access its configuration
+    initializeUi();
+
+    init();
+    setupSignalsAndOperators();
+    qCDebug(interfaceapp, "init() complete.");
+
+    // create thread for parsing of octree data independent of the main network and rendering threads
+    _octreeProcessor->initialize(_enableProcessOctreeThread);
+    _entityEditSender->initialize(_enableProcessOctreeThread);
+
+    // update before the first render
+    update(0);
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    static const QString TESTER = "HIFI_TESTER";
+    bool isTester = false;
+#if defined (Q_OS_ANDROID)
+    // Since we cannot set environment variables in Android we use a file presence
+    // to denote that this is a testing device
+    QFileInfo check_tester_file(TESTER_FILE);
+    isTester = check_tester_file.exists() && check_tester_file.isFile();
+#endif
+
+    auto& userActivityLogger = UserActivityLogger::getInstance();
+    if (userActivityLogger.isEnabled()) {
+        // sessionRunTime will be reset soon by loadSettings. Grab it now to get previous session value.
+        // The value will be 0 if the user blew away settings this session, which is both a feature and a bug.
+        static const QString TESTER = "HIFI_TESTER";
+        auto gpuIdent = GPUIdent::getInstance();
+        auto glContextData = gl::ContextInfo::get();
+        QJsonObject properties = {
+            { "version", applicationVersion() },
+            { "tester", QProcessEnvironment::systemEnvironment().contains(TESTER) || isTester },
+            { "installer_campaign", installerCampaign },
+            { "installer_type", installerType },
+            { "build_type", BuildInfo::BUILD_TYPE_STRING },
+            { "previousSessionCrashed", _previousSessionCrashed },
+            { "previousSessionRuntime", (int)(_sessionRunTimer.elapsed() / MSECS_PER_SECOND) },
+            { "cpu_architecture", QSysInfo::currentCpuArchitecture() },
+            { "kernel_type", QSysInfo::kernelType() },
+            { "kernel_version", QSysInfo::kernelVersion() },
+            { "os_type", QSysInfo::productType() },
+            { "os_version", QSysInfo::productVersion() },
+            { "gpu_name", gpuIdent->getName() },
+            { "gpu_driver", gpuIdent->getDriver() },
+            { "gpu_memory", static_cast<qint64>(gpuIdent->getMemory()) },
+            { "gl_version_int", glVersionToInteger(glContextData.version.c_str()) },
+            { "gl_version", glContextData.version.c_str() },
+            { "gl_vender", glContextData.vendor.c_str() },
+            { "gl_sl_version", glContextData.shadingLanguageVersion.c_str() },
+            { "gl_renderer", glContextData.renderer.c_str() },
+            { "ideal_thread_count", QThread::idealThreadCount() }
+        };
+        auto macVersion = QSysInfo::macVersion();
+        if (macVersion != QSysInfo::MV_None) {
+            properties["os_osx_version"] = QSysInfo::macVersion();
+        }
+        auto windowsVersion = QSysInfo::windowsVersion();
+        if (windowsVersion != QSysInfo::WV_None) {
+            properties["os_win_version"] = QSysInfo::windowsVersion();
+        }
+
+        ProcessorInfo procInfo;
+        if (getProcessorInfo(procInfo)) {
+            properties["processor_core_count"] = procInfo.numProcessorCores;
+            properties["logical_processor_count"] = procInfo.numLogicalProcessors;
+            properties["processor_l1_cache_count"] = procInfo.numProcessorCachesL1;
+            properties["processor_l2_cache_count"] = procInfo.numProcessorCachesL2;
+            properties["processor_l3_cache_count"] = procInfo.numProcessorCachesL3;
+        }
+
+        properties["first_run"] = _firstRun.get();
+
+        // add the user's machine ID to the launch event
+        QString machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
+        properties["machine_fingerprint"] = machineFingerPrint;
+
+        userActivityLogger.logAction("launch", properties);
+    }
+
+    _entityEditSender->setMyAvatar(myAvatar.get());
+
+    // The entity octree will have to know about MyAvatar for the parentJointName import
+    getEntities()->getTree()->setMyAvatar(myAvatar);
+    _entityClipboard->setMyAvatar(myAvatar);
+
+    // For now we're going to set the PPS for outbound packets to be super high, this is
+    // probably not the right long term solution. But for now, we're going to do this to
+    // allow you to move an entity around in your hand
+    _entityEditSender->setPacketsPerSecond(3000); // super high!!
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    auto userInputMapper = DependencyManager::get<UserInputMapper>();
+    _applicationStateDevice = userInputMapper->getStateDevice();
+
+    _applicationStateDevice->setInputVariant(STATE_IN_HMD, []() -> float {
+        return qApp->isHMDMode() ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_FULL_SCREEN_MIRROR, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_MIRROR ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_FIRST_PERSON, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_FIRST_PERSON ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_FIRST_PERSON_LOOK_AT, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_FIRST_PERSON_LOOK_AT ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_THIRD_PERSON, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_THIRD_PERSON ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_LOOK_AT, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_LOOK_AT ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_SELFIE, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_SELFIE ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_ENTITY, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_ENTITY ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAMERA_INDEPENDENT, []() -> float {
+        return qApp->getCamera().getMode() == CAMERA_MODE_INDEPENDENT ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_CAPTURE_MOUSE, []() -> float {
+        return qApp->getCamera().getCaptureMouse() ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_SNAP_TURN, []() -> float {
+        return qApp->getMyAvatar()->getSnapTurn() ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_ADVANCED_MOVEMENT_CONTROLS, []() -> float {
+        return qApp->getMyAvatar()->useAdvancedMovementControls() ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_LEFT_HAND_DOMINANT, []() -> float {
+        return qApp->getMyAvatar()->getDominantHand() == "left" ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_RIGHT_HAND_DOMINANT, []() -> float {
+        return qApp->getMyAvatar()->getDominantHand() == "right" ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_STRAFE_ENABLED, []() -> float {
+        return qApp->getMyAvatar()->getStrafeEnabled() ? 1 : 0;
+    });
+
+    _applicationStateDevice->setInputVariant(STATE_GROUNDED, []() -> float {
+        return qApp->getMyAvatar()->getCharacterController()->onGround() ? 1 : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_NAV_FOCUSED, [this]() -> float {
+        auto offscreenUi = getOffscreenUI();
+        return offscreenUi ? (offscreenUi->navigationFocused() ? 1 : 0) : 0;
+    });
+    _applicationStateDevice->setInputVariant(STATE_PLATFORM_WINDOWS, []() -> float {
+#if defined(Q_OS_WIN)
+        return 1;
+#else
+        return 0;
+#endif
+    });
+    _applicationStateDevice->setInputVariant(STATE_PLATFORM_MAC, []() -> float {
+#if defined(Q_OS_MAC)
+        return 1;
+#else
+        return 0;
+#endif
+    });
+    _applicationStateDevice->setInputVariant(STATE_PLATFORM_ANDROID, []() -> float {
+#if defined(Q_OS_ANDROID)
+        return 1 ;
+#else
+        return 0;
+#endif
+    });
+
+    getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::STARTUP);
+
+    // Setup the _keyboardMouseDevice, _touchscreenDevice, _touchscreenVirtualPadDevice and the user input mapper with the default bindings
+    userInputMapper->registerDevice(_keyboardMouseDevice->getInputDevice());
+    // if the _touchscreenDevice is not supported it will not be registered
+    if (_touchscreenDevice) {
+        userInputMapper->registerDevice(_touchscreenDevice->getInputDevice());
+    }
+    if (_touchscreenVirtualPadDevice) {
+        userInputMapper->registerDevice(_touchscreenVirtualPadDevice->getInputDevice());
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    loadSettings(parser);
+
+    updateVerboseLogging();
+
+    setCachebustRequire();
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    QTimer* settingsTimer = new QTimer();
+    int SAVE_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND; // Let's save every seconds for now
+    settingsTimer->setSingleShot(false);
+    settingsTimer->setInterval(SAVE_SETTINGS_INTERVAL); // 10s, Qt::CoarseTimer acceptable
+    QObject::connect(settingsTimer, &QTimer::timeout, this, &Application::saveSettings);
+    settingsTimer->start();
+
+    if (Menu::getInstance()->isOptionChecked(MenuOption::FirstPersonLookAt)) {
+        getMyAvatar()->setBoomLength(MyAvatar::ZOOM_MIN);  // So that camera doesn't auto-switch to third person.
+    }
+
+    {
+        auto audioIO = DependencyManager::get<AudioClient>().data();
+        // set the local loopback interface for local sounds
+        AudioInjector::setLocalAudioInterface(audioIO);
+        auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
+        audioScriptingInterface->setLocalAudioInterface(audioIO);
+
+    }
+
+    this->installEventFilter(this);
+
+    Menu::getInstance()->setIsOptionChecked(MenuOption::ActionMotorControl, true);
+
+// FIXME spacemouse code still needs cleanup
+#if 0
+    // the 3Dconnexion device wants to be initialized after a window is displayed.
+    SpacemouseManager::getInstance().init();
+#endif
+
+    // Add periodic checks to send user activity data
+    static int CHECK_NEARBY_AVATARS_INTERVAL_MS = 10000;
+    static int NEARBY_AVATAR_RADIUS_METERS = 10;
+
+    static glm::vec3 lastAvatarPosition = myAvatar->getWorldPosition();
+    static glm::mat4 lastHMDHeadPose = getHMDSensorPose();
+    static controller::Pose lastLeftHandPose = myAvatar->getLeftHandPose();
+    static controller::Pose lastRightHandPose = myAvatar->getRightHandPose();
+
+    // Periodically send fps as a user activity event
+    QTimer* sendStatsTimer = new QTimer(this);
+    sendStatsTimer->setInterval(SEND_STATS_INTERVAL_MS);  // 10s, Qt::CoarseTimer acceptable
+    connect(sendStatsTimer, &QTimer::timeout, this, [this]() {
+
+        QJsonObject properties = {};
+        MemoryInfo memInfo;
+        if (getMemoryInfo(memInfo)) {
+            properties["system_memory_total"] = static_cast<qint64>(memInfo.totalMemoryBytes);
+            properties["system_memory_used"] = static_cast<qint64>(memInfo.usedMemoryBytes);
+            properties["process_memory_used"] = static_cast<qint64>(memInfo.processUsedMemoryBytes);
+        }
+
+        // content location and build info - useful for filtering stats
+        auto addressManager = DependencyManager::get<AddressManager>();
+        auto currentDomain = addressManager->currentShareableAddress(true).toString(); // domain only
+        auto currentPath = addressManager->currentPath(true); // with orientation
+        properties["current_domain"] = currentDomain;
+        properties["current_path"] = currentPath;
+        properties["build_version"] = BuildInfo::VERSION;
+
+        auto displayPlugin = qApp->getActiveDisplayPlugin();
+
+        properties["render_rate"] = getRenderLoopRate();
+        properties["target_render_rate"] = getTargetRenderFrameRate();
+        properties["present_rate"] = displayPlugin->presentRate();
+        properties["new_frame_present_rate"] = displayPlugin->newFramePresentRate();
+        properties["dropped_frame_rate"] = displayPlugin->droppedFrameRate();
+        properties["stutter_rate"] = displayPlugin->stutterRate();
+        properties["game_rate"] = getGameLoopRate();
+        properties["has_async_reprojection"] = displayPlugin->hasAsyncReprojection();
+        properties["hardware_stats"] = displayPlugin->getHardwareStats();
+
+        // deadlock watchdog related stats
+        properties["deadlock_watchdog_maxElapsed"] = (int)DeadlockWatchdogThread::_maxElapsed;
+        properties["deadlock_watchdog_maxElapsedAverage"] = (int)DeadlockWatchdogThread::_maxElapsedAverage;
+
+        auto nodeList = DependencyManager::get<NodeList>();
+        properties["packet_rate_in"] = nodeList->getInboundPPS();
+        properties["packet_rate_out"] = nodeList->getOutboundPPS();
+        properties["kbps_in"] = nodeList->getInboundKbps();
+        properties["kbps_out"] = nodeList->getOutboundKbps();
+
+        SharedNodePointer entityServerNode = nodeList->soloNodeOfType(NodeType::EntityServer);
+        SharedNodePointer audioMixerNode = nodeList->soloNodeOfType(NodeType::AudioMixer);
+        SharedNodePointer avatarMixerNode = nodeList->soloNodeOfType(NodeType::AvatarMixer);
+        SharedNodePointer assetServerNode = nodeList->soloNodeOfType(NodeType::AssetServer);
+        SharedNodePointer messagesMixerNode = nodeList->soloNodeOfType(NodeType::MessagesMixer);
+        properties["entity_ping"] = entityServerNode ? entityServerNode->getPingMs() : -1;
+        properties["audio_ping"] = audioMixerNode ? audioMixerNode->getPingMs() : -1;
+        properties["avatar_ping"] = avatarMixerNode ? avatarMixerNode->getPingMs() : -1;
+        properties["asset_ping"] = assetServerNode ? assetServerNode->getPingMs() : -1;
+        properties["messages_ping"] = messagesMixerNode ? messagesMixerNode->getPingMs() : -1;
+        properties["atp_in_kbps"] = assetServerNode ? assetServerNode->getInboundKbps() : 0.0f;
+
+        auto loadingRequests = ResourceCache::getLoadingRequests();
+
+        QJsonArray loadingRequestsStats;
+        for (const auto& request : loadingRequests) {
+            QJsonObject requestStats;
+            requestStats["filename"] = request->getURL().fileName();
+            requestStats["received"] = request->getBytesReceived();
+            requestStats["total"] = request->getBytesTotal();
+            requestStats["attempts"] = (int)request->getDownloadAttempts();
+            loadingRequestsStats.append(requestStats);
+        }
+
+        properties["active_downloads"] = loadingRequests.size();
+        properties["pending_downloads"] = (int)ResourceCache::getPendingRequestCount();
+        properties["active_downloads_details"] = loadingRequestsStats;
+
+        auto statTracker = DependencyManager::get<StatTracker>();
+
+        properties["processing_resources"] = statTracker->getStat("Processing").toInt();
+        properties["pending_processing_resources"] = statTracker->getStat("PendingProcessing").toInt();
+
+        QJsonObject startedRequests;
+        startedRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_STARTED).toInt();
+        startedRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_STARTED).toInt();
+        startedRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_STARTED).toInt();
+        startedRequests["total"] = startedRequests["atp"].toInt() + startedRequests["http"].toInt()
+            + startedRequests["file"].toInt();
+        properties["started_requests"] = startedRequests;
+
+        QJsonObject successfulRequests;
+        successfulRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_SUCCESS).toInt();
+        successfulRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_SUCCESS).toInt();
+        successfulRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_SUCCESS).toInt();
+        successfulRequests["total"] = successfulRequests["atp"].toInt() + successfulRequests["http"].toInt()
+            + successfulRequests["file"].toInt();
+        properties["successful_requests"] = successfulRequests;
+
+        QJsonObject failedRequests;
+        failedRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_FAILED).toInt();
+        failedRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_FAILED).toInt();
+        failedRequests["file"] = statTracker->getStat(STAT_FILE_REQUEST_FAILED).toInt();
+        failedRequests["total"] = failedRequests["atp"].toInt() + failedRequests["http"].toInt()
+            + failedRequests["file"].toInt();
+        properties["failed_requests"] = failedRequests;
+
+        QJsonObject cacheRequests;
+        cacheRequests["atp"] = statTracker->getStat(STAT_ATP_REQUEST_CACHE).toInt();
+        cacheRequests["http"] = statTracker->getStat(STAT_HTTP_REQUEST_CACHE).toInt();
+        cacheRequests["total"] = cacheRequests["atp"].toInt() + cacheRequests["http"].toInt();
+        properties["cache_requests"] = cacheRequests;
+
+        QJsonObject atpMappingRequests;
+        atpMappingRequests["started"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_STARTED).toInt();
+        atpMappingRequests["failed"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_FAILED).toInt();
+        atpMappingRequests["successful"] = statTracker->getStat(STAT_ATP_MAPPING_REQUEST_SUCCESS).toInt();
+        properties["atp_mapping_requests"] = atpMappingRequests;
+
+        properties["throttled"] = _displayPlugin ? _displayPlugin->isThrottled() : false;
+
+        QJsonObject bytesDownloaded;
+        auto atpBytes = statTracker->getStat(STAT_ATP_RESOURCE_TOTAL_BYTES).toLongLong();
+        auto httpBytes = statTracker->getStat(STAT_HTTP_RESOURCE_TOTAL_BYTES).toLongLong();
+        auto fileBytes = statTracker->getStat(STAT_FILE_RESOURCE_TOTAL_BYTES).toLongLong();
+        bytesDownloaded["atp"] = atpBytes;
+        bytesDownloaded["http"] = httpBytes;
+        bytesDownloaded["file"] = fileBytes;
+        bytesDownloaded["total"] = atpBytes + httpBytes + fileBytes;
+        properties["bytes_downloaded"] = bytesDownloaded;
+
+        auto myAvatar = getMyAvatar();
+        glm::vec3 avatarPosition = myAvatar->getWorldPosition();
+        properties["avatar_has_moved"] = lastAvatarPosition != avatarPosition;
+        lastAvatarPosition = avatarPosition;
+
+        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        auto entityActivityTracking = entityScriptingInterface->getActivityTracking();
+        entityScriptingInterface->resetActivityTracking();
+        properties["added_entity_cnt"] = entityActivityTracking.addedEntityCount;
+        properties["deleted_entity_cnt"] = entityActivityTracking.deletedEntityCount;
+        properties["edited_entity_cnt"] = entityActivityTracking.editedEntityCount;
+
+        NodeToOctreeSceneStats* octreeServerSceneStats = getOcteeSceneStats();
+        unsigned long totalServerOctreeElements = 0;
+        for (NodeToOctreeSceneStatsIterator i = octreeServerSceneStats->begin(); i != octreeServerSceneStats->end(); i++) {
+            totalServerOctreeElements += i->second.getTotalElements();
+        }
+
+        properties["local_octree_elements"] = (qint64) OctreeElement::getInternalNodeCount();
+        properties["server_octree_elements"] = (qint64) totalServerOctreeElements;
+
+        properties["active_display_plugin"] = getActiveDisplayPlugin()->getName();
+        properties["using_hmd"] = isHMDMode();
+
+        auto contextInfo = gl::ContextInfo::get();
+        properties["gl_info"] = QJsonObject{
+            { "version", contextInfo.version.c_str() },
+            { "sl_version", contextInfo.shadingLanguageVersion.c_str() },
+            { "vendor", contextInfo.vendor.c_str() },
+            { "renderer", contextInfo.renderer.c_str() },
+        };
+        properties["gpu_used_memory"] = (int)BYTES_TO_MB(gpu::Context::getUsedGPUMemSize());
+        properties["gpu_free_memory"] = (int)BYTES_TO_MB(gpu::Context::getFreeGPUMemSize());
+        properties["gpu_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerGPUAverage());
+        properties["batch_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerBatchAverage());
+        properties["ideal_thread_count"] = QThread::idealThreadCount();
+
+        auto hmdHeadPose = getHMDSensorPose();
+        properties["hmd_head_pose_changed"] = isHMDMode() && (hmdHeadPose != lastHMDHeadPose);
+        lastHMDHeadPose = hmdHeadPose;
+
+        auto leftHandPose = myAvatar->getLeftHandPose();
+        auto rightHandPose = myAvatar->getRightHandPose();
+        // controller::Pose considers two poses to be different if either are invalid. In our case, we actually
+        // want to consider the pose to be unchanged if it was invalid and still is invalid, so we check that first.
+        properties["hand_pose_changed"] =
+            ((leftHandPose.valid || lastLeftHandPose.valid) && (leftHandPose != lastLeftHandPose))
+            || ((rightHandPose.valid || lastRightHandPose.valid) && (rightHandPose != lastRightHandPose));
+        lastLeftHandPose = leftHandPose;
+        lastRightHandPose = rightHandPose;
+
+        UserActivityLogger::getInstance().logAction("stats", properties);
+    });
+    sendStatsTimer->start();
+
+    // Periodically check for count of nearby avatars
+    static int lastCountOfNearbyAvatars = -1;
+    QTimer* checkNearbyAvatarsTimer = new QTimer(this);
+    checkNearbyAvatarsTimer->setInterval(CHECK_NEARBY_AVATARS_INTERVAL_MS); // 10 seconds, Qt::CoarseTimer ok
+    connect(checkNearbyAvatarsTimer, &QTimer::timeout, this, []() {
+        auto avatarManager = DependencyManager::get<AvatarManager>();
+        int nearbyAvatars = avatarManager->numberOfAvatarsInRange(avatarManager->getMyAvatar()->getWorldPosition(),
+                                                                  NEARBY_AVATAR_RADIUS_METERS) - 1;
+        if (nearbyAvatars != lastCountOfNearbyAvatars) {
+            lastCountOfNearbyAvatars = nearbyAvatars;
+            UserActivityLogger::getInstance().logAction("nearby_avatars", { { "count", nearbyAvatars } });
+        }
+    });
+    checkNearbyAvatarsTimer->start();
+
+    // Track user activity event when we receive a mute packet
+    auto onMutedByMixer = []() {
+        UserActivityLogger::getInstance().logAction("received_mute_packet");
+    };
+    connect(DependencyManager::get<AudioClient>().data(), &AudioClient::mutedByMixer, this, onMutedByMixer);
+
+    // Track when the address bar is opened
+    auto onAddressBarShown = [this]() {
+        // Record time
+        UserActivityLogger::getInstance().logAction("opened_address_bar", { { "uptime_ms", _sessionRunTimer.elapsed() } });
+    };
+    connect(DependencyManager::get<DialogsManager>().data(), &DialogsManager::addressBarShown, this, onAddressBarShown);
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    OctreeEditPacketSender* packetSender = entityScriptingInterface->getPacketSender();
+    EntityEditPacketSender* entityPacketSender = static_cast<EntityEditPacketSender*>(packetSender);
+    entityPacketSender->setMyAvatar(myAvatar.get());
+
+    qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)_sessionRunTimer.elapsed() / MSECS_PER_SECOND);
+
+    updateSystemTabletMode();
+
+    // Setup the mouse ray pick
+    {
+        auto mouseRayPick = std::make_shared<RayPick>(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::getPickEntities() | PickScriptingInterface::getPickLocalEntities()), 0.0f, true);
+        mouseRayPick->parentTransform = std::make_shared<MouseTransformNode>();
+        mouseRayPick->setJointState(PickQuery::JOINT_STATE_MOUSE);
+        auto mouseRayPickID = DependencyManager::get<PickManager>()->addPick(PickQuery::Ray, mouseRayPick);
+        DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickID(mouseRayPickID);
+    }
+
+    // Preload Tablet sounds
+    DependencyManager::get<EntityScriptingInterface>()->setEntityTree(qApp->getEntities()->getTree());
+    DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
+    DependencyManager::get<Keyboard>()->createKeyboard();
+
+    // Needs to happen later in the constructor as it depends on some other things being set up
+    _discordPresence = new DiscordPresence();
+
+    _pendingIdleEvent = false;
+    _graphicsEngine->startup();
+
+    qCDebug(interfaceapp) << "Directory Service session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
+
+    pauseUntilLoginDetermined();
+}
+
+void Application::init() {
+    // Make sure Login state is up to date
+#if !defined(DISABLE_QML)
+    DependencyManager::get<DialogsManager>()->toggleLoginDialog();
+#endif
+    DependencyManager::get<AvatarManager>()->init();
+
+    _lastTimeUpdated.start();
+
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        // when +connect_lobby in command line, join steam lobby
+        const QString STEAM_LOBBY_COMMAND_LINE_KEY = "+connect_lobby";
+        int lobbyIndex = arguments().indexOf(STEAM_LOBBY_COMMAND_LINE_KEY);
+        if (lobbyIndex != -1) {
+            QString lobbyId = arguments().value(lobbyIndex + 1);
+            steamClient->joinLobby(lobbyId);
+        }
+    }
+
+    qCDebug(interfaceapp) << "Loaded settings";
+
+    // fire off an immediate domain-server check in now that settings are loaded
+    QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "sendDomainServerCheckIn");
+
+    // This allows collision to be set up properly for shape entities supported by GeometryCache.
+    // This is before entity setup to ensure that it's ready for whenever instance collision is initialized.
+    ShapeEntityItem::setShapeInfoCalulator(ShapeEntityItem::ShapeInfoCalculator(&shapeInfoCalculator));
+
+    getEntities()->init();
+
+    ObjectMotionState::setShapeManager(&_shapeManager);
+    _physicsEngine->init();
+
+    EntityTreePointer tree = getEntities()->getTree();
+    _entitySimulation->init(tree, _physicsEngine, _entityEditSender.get());
+    tree->setSimulation(_entitySimulation);
+
+    _gameWorkload.startup(getEntities()->getWorkloadSpace(), _graphicsEngine->getRenderScene(), _entitySimulation);
+    _entitySimulation->setWorkloadSpace(getEntities()->getWorkloadSpace());
+}
+
+void Application::setupSignalsAndOperators() {
+    auto avatarManager = DependencyManager::get<AvatarManager>();
+    auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+    auto dialogsManager = DependencyManager::get<DialogsManager>();
+    auto nodeList = DependencyManager::get<NodeList>();
+    const DomainHandler& domainHandler = nodeList->getDomainHandler();
+
+    // General
+    {
+        connect(this, SIGNAL(aboutToQuit()), this, SLOT(onAboutToQuit()));
+        connect(this, &Application::applicationStateChanged, this, &Application::activeChanged);
+        connect(_window, SIGNAL(windowMinimizedChanged(bool)), this, SLOT(windowMinimizedChanged(bool)));
+
+        auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
+
+        // setup a timer for domain-server check ins
+        QTimer* domainCheckInTimer = new QTimer(this);
+        connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
+        domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
+        connect(this, &QCoreApplication::aboutToQuit, [domainCheckInTimer] {
+            domainCheckInTimer->stop();
+            domainCheckInTimer->deleteLater();
+        });
+
+        connect(&domainHandler, SIGNAL(domainURLChanged(QUrl)), SLOT(domainURLChanged(QUrl)));
+        connect(&domainHandler, SIGNAL(redirectToErrorDomainURL(QUrl)), SLOT(goToErrorDomainURL(QUrl)));
+        connect(&domainHandler, &DomainHandler::domainURLChanged, [](QUrl domainURL){
+            auto &ch = CrashHandler::getInstance();
+            ch.setAnnotation("domain", domainURL.toString().toStdString());
+        });
+        connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain()));
+        connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle()));
+        connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
+        connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() {
+            auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+            entityScriptingInterface->deleteEntity(getTabletScreenID());
+            entityScriptingInterface->deleteEntity(getTabletHomeButtonID());
+            entityScriptingInterface->deleteEntity(getTabletFrameID());
+            _failedToConnectToEntityServer = false;
+        });
+
+        connect(&domainHandler, &DomainHandler::confirmConnectWithoutAvatarEntities,
+            this, &Application::confirmConnectWithoutAvatarEntities);
+
+        connect(&domainHandler, &DomainHandler::connectedToDomain, this, [this]() {
+            if (!isServerlessMode()) {
+                _entityServerConnectionTimer.setInterval(ENTITY_SERVER_ADDED_TIMEOUT);
+                _entityServerConnectionTimer.start();
+                _failedToConnectToEntityServer = false;
+            }
+        });
+        // if we get a domain change, immediately attempt update location in directory server
+        connect(&domainHandler, &DomainHandler::connectedToDomain, discoverabilityManager.data(),
+                &DiscoverabilityManager::updateLocation);
+        connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &Application::domainConnectionRefused);
+
+        // We could clear ATP assets only when changing domains, but it's possible that the domain you are connected
+        // to has gone down and switched to a new content set, so when you reconnect the cached ATP assets will no longer be valid.
+        connect(&domainHandler, &DomainHandler::disconnectedFromDomain, DependencyManager::get<ScriptCache>().data(), &ScriptCache::clearATPScriptsFromCache);
+
+        // you might think we could just do this in NodeList but we only want this connection for Interface
+        connect(&domainHandler, &DomainHandler::limitOfSilentDomainCheckInsReached,
+            nodeList.data(), [nodeList]() { nodeList->reset("Domain checkin limit"); });
+
+
+        // update our location every 5 seconds in the directory server, assuming that we are authenticated with one
+        const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * MSECS_PER_SECOND;
+        connect(&_locationUpdateTimer, &QTimer::timeout, discoverabilityManager.data(), &DiscoverabilityManager::updateLocation);
+        connect(&_locationUpdateTimer, &QTimer::timeout, DependencyManager::get<AddressManager>().data(),
+                &AddressManager::storeCurrentAddress);
+        _locationUpdateTimer.start(DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS);
+
+        // send a location update immediately
+        discoverabilityManager->updateLocation();
+
+        connect(nodeList.data(), &NodeList::nodeAdded, this, &Application::nodeAdded);
+        connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled);
+        connect(nodeList.data(), &NodeList::nodeActivated, this, &Application::nodeActivated);
+        connect(nodeList.data(), &NodeList::uuidChanged, myAvatar.get(), &MyAvatar::setSessionUUID);
+        connect(nodeList.data(), &NodeList::uuidChanged, this, &Application::setSessionUUID);
+        connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);
+
+        auto accountManager = DependencyManager::get<AccountManager>();
+#if defined(Q_OS_ANDROID)
+        connect(accountManager.data(), &AccountManager::authRequired, this, []() {
+            auto addressManager = DependencyManager::get<AddressManager>();
+            AndroidHelper::instance().showLoginDialog(addressManager->currentAddress());
+        });
+#else
+        connect(accountManager.data(), &AccountManager::authRequired, dialogsManager.data(), &DialogsManager::showLoginDialog);
+#endif
+        connect(accountManager.data(), &AccountManager::usernameChanged, this, &Application::updateWindowTitle);
+
+        auto domainAccountManager = DependencyManager::get<DomainAccountManager>();
+        connect(domainAccountManager.data(), &DomainAccountManager::authRequired, dialogsManager.data(),
+                &DialogsManager::showDomainLoginDialog);
+        connect(domainAccountManager.data(), &DomainAccountManager::authRequired, this, &Application::updateWindowTitle);
+        connect(domainAccountManager.data(), &DomainAccountManager::loginComplete, this, &Application::updateWindowTitle);
+        // ####### TODO: Connect any other signals from domainAccountManager.
+
+        auto addressManager = DependencyManager::get<AddressManager>();
+        // use our MyAvatar position and quat for address manager path
+        addressManager->setPositionGetter([] {
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+            return myAvatar ? myAvatar->getWorldFeetPosition() : Vectors::ZERO;
+        });
+        addressManager->setOrientationGetter([] {
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+            return myAvatar ? myAvatar->getWorldOrientation() : glm::quat();
+        });
+
+        connect(addressManager.data(), &AddressManager::hostChanged, this, &Application::updateWindowTitle);
+        connect(this, &QCoreApplication::aboutToQuit, addressManager.data(), &AddressManager::storeCurrentAddress);
+
+        {
+            auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
+            scriptEngines->registerScriptInitializer([this](ScriptManagerPointer manager) {
+                registerScriptEngineWithApplicationServices(manager);
+            });
+
+            connect(scriptEngines, &ScriptEngines::scriptCountChanged, this, [this] {
+                auto scriptEngines = DependencyManager::get<ScriptEngines>();
+                if (scriptEngines->getRunningScripts().isEmpty()) {
+                    getMyAvatar()->clearScriptableSettings();
+                }
+            }, Qt::QueuedConnection);
+
+            connect(scriptEngines, &ScriptEngines::scriptsReloading, this, [this] {
+                getEntities()->reloadEntityScripts();
+                loadAvatarScripts(getMyAvatar()->getScriptUrls());
+            }, Qt::QueuedConnection);
+
+            connect(scriptEngines, &ScriptEngines::scriptLoadError,
+                this, [](const QString& filename, const QString& error) {
+                OffscreenUi::asyncWarning(nullptr, "Error Loading Script", filename + " failed to load.");
+            }, Qt::QueuedConnection);
+
+            auto entityScriptServerLog = DependencyManager::get<EntityScriptServerLogClient>();
+            connect(scriptEngines, &ScriptEngines::requestingEntityScriptServerLog,
+                entityScriptServerLog.data(), &EntityScriptServerLogClient::requestMessagesForScriptEngines);
+        }
+
+        DependencyManager::get<PickManager>()->setShouldPickHUDOperator([]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
+        DependencyManager::get<PickManager>()->setCalculatePos2DFromHUDOperator([this](const glm::vec3& intersection) {
+            const glm::vec2 MARGIN(25.0f);
+            glm::vec2 maxPos = _controllerScriptingInterface->getViewportDimensions() - MARGIN;
+            glm::vec2 pos2D = DependencyManager::get<HMDScriptingInterface>()->overlayFromWorldPoint(intersection);
+            return glm::max(MARGIN, glm::min(pos2D, maxPos));
+        });
+
+        DependencyManager::get<UsersScriptingInterface>()->setKickConfirmationOperator([this] (const QUuid& nodeID, unsigned int banFlags) { userKickConfirmation(nodeID, banFlags); });
+
+        FileDialogHelper::setOpenDirectoryOperator([this](const QString& path) { openDirectory(path); });
+        QDesktopServices::setUrlHandler("file", this, "showUrlHandler");
+        QDesktopServices::setUrlHandler("", this, "showUrlHandler");
+        auto drives = QDir::drives();
+        for (auto drive : drives) {
+            QDesktopServices::setUrlHandler(QUrl(drive.absolutePath()).scheme(), this, "showUrlHandler");
+        }
+
+#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);
+        connect(&AndroidHelper::instance(), &AndroidHelper::toggleAwayMode, this, &Application::toggleAwayMode);
+        AndroidHelper::instance().notifyLoadComplete();
+#endif
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    // Entities
+    {
+        connect(this, &Application::aboutToQuit, [this]() { setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); });
+
+        _entityServerConnectionTimer.setSingleShot(true);
+        connect(&_entityServerConnectionTimer, &QTimer::timeout, this, &Application::setFailedToConnectToEntityServer);
+
+        connect(_octreeProcessor.get(), &OctreePacketProcessor::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);
+
+        // connect the _entityCollisionSystem to our EntityTreeRenderer since that's what handles running entity scripts
+        connect(_entitySimulation.get(), &PhysicalEntitySimulation::entityCollisionWithEntity,
+                getEntities().data(), &EntityTreeRenderer::entityCollisionWithEntity);
+
+        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+        // connect the _entities (EntityTreeRenderer) to our script engine's EntityScriptingInterface for firing
+        // of events related clicking, hovering over, and entering entities
+        getEntities()->connectSignalsToSlots(entityScriptingInterface.data());
+
+        EntityTreePointer tree = getEntities()->getTree();
+        // Make sure any new sounds are loaded as soon as know about them.
+        connect(tree.get(), &EntityTree::newCollisionSoundURL, this, [this](QUrl newURL, EntityItemID id) {
+            getEntities()->setCollisionSound(id, DependencyManager::get<SoundCache>()->getSound(newURL));
+        }, Qt::QueuedConnection);
+
+        connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityItemID) {
+            if (entityItemID == _keyboardFocusedEntity.get()) {
+                setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+            }
+        }, Qt::QueuedConnection);
+
+        EntityTree::setEntityClicksCapturedOperator([this] { return _controllerScriptingInterface->areEntityClicksCaptured(); });
+
+        // If the user clicks on an object, we will check that it's a web surface, and if so, set the focus to it
+        auto pointerManager = DependencyManager::get<PointerManager>().data();
+        auto keyboardFocusOperator = [this](const QUuid& id, const PointerEvent& event) {
+            if (event.shouldFocus()) {
+                auto keyboard = DependencyManager::get<Keyboard>();
+                if (getEntities()->wantsKeyboardFocus(id)) {
+                    setKeyboardFocusEntity(id);
+                } else if (!keyboard->containsID(id)) { // FIXME: this is a hack to make the keyboard work for now, since the keys would otherwise steal focus
+                    setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+                }
+            }
+        };
+        connect(pointerManager, &PointerManager::triggerBeginEntity, keyboardFocusOperator);
+        connect(pointerManager, &PointerManager::triggerBeginOverlay, keyboardFocusOperator);
+
+        getEntities()->setEntityLoadingPriorityFunction([this](const EntityItem& item) {
+            auto dims = item.getScaledDimensions();
+            auto maxSize = glm::compMax(dims);
+
+            if (maxSize <= 0.0f) {
+                return 0.0f;
+            }
+
+            auto distance = glm::distance(getMyAvatar()->getWorldPosition(), item.getWorldPosition());
+            return atan2(maxSize, distance);
+        });
+
+        EntityTreeRenderer::setAddMaterialToEntityOperator([this](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
+            if (_aboutToQuit) {
+                return false;
+            }
+
+            auto renderable = getEntities()->renderableForEntityId(entityID);
+            if (renderable) {
+                renderable->addMaterial(material, parentMaterialName);
+                return true;
+            }
+
+            return false;
+        });
+        EntityTreeRenderer::setRemoveMaterialFromEntityOperator([this](const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
+            if (_aboutToQuit) {
+                return false;
+            }
+
+            auto renderable = getEntities()->renderableForEntityId(entityID);
+            if (renderable) {
+                renderable->removeMaterial(material, parentMaterialName);
+                return true;
+            }
+
+            return false;
+        });
+        EntityTreeRenderer::setAddMaterialToAvatarOperator([](const QUuid& avatarID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto avatar = static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(avatarID));
+            if (avatar) {
+                avatar->addMaterial(material, parentMaterialName);
+                return true;
+            }
+            return false;
+        });
+        EntityTreeRenderer::setRemoveMaterialFromAvatarOperator([](const QUuid& avatarID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto avatar = static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(avatarID));
+            if (avatar) {
+                avatar->removeMaterial(material, parentMaterialName);
+                return true;
+            }
+            return false;
+        });
+
+        EntityTree::setGetUnscaledDimensionsForIDOperator([this](const QUuid& id) {
+            if (_aboutToQuit) {
+                return glm::vec3(1.0f);
+            }
+
+            auto entity = getEntities()->getEntity(id);
+            if (entity) {
+                return entity->getUnscaledDimensions();
+            }
+
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto avatar = static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(id));
+            if (avatar) {
+                return avatar->getSNScale();
+            }
+            return glm::vec3(1.0f);
+        });
+
+        ReferenceMaterial::setMaterialForUUIDOperator([this](const QUuid& entityID) -> graphics::MaterialPointer {
+            if (_aboutToQuit) {
+                return nullptr;
+            }
+
+            auto renderable = getEntities()->renderableForEntityId(entityID);
+            if (renderable) {
+                return renderable->getTopMaterial();
+            }
+
+            return nullptr;
+        });
+
+        Procedural::opaqueStencil = [](gpu::StatePointer state) { PrepareStencil::testMaskDrawShape(*state); };
+        Procedural::transparentStencil = [](gpu::StatePointer state) { PrepareStencil::testMask(*state); };
+
+        EntityTree::setGetEntityObjectOperator([this](const QUuid& id) -> QObject* {
+            auto entities = getEntities();
+            if (auto entity = entities->renderableForEntityId(id)) {
+                return qobject_cast<QObject*>(entity.get());
+            }
+            return nullptr;
+        });
+
+        EntityTree::setEmitScriptEventOperator([this](const QUuid& id, const QVariant& message) {
+            auto entities = getEntities();
+            if (auto entity = entities->renderableForEntityId(id)) {
+                entity->emitScriptEvent(message);
+            }
+        });
+
+        EntityTree::setTextSizeOperator([this](const QUuid& id, const QString& text) {
+            auto entities = getEntities();
+            if (auto entity = entities->renderableForEntityId(id)) {
+                if (auto renderable = std::dynamic_pointer_cast<render::entities::TextEntityRenderer>(entity)) {
+                    return renderable->textSize(text);
+                }
+            }
+            return QSizeF(0.0f, 0.0f);
+        });
+
+        Texture::setUnboundTextureForUUIDOperator([this](const QUuid& entityID) -> gpu::TexturePointer {
+            if (_aboutToQuit) {
+                return nullptr;
+            }
+
+            auto renderable = getEntities()->renderableForEntityId(entityID);
+            if (renderable) {
+                return renderable->getTexture();
+            }
+
+            return nullptr;
+        });
+
+        EntityTreeRenderer::setEntitiesShouldFadeFunction([this]() {
+            SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
+            return entityServerNode && !isPhysicsEnabled();
+        });
+
+        DependencyManager::get<EntityTreeRenderer>()->setMouseRayPickResultOperator([](unsigned int rayPickID) {
+            RayToEntityIntersectionResult entityResult;
+            entityResult.intersects = false;
+            auto pickResult = DependencyManager::get<PickManager>()->getPrevPickResultTyped<RayPickResult>(rayPickID);
+            if (pickResult) {
+                entityResult.intersects = pickResult->type != IntersectionType::NONE;
+                if (entityResult.intersects) {
+                    entityResult.intersection = pickResult->intersection;
+                    entityResult.distance = pickResult->distance;
+                    entityResult.surfaceNormal = pickResult->surfaceNormal;
+                    entityResult.entityID = pickResult->objectID;
+                    entityResult.extraInfo = pickResult->extraInfo;
+                }
+            }
+            return entityResult;
+        });
+        DependencyManager::get<EntityTreeRenderer>()->setSetPrecisionPickingOperator([](unsigned int rayPickID, bool value) {
+            DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value);
+        });
+
+        BillboardModeHelpers::setBillboardRotationOperator([](const glm::vec3& position, const glm::quat& rotation,
+                                                              BillboardMode billboardMode, const glm::vec3& frustumPos, bool rotate90x) {
+            const glm::quat ROTATE_90X = glm::angleAxis(-(float)M_PI_2, Vectors::RIGHT);
+            if (billboardMode == BillboardMode::YAW) {
+                //rotate about vertical to face the camera
+                glm::vec3 dPosition = frustumPos - position;
+                // If x and z are 0, atan(x, z) is undefined, so default to 0 degrees
+                float yawRotation = dPosition.x == 0.0f && dPosition.z == 0.0f ? 0.0f : glm::atan(dPosition.x, dPosition.z);
+                glm::quat result = glm::quat(glm::vec3(0.0f, yawRotation, 0.0f)) * rotation;
+                if (rotate90x) {
+                    result *= ROTATE_90X;
+                }
+                return result;
+            } else if (billboardMode == BillboardMode::FULL) {
+                // use the referencial from the avatar, y isn't always up
+                glm::vec3 avatarUP = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldOrientation() * Vectors::UP;
+                // check to see if glm::lookAt will work / using glm::lookAt variable name
+                glm::highp_vec3 s(glm::cross(position - frustumPos, avatarUP));
+
+                // make sure s is not NaN for any component
+                if (glm::length2(s) > 0.0f) {
+                    glm::quat result = glm::conjugate(glm::toQuat(glm::lookAt(frustumPos, position, avatarUP))) * rotation;
+                    if (rotate90x) {
+                        result *= ROTATE_90X;
+                    }
+                    return result;
+                }
+            }
+            return rotation;
+        });
+        BillboardModeHelpers::setPrimaryViewFrustumPositionOperator([this]() {
+            ViewFrustum viewFrustum;
+            copyViewFrustum(viewFrustum);
+            return viewFrustum.getPosition();
+        });
+
+        render::entities::WebEntityRenderer::setAcquireWebSurfaceOperator([=](const QString& url, bool htmlContent, QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface) {
+            bool isTablet = url == TabletScriptingInterface::QML;
+            if (htmlContent) {
+                webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(render::entities::WebEntityRenderer::QML);
+                cachedWebSurface = true;
+                auto rootItemLoadedFunctor = [url, webSurface] {
+                    webSurface->getRootItem()->setProperty(render::entities::WebEntityRenderer::URL_PROPERTY, url);
+                };
+                if (webSurface->getRootItem()) {
+                    rootItemLoadedFunctor();
+                } else {
+                    QObject::connect(webSurface.data(), &hifi::qml::OffscreenSurface::rootContextCreated, rootItemLoadedFunctor);
+                }
+                auto surfaceContext = webSurface->getSurfaceContext();
+                surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
+            } else {
+                // FIXME: the tablet should use the OffscreenQmlSurfaceCache
+                webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), [](OffscreenQmlSurface* webSurface) {
+                    AbstractViewStateInterface::instance()->sendLambdaEvent([webSurface] {
+                        // WebEngineView may run other threads (wasapi), so they must be deleted for a clean shutdown
+                        // if the application has already stopped its event loop, delete must be explicit
+                        delete webSurface;
+                    });
+                });
+                auto rootItemLoadedFunctor = [webSurface, url, isTablet] {
+                    Application::setupQmlSurface(webSurface->getSurfaceContext(), isTablet || url == LOGIN_DIALOG.toString() || url == AVATAR_INPUTS_BAR_QML.toString() ||
+                       url == BUBBLE_ICON_QML.toString());
+                };
+                if (webSurface->getRootItem()) {
+                    rootItemLoadedFunctor();
+                } else {
+                    QObject::connect(webSurface.data(), &hifi::qml::OffscreenSurface::rootContextCreated, rootItemLoadedFunctor);
+                }
+                webSurface->load(url);
+                cachedWebSurface = false;
+            }
+            const uint8_t DEFAULT_MAX_FPS = 10;
+            const uint8_t TABLET_FPS = 90;
+            webSurface->setMaxFps(isTablet ? TABLET_FPS : DEFAULT_MAX_FPS);
+        });
+        render::entities::WebEntityRenderer::setReleaseWebSurfaceOperator([=](QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface, std::vector<QMetaObject::Connection>& connections) {
+            QQuickItem* rootItem = webSurface->getRootItem();
+
+            // Fix for crash in QtWebEngineCore when rapidly switching domains
+            // Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
+            if (rootItem && !cachedWebSurface) {
+                // stop loading
+                QMetaObject::invokeMethod(rootItem, "stop");
+            }
+
+            webSurface->pause();
+
+            for (auto& connection : connections) {
+                QObject::disconnect(connection);
+            }
+            connections.clear();
+
+            // If the web surface was fetched out of the cache, release it back into the cache
+            if (cachedWebSurface) {
+                // If it's going back into the cache make sure to explicitly set the URL to a blank page
+                // in order to stop any resource consumption or audio related to the page.
+                if (rootItem) {
+                    rootItem->setProperty("url", "about:blank");
+                }
+                auto offscreenCache = DependencyManager::get<OffscreenQmlSurfaceCache>();
+                if (offscreenCache) {
+                    offscreenCache->release(render::entities::WebEntityRenderer::QML, webSurface);
+                }
+                cachedWebSurface = false;
+            }
+            webSurface.reset();
+        });
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    // Plugins
+    {
+        connect(PluginManager::getInstance().data(), &PluginManager::inputDeviceRunningChanged,
+            _controllerScriptingInterface, &controller::ScriptingInterface::updateRunningInputDevices);
+
+        connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateThreadPoolCount);
+        if (_useSystemCursor) {
+            connect(this, &Application::activeDisplayPluginChanged, this, [=](){
+                qApp->setProperty(hifi::properties::HMD, qApp->isHMDMode());
+                auto displayPlugin = qApp->getActiveDisplayPlugin();
+
+                if (displayPlugin->isHmd()) {
+                    if (_preferredCursor.get() == Cursor::Manager::getIconName(Cursor::Icon::RETICLE)) {
+                        setPreferredCursor(Cursor::Manager::getIconName(Cursor::Icon::RETICLE));
+                    } else {
+                        setPreferredCursor(Cursor::Manager::getIconName(Cursor::Icon::ARROW));
+                    }
+                } else {
+                    setPreferredCursor(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
+                }
+
+                auto &ch = CrashHandler::getInstance();
+                ch.setAnnotation("display_plugin", displayPlugin->getName().toStdString());
+                ch.setAnnotation("hmd", displayPlugin->isHmd() ? "1" : "0");
+            });
+        }
+        connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode);
+        connect(this, &Application::activeDisplayPluginChanged, this, [&](){
+            if (getLoginDialogPoppedUp()) {
+                auto dialogsManager = DependencyManager::get<DialogsManager>();
+                auto keyboard = DependencyManager::get<Keyboard>();
+                if (_firstRun.get()) {
+                    // display mode changed.  Don't allow auto-switch to work after this session.
+                    _firstRun.set(false);
+                }
+                if (isHMDMode()) {
+                    emit loginDialogFocusDisabled();
+                    dialogsManager->hideLoginDialog();
+                    createLoginDialog();
+                } else {
+                    DependencyManager::get<EntityScriptingInterface>()->deleteEntity(_loginDialogID);
+                    _loginDialogID = QUuid();
+                    _loginStateManager.tearDown();
+                    dialogsManager->showLoginDialog();
+                    emit loginDialogFocusEnabled();
+                }
+            }
+        });
+
+        // Setup the userInputMapper with the actions
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
+        connect(userInputMapper.data(), &UserInputMapper::actionEvent, [this](int action, float state) {
+            using namespace controller;
+            auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+            QSharedPointer<scripting::Audio> audioScriptingInterface = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
+            {
+                auto actionEnum = static_cast<Action>(action);
+                int key = Qt::Key_unknown;
+                static int lastKey = Qt::Key_unknown;
+                bool navAxis = false;
+                switch (actionEnum) {
+                    case Action::TOGGLE_PUSHTOTALK:
+                        if (audioScriptingInterface) {
+                            if (state > 0.0f) {
+                                audioScriptingInterface->setPushingToTalk(true);
+                            } else if (state <= 0.0f) {
+                                audioScriptingInterface->setPushingToTalk(false);
+                            }
+                        }
+                        break;
+
+                    case Action::UI_NAV_VERTICAL:
+                        navAxis = true;
+                        if (state > 0.0f) {
+                            key = Qt::Key_Up;
+                        } else if (state < 0.0f) {
+                            key = Qt::Key_Down;
+                        }
+                        break;
+
+                    case Action::UI_NAV_LATERAL:
+                        navAxis = true;
+                        if (state > 0.0f) {
+                            key = Qt::Key_Right;
+                        } else if (state < 0.0f) {
+                            key = Qt::Key_Left;
+                        }
+                        break;
+
+                    case Action::UI_NAV_GROUP:
+                        navAxis = true;
+                        if (state > 0.0f) {
+                            key = Qt::Key_Tab;
+                        } else if (state < 0.0f) {
+                            key = Qt::Key_Backtab;
+                        }
+                        break;
+
+                    case Action::UI_NAV_BACK:
+                        key = Qt::Key_Escape;
+                        break;
+
+                    case Action::UI_NAV_SELECT:
+                        key = Qt::Key_Return;
+                        break;
+                    default:
+                        break;
+                }
+
+                auto window = tabletScriptingInterface->getTabletWindow();
+                if (navAxis && window) {
+                    if (lastKey != Qt::Key_unknown) {
+                        QKeyEvent event(QEvent::KeyRelease, lastKey, Qt::NoModifier);
+                        sendEvent(window, &event);
+                        lastKey = Qt::Key_unknown;
+                    }
+
+                    if (key != Qt::Key_unknown) {
+                        QKeyEvent event(QEvent::KeyPress, key, Qt::NoModifier);
+                        sendEvent(window, &event);
+                        tabletScriptingInterface->processEvent(&event);
+                        lastKey = key;
+                    }
+                } else if (key != Qt::Key_unknown && window) {
+                    if (state) {
+                        QKeyEvent event(QEvent::KeyPress, key, Qt::NoModifier);
+                        sendEvent(window, &event);
+                        tabletScriptingInterface->processEvent(&event);
+                    } else {
+                        QKeyEvent event(QEvent::KeyRelease, key, Qt::NoModifier);
+                        sendEvent(window, &event);
+                    }
+                    return;
+                }
+            }
+
+            if (action == controller::toInt(controller::Action::RETICLE_CLICK)) {
+                auto reticlePos = getApplicationCompositor().getReticlePosition();
+                QPoint localPos(reticlePos.x, reticlePos.y); // both hmd and desktop already handle this in our coordinates.
+                if (state) {
+                    QMouseEvent mousePress(QEvent::MouseButtonPress, localPos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
+                    sendEvent(_glWidget, &mousePress);
+                    _reticleClickPressed = true;
+                } else {
+                    QMouseEvent mouseRelease(QEvent::MouseButtonRelease, localPos, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
+                    sendEvent(_glWidget, &mouseRelease);
+                    _reticleClickPressed = false;
+                }
+                return; // nothing else to do
+            }
+
+            if (state) {
+                if (action == controller::toInt(controller::Action::TOGGLE_MUTE)) {
+                    auto audioClient = DependencyManager::get<AudioClient>();
+                    audioClient->setMuted(!audioClient->isMuted());
+                } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) {
+                    cycleCamera();
+                } else if (action == controller::toInt(controller::Action::CONTEXT_MENU) && !isInterstitialMode()) {
+                    toggleTabletUI();
+                } else if (action == controller::toInt(controller::Action::RETICLE_X)) {
+                    auto oldPos = getApplicationCompositor().getReticlePosition();
+                    getApplicationCompositor().setReticlePosition({ oldPos.x + state, oldPos.y });
+                } else if (action == controller::toInt(controller::Action::RETICLE_Y)) {
+                    auto oldPos = getApplicationCompositor().getReticlePosition();
+                    getApplicationCompositor().setReticlePosition({ oldPos.x, oldPos.y + state });
+                } else if (action == controller::toInt(controller::Action::TOGGLE_OVERLAY)) {
+                    toggleOverlays();
+                }
+            }
+        });
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    // UI
+    {
+        auto offscreenUi = getOffscreenUI().data();
+        connect(offscreenUi, &OffscreenUi::desktopReady, [this]() {
+            // Now that we've loaded the menu and thus switched to the previous display plugin
+            // we can unlock the desktop repositioning code, since all the positions will be
+            // relative to the desktop size for this plugin
+            auto offscreenUi = getOffscreenUI();
+            auto desktop = offscreenUi->getDesktop();
+            if (desktop) {
+                desktop->setProperty("repositionLocked", false);
+            }
+        });
+
+#if defined(Q_OS_ANDROID) || defined(DISABLE_QML)
+        connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
+            resumeAfterLoginDialogActionTaken();
+        });
+#else
+        // Do not show login dialog if requested not to on the command line
+        if (_noLoginSuggestion) {
+            connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
+                resumeAfterLoginDialogActionTaken();
+            });
+        } else {
+            connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
+                showLoginScreen();
+                resumeAfterLoginDialogActionTaken();
+            });
+        }
+#endif
+
+        // Monitor model assets (e.g., from Clara.io) added to the world that may need resizing.
+        static const int ADD_ASSET_TO_WORLD_TIMER_INTERVAL_MS = 1000;
+        _addAssetToWorldResizeTimer.setInterval(ADD_ASSET_TO_WORLD_TIMER_INTERVAL_MS); // 1s, Qt::CoarseTimer acceptable
+        connect(&_addAssetToWorldResizeTimer, &QTimer::timeout, this, &Application::addAssetToWorldCheckModelSize);
+
+        // Auto-update and close adding asset to world info message box.
+        static const int ADD_ASSET_TO_WORLD_INFO_TIMEOUT_MS = 5000;
+        _addAssetToWorldInfoTimer.setInterval(ADD_ASSET_TO_WORLD_INFO_TIMEOUT_MS); // 5s, Qt::CoarseTimer acceptable
+        _addAssetToWorldInfoTimer.setSingleShot(true);
+        connect(&_addAssetToWorldInfoTimer, &QTimer::timeout, this, &Application::addAssetToWorldInfoTimeout);
+        static const int ADD_ASSET_TO_WORLD_ERROR_TIMEOUT_MS = 8000;
+        _addAssetToWorldErrorTimer.setInterval(ADD_ASSET_TO_WORLD_ERROR_TIMEOUT_MS); // 8s, Qt::CoarseTimer acceptable
+        _addAssetToWorldErrorTimer.setSingleShot(true);
+        connect(&_addAssetToWorldErrorTimer, &QTimer::timeout, this, &Application::addAssetToWorldErrorTimeout);
+
+        connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose);
+        connect(&domainHandler, &DomainHandler::domainURLChanged, this, &Application::addAssetToWorldMessageClose);
+        connect(&domainHandler, &DomainHandler::redirectToErrorDomainURL, this, &Application::addAssetToWorldMessageClose);
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    // Avatar
+    {
+        // Save avatar location immediately after a teleport.
+        connect(myAvatar.get(), &MyAvatar::positionGoneTo,
+            DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress);
+
+        connect(myAvatar.get(), &MyAvatar::positionGoneTo, this, [this] {
+            if (!_physicsEnabled) {
+                // when we arrive somewhere without physics enabled --> startSafeLanding
+                _octreeProcessor->startSafeLanding();
+            }
+        }, Qt::QueuedConnection);
+
+        connect(myAvatar.get(), &MyAvatar::skeletonModelURLChanged, [](){
+            QUrl avatarURL = qApp->getMyAvatar()->getSkeletonModelURL();
+            auto &ch = CrashHandler::getInstance();
+            ch.setAnnotation("avatar", avatarURL.toString().toStdString());
+        });
+
+        // FIXME -- I'm a little concerned about this.
+        connect(myAvatar->getSkeletonModel().get(), &SkeletonModel::skeletonLoaded,
+            this, &Application::checkSkeleton, Qt::QueuedConnection);
+
+        connect(myAvatar.get(), &MyAvatar::newCollisionSoundURL, this, [this](QUrl newURL) {
+            if (auto avatar = getMyAvatar()) {
+                auto sound = DependencyManager::get<SoundCache>()->getSound(newURL);
+                avatar->setCollisionSound(sound);
+            }
+        }, Qt::QueuedConnection);
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    // Camera
+    {
+        connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
+        connect(&_myCamera, &Camera::captureMouseChanged, this, &Application::captureMouseChanged);
+    }
+
+    // Make sure we don't time out during slow operations at startup
+    updateHeartbeat();
+
+    // Audio
+    {
+        auto audioIO = DependencyManager::get<AudioClient>().data();
+        audioIO->setPositionGetter([] {
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+
+            return myAvatar ? myAvatar->getPositionForAudio() : Vectors::ZERO;
+        });
+        audioIO->setOrientationGetter([] {
+            auto avatarManager = DependencyManager::get<AvatarManager>();
+            auto myAvatar = avatarManager ? avatarManager->getMyAvatar() : nullptr;
+
+            return myAvatar ? myAvatar->getOrientationForAudio() : Quaternions::IDENTITY;
+        });
+
+        recording::Frame::registerFrameHandler(AudioConstants::getAudioFrameName(), [&audioIO](recording::Frame::ConstPointer frame) {
+            audioIO->handleRecordedAudioInput(frame->data);
+        });
+
+        connect(audioIO, &AudioClient::inputReceived, [](const QByteArray& audio) {
+            static auto recorder = DependencyManager::get<recording::Recorder>();
+            if (recorder->isRecording()) {
+                static const recording::FrameType AUDIO_FRAME_TYPE = recording::Frame::registerFrameType(AudioConstants::getAudioFrameName());
+                recorder->recordFrame(AUDIO_FRAME_TYPE, audio);
+            }
+        });
+        audioIO->startThread();
+
+        // An audio device changed signal received before the display plugins are set up will cause a crash,
+        // so we defer the setup of the `scripting::Audio` class until this point
+        auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>().data();
+        connect(audioIO, &AudioClient::mutedByMixer, audioScriptingInterface, &AudioScriptingInterface::mutedByMixer);
+        connect(audioIO, &AudioClient::receivedFirstPacket, audioScriptingInterface, &AudioScriptingInterface::receivedFirstPacket);
+        connect(audioIO, &AudioClient::disconnected, audioScriptingInterface, &AudioScriptingInterface::disconnected);
+        connect(audioIO, &AudioClient::noiseGateOpened, audioScriptingInterface, &AudioScriptingInterface::noiseGateOpened);
+        connect(audioIO, &AudioClient::noiseGateClosed, audioScriptingInterface, &AudioScriptingInterface::noiseGateClosed);
+        connect(audioIO, &AudioClient::inputReceived, audioScriptingInterface, &AudioScriptingInterface::inputReceived);
+        connect(audioIO, &AudioClient::muteEnvironmentRequested, [](glm::vec3 position, float radius) {
+            auto audioClient = DependencyManager::get<AudioClient>();
+            auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>();
+            auto myAvatarPosition = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldPosition();
+            float distance = glm::distance(myAvatarPosition, position);
+
+            if (distance < radius) {
+                audioClient->setMuted(true);
+                audioScriptingInterface->environmentMuted();
+            }
+        });
+        QSharedPointer<scripting::Audio> scriptingAudioSharedPointer = qSharedPointerDynamicCast<scripting::Audio>(DependencyManager::get<AudioScriptingInterface>());
+        if (scriptingAudioSharedPointer) {
+            connect(this, &Application::activeDisplayPluginChanged,
+                scriptingAudioSharedPointer.data(), &scripting::Audio::onContextChanged);
+        }
+    }
+}
diff --git a/interface/src/Application_UI.cpp b/interface/src/Application_UI.cpp
new file mode 100644
index 00000000000..cc4c1a098bf
--- /dev/null
+++ b/interface/src/Application_UI.cpp
@@ -0,0 +1,1458 @@
+//
+//  Application_UI.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "Application.h"
+
+#include <QtQml/QQmlContext>
+
+#include <AddressManager.h>
+#include <AnimationCacheScriptingInterface.h>
+#include <audio/AudioScope.h>
+#include <AudioScriptingInterface.h>
+#include <AvatarBookmarks.h>
+#include <display-plugins/CompositorHelper.h>
+#include <FileDialogHelper.h>
+#include <FSTReader.h>
+#include <MainWindow.h>
+#include <material-networking/TextureCacheScriptingInterface.h>
+#include <Menu.h>
+#include <MessagesClient.h>
+#include <model-networking/ModelCacheScriptingInterface.h>
+#include <OffscreenUi.h>
+#include <plugins/InputConfiguration.h>
+#include <plugins/PluginManager.h>
+#include <plugins/PluginUtils.h>
+#include <plugins/SteamClientPlugin.h>
+#include <Preferences.h>
+#include <procedural/MaterialCacheScriptingInterface.h>
+#include <raypick/PointerScriptingInterface.h>
+#include <recording/RecordingScriptingInterface.h>
+#include <SandboxUtils.h>
+#include <SceneScriptingInterface.h>
+#include <ScriptEngines.h>
+#include <scripting/AccountServicesScriptingInterface.h>
+#include <scripting/AssetMappingsScriptingInterface.h>
+#include <scripting/ControllerScriptingInterface.h>
+#include <scripting/DesktopScriptingInterface.h>
+#include <scripting/HMDScriptingInterface.h>
+#include <scripting/KeyboardScriptingInterface.h>
+#include <scripting/MenuScriptingInterface.h>
+#include <scripting/PerformanceScriptingInterface.h>
+#include <scripting/PlatformInfoScriptingInterface.h>
+#include <scripting/RatesScriptingInterface.h>
+#include <scripting/RenderScriptingInterface.h>
+#include <scripting/ScreenshareScriptingInterface.h>
+#include <scripting/SelectionScriptingInterface.h>
+#include <scripting/SettingsScriptingInterface.h>
+#include <scripting/WindowScriptingInterface.h>
+#ifndef Q_OS_ANDROID
+#include <shared/FileLogger.h>
+#endif
+#include <shared/GlobalAppProperties.h>
+#include <shared/StringHelpers.h>
+#include <SoundCacheScriptingInterface.h>
+#include <ui/AnimStats.h>
+#include <ui/AvatarInputs.h>
+#include <ui/DialogsManager.h>
+#include <ui/DomainConnectionModel.h>
+#include <ui/EntityScriptServerLogDialog.h>
+#include <ui/Keyboard.h>
+#include <ui/LogDialog.h>
+#include <ui/LoginDialog.h>
+#include <ui/OctreeStatsDialog.h>
+#include <ui/OctreeStatsProvider.h>
+#include <ui/Snapshot.h>
+#include <ui/Stats.h>
+#include <ui/TabletScriptingInterface.h>
+#include <ui/ToolbarScriptingInterface.h>
+#include <UserActivityLogger.h>
+#include <UserActivityLoggerScriptingInterface.h>
+#include <UsersScriptingInterface.h>
+
+#include "AboutUtil.h"
+#include "ArchiveDownloadInterface.h"
+#include "AudioClient.h"
+#include "GLCanvas.h"
+#include "LocationBookmarks.h"
+#include "LODManager.h"
+#include "ResourceRequestObserver.h"
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+#include "SpeechRecognizer.h"
+#endif
+
+static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
+
+static const QString STANDARD_TO_ACTION_MAPPING_NAME = "Standard to Action";
+static const QString NO_MOVEMENT_MAPPING_NAME = "Standard to Action (No Movement)";
+static const QString NO_MOVEMENT_MAPPING_JSON = PathUtils::resourcesPath() + "/controllers/standard_nomovement.json";
+
+const QString DEFAULT_CURSOR_NAME = "SYSTEM";
+
+static const QUrl AVATAR_INPUTS_BAR_QML = PathUtils::qmlUrl("AvatarInputsBar.qml");
+static const QString INFO_HELP_PATH = "html/tabletHelp.html";
+
+
+ui::Menu* Application::getPrimaryMenu() {
+    auto appMenu = _window->menuBar();
+    auto uiMenu = dynamic_cast<ui::Menu*>(appMenu);
+    return uiMenu;
+}
+
+void Application::showDisplayPluginsTools(bool show) {
+    DependencyManager::get<DialogsManager>()->hmdTools(show);
+}
+
+GLWidget* Application::getPrimaryWidget() {
+    return _glWidget;
+}
+
+MainWindow* Application::getPrimaryWindow() {
+    return getWindow();
+}
+
+QOpenGLContext* Application::getPrimaryContext() {
+    return _glWidget->qglContext();
+}
+
+bool Application::isForeground() const {
+    return _isForeground && !_window->isMinimized();
+}
+
+bool Application::hasFocus() const {
+    bool result = (QApplication::activeWindow() != nullptr);
+
+
+#if defined(Q_OS_WIN)
+    // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't
+    // take user focus away from their current window. So also check whether the application is the user's current foreground
+    // window.
+    result = result && (HWND)QApplication::activeWindow()->winId() == GetForegroundWindow();
+#endif
+    return result;
+}
+
+void Application::setFocus() {
+    // Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and
+    // flashes the taskbar icon.
+    auto window = qApp->getWindow();
+    window->activateWindow();
+}
+
+void Application::raise() {
+    auto windowState = qApp->getWindow()->windowState();
+    if (windowState & Qt::WindowMinimized) {
+        if (windowState & Qt::WindowMaximized) {
+            qApp->getWindow()->showMaximized();
+        } else if (windowState & Qt::WindowFullScreen) {
+            qApp->getWindow()->showFullScreen();
+        } else {
+            qApp->getWindow()->showNormal();
+        }
+    }
+    qApp->getWindow()->raise();
+}
+
+void Application::showCursor(const Cursor::Icon& cursor) {
+    QMutexLocker locker(&_changeCursorLock);
+
+    auto managedCursor = Cursor::Manager::instance().getCursor();
+    auto curIcon = managedCursor->getIcon();
+    if (curIcon != cursor) {
+        managedCursor->setIcon(cursor);
+        curIcon = cursor;
+    }
+    _desiredCursor = cursor == Cursor::Icon::SYSTEM ? Qt::ArrowCursor : Qt::BlankCursor;
+    _cursorNeedsChanging = true;
+}
+
+CompositorHelper& Application::getApplicationCompositor() const {
+    return *DependencyManager::get<CompositorHelper>();
+}
+
+PickRay Application::computePickRay(float x, float y) const {
+    vec2 pickPoint { x, y };
+    PickRay result;
+    if (isHMDMode()) {
+        getApplicationCompositor().computeHmdPickRay(pickPoint, result.origin, result.direction);
+    } else {
+        pickPoint /= getCanvasSize();
+        if (_myCamera.getMode() == CameraMode::CAMERA_MODE_MIRROR) {
+            pickPoint.x = 1.0f - pickPoint.x;
+        }
+        QMutexLocker viewLocker(&_viewMutex);
+        _viewFrustum.computePickRay(pickPoint.x, pickPoint.y, result.origin, result.direction);
+    }
+    return result;
+}
+
+void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditionalContextProperties) {
+    surfaceContext->setContextProperty("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
+    surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
+    surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
+    surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
+    surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
+    surfaceContext->setContextProperty("Vec3", new Vec3());
+    surfaceContext->setContextProperty("Quat", new Quat());
+    surfaceContext->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
+    surfaceContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
+    surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
+    surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
+
+    if (setAdditionalContextProperties) {
+        qDebug() << "setting additional context properties!";
+        auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+        auto flags = tabletScriptingInterface->getFlags();
+
+        surfaceContext->setContextProperty("offscreenFlags", flags);
+        surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
+
+        surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext));
+        surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
+        surfaceContext->setContextProperty("Performance", new PerformanceScriptingInterface());
+
+        surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+        surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
+
+        // in Qt 5.10.0 there is already an "Audio" object in the QML context
+        // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
+        surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
+
+        surfaceContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
+        surfaceContext->setContextProperty("fileDialogHelper", new FileDialogHelper());
+        surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
+        surfaceContext->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
+        surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
+        surfaceContext->setContextProperty("OctreeStats", DependencyManager::get<OctreeStatsProvider>().data());
+        surfaceContext->setContextProperty("DCModel", DependencyManager::get<DomainConnectionModel>().data());
+        surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
+        surfaceContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
+        surfaceContext->setContextProperty("DialogsManager", DialogsManagerScriptingInterface::getInstance());
+        surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
+        surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
+        surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
+        surfaceContext->setContextProperty("Render", RenderScriptingInterface::getInstance());
+        surfaceContext->setContextProperty("Workload", qApp->getGameWorkload()._engine->getConfiguration().get());
+        surfaceContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
+        surfaceContext->setContextProperty("Pointers", DependencyManager::get<PointerScriptingInterface>().data());
+        surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
+        surfaceContext->setContextProperty("Reticle", qApp->getApplicationCompositor().getReticleInterface());
+        surfaceContext->setContextProperty("About", AboutUtil::getInstance());
+        surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());  // Deprecated.
+        surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
+        surfaceContext->setContextProperty("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
+        surfaceContext->setContextProperty("ExternalResource", ExternalResource::getInstance());
+
+        // This `module` context property is blank for the QML scripting interface so that we don't get log errors when importing
+        // certain JS files from both scripts (in the JS context) and QML (in the QML context).
+        surfaceContext->setContextProperty("module", "");
+    }
+}
+
+void Application::setDesktopTabletBecomesToolbarSetting(bool value) {
+    _desktopTabletBecomesToolbarSetting.set(value);
+    updateSystemTabletMode();
+}
+
+void Application::setHmdTabletBecomesToolbarSetting(bool value) {
+    _hmdTabletBecomesToolbarSetting.set(value);
+    updateSystemTabletMode();
+}
+
+void Application::setMiniTabletEnabled(bool enabled) {
+    _miniTabletEnabledSetting.set(enabled);
+    emit miniTabletEnabledChanged(enabled);
+}
+
+void Application::setSettingConstrainToolbarPosition(bool setting) {
+    _constrainToolbarPosition.set(setting);
+    getOffscreenUI()->setConstrainToolbarToCenterX(setting);
+}
+
+void Application::setAwayStateWhenFocusLostInVREnabled(bool enabled) {
+    _awayStateWhenFocusLostInVREnabled.set(enabled);
+    emit awayStateWhenFocusLostInVRChanged(enabled);
+}
+
+QUuid Application::getTabletScreenID() const {
+    auto HMD = DependencyManager::get<HMDScriptingInterface>();
+    return HMD->getCurrentTabletScreenID();
+}
+
+QUuid Application::getTabletHomeButtonID() const {
+    auto HMD = DependencyManager::get<HMDScriptingInterface>();
+    return HMD->getCurrentHomeButtonID();
+}
+
+QUuid Application::getTabletFrameID() const {
+    auto HMD = DependencyManager::get<HMDScriptingInterface>();
+    return HMD->getCurrentTabletFrameID();
+}
+
+QVector<QUuid> Application::getTabletIDs() const {
+    // Most important first.
+    QVector<QUuid> result;
+    auto HMD = DependencyManager::get<HMDScriptingInterface>();
+    result << HMD->getCurrentTabletScreenID();
+    result << HMD->getCurrentHomeButtonID();
+    result << HMD->getCurrentTabletFrameID();
+    return result;
+}
+
+void Application::confirmConnectWithoutAvatarEntities() {
+
+    if (_confirmConnectWithoutAvatarEntitiesDialog) {
+        // Dialog is already displayed.
+        return;
+    }
+
+    if (!getMyAvatar()->hasAvatarEntities()) {
+        // No avatar entities so continue with login.
+        DependencyManager::get<NodeList>()->getDomainHandler().setCanConnectWithoutAvatarEntities(true);
+        return;
+    }
+
+    QString continueMessage = "Your wearables will not display on this domain. Continue?";
+    _confirmConnectWithoutAvatarEntitiesDialog = OffscreenUi::asyncQuestion("Continue Without Wearables", continueMessage,
+        QMessageBox::Yes | QMessageBox::No);
+    if (_confirmConnectWithoutAvatarEntitiesDialog->getDialogItem()) {
+        QObject::connect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, [=](QVariant answer) {
+            QObject::disconnect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, nullptr);
+            _confirmConnectWithoutAvatarEntitiesDialog = nullptr;
+            bool shouldConnect = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
+            DependencyManager::get<NodeList>()->getDomainHandler().setCanConnectWithoutAvatarEntities(shouldConnect);
+        });
+    }
+}
+
+void Application::createLoginDialog() {
+    const glm::vec3 LOGIN_DIMENSIONS { 0.89f, 0.5f, 0.01f };
+    const auto OFFSET = glm::vec2(0.7f, -0.1f);
+    auto cameraPosition = _myCamera.getPosition();
+    auto cameraOrientation = _myCamera.getOrientation();
+    auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y;
+    auto headLookVec = (cameraOrientation * Vectors::FRONT);
+    // DEFAULT_DPI / tablet scale percentage
+    const float DPI = 31.0f / (75.0f / 100.0f);
+    auto offset = headLookVec * OFFSET.x;
+    auto position = (cameraPosition + offset) + (upVec * OFFSET.y);
+
+    EntityItemProperties properties;
+    properties.setType(EntityTypes::Web);
+    properties.setName("LoginDialogEntity");
+    properties.setSourceUrl(LOGIN_DIALOG.toString());
+    properties.setPosition(position);
+    properties.setRotation(cameraOrientation);
+    properties.setDimensions(LOGIN_DIMENSIONS);
+    properties.setPrimitiveMode(PrimitiveMode::SOLID);
+    properties.getGrab().setGrabbable(false);
+    properties.setIgnorePickIntersection(false);
+    properties.setAlpha(1.0f);
+    properties.setDPI(DPI);
+    properties.setVisible(true);
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    _loginDialogID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
+
+    auto keyboard = DependencyManager::get<Keyboard>().data();
+    if (!keyboard->getAnchorID().isNull() && !_loginDialogID.isNull()) {
+        auto keyboardLocalOffset = cameraOrientation * glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f);
+
+        EntityItemProperties properties;
+        properties.setPosition(position + keyboardLocalOffset);
+        properties.setRotation(cameraOrientation * Quaternions::Y_180);
+
+        entityScriptingInterface->editEntity(keyboard->getAnchorID(), properties);
+        keyboard->setResetKeyboardPositionOnRaise(false);
+    }
+    setKeyboardFocusEntity(_loginDialogID);
+    emit loginDialogFocusEnabled();
+    getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(false);
+    getApplicationCompositor().getReticleInterface()->setVisible(false);
+    if (!_loginStateManager.isSetUp()) {
+        _loginStateManager.setUp();
+    }
+}
+
+void Application::updateLoginDialogPosition() {
+    const float LOOK_AWAY_THRESHOLD_ANGLE = 70.0f;
+    const auto OFFSET = glm::vec2(0.7f, -0.1f);
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    EntityPropertyFlags desiredProperties;
+    desiredProperties += PROP_POSITION;
+    auto properties = entityScriptingInterface->getEntityPropertiesInternal(_loginDialogID, desiredProperties, false);
+    auto positionVec = properties.getPosition();
+    auto cameraPositionVec = _myCamera.getPosition();
+    auto cameraOrientation = cancelOutRollAndPitch(_myCamera.getOrientation());
+    auto headLookVec = (cameraOrientation * Vectors::FRONT);
+    auto entityToHeadVec = positionVec - cameraPositionVec;
+    auto pointAngle = (glm::acos(glm::dot(glm::normalize(entityToHeadVec), glm::normalize(headLookVec))) * 180.0f / PI);
+    auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y;
+    auto offset = headLookVec * OFFSET.x;
+    auto newPositionVec = (cameraPositionVec + offset) + (upVec * OFFSET.y);
+
+    bool outOfBounds = glm::distance(positionVec, cameraPositionVec) > 1.0f;
+
+    if (pointAngle > LOOK_AWAY_THRESHOLD_ANGLE || outOfBounds) {
+        {
+            EntityItemProperties properties;
+            properties.setPosition(newPositionVec);
+            properties.setRotation(cameraOrientation);
+            entityScriptingInterface->editEntity(_loginDialogID, properties);
+        }
+
+        {
+            glm::vec3 keyboardLocalOffset = cameraOrientation * glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f);
+            glm::quat keyboardOrientation = cameraOrientation * glm::quat(glm::radians(glm::vec3(-30.0f, 180.0f, 0.0f)));
+
+            EntityItemProperties properties;
+            properties.setPosition(newPositionVec + keyboardLocalOffset);
+            properties.setRotation(keyboardOrientation);
+            entityScriptingInterface->editEntity(DependencyManager::get<Keyboard>()->getAnchorID(), properties);
+        }
+    }
+}
+
+void Application::createAvatarInputsBar() {
+    const glm::vec3 LOCAL_POSITION { 0.0, 0.0, -1.0 };
+    // DEFAULT_DPI / tablet scale percentage
+    const float DPI = 31.0f / (75.0f / 100.0f);
+
+    EntityItemProperties properties;
+    properties.setType(EntityTypes::Web);
+    properties.setName("AvatarInputsBarEntity");
+    properties.setSourceUrl(AVATAR_INPUTS_BAR_QML.toString());
+    properties.setParentID(getMyAvatar()->getSelfID());
+    properties.setParentJointIndex(getMyAvatar()->getJointIndex("_CAMERA_MATRIX"));
+    properties.setPosition(LOCAL_POSITION);
+    properties.setLocalRotation(Quaternions::IDENTITY);
+    //properties.setDimensions(LOGIN_DIMENSIONS);
+    properties.setPrimitiveMode(PrimitiveMode::SOLID);
+    properties.getGrab().setGrabbable(false);
+    properties.setIgnorePickIntersection(false);
+    properties.setAlpha(1.0f);
+    properties.setDPI(DPI);
+    properties.setVisible(true);
+
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    _avatarInputsBarID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
+}
+
+void Application::destroyAvatarInputsBar() {
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    if (!_avatarInputsBarID.isNull()) {
+        entityScriptingInterface->deleteEntity(_avatarInputsBarID);
+    }
+}
+
+void Application::showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const {
+    auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet(SYSTEM_TABLET);
+    auto hmd = DependencyManager::get<HMDScriptingInterface>();
+    bool onTablet = false;
+
+    if (!tablet->getToolbarMode()) {
+        onTablet = tablet->pushOntoStack(tabletUrl);
+        if (onTablet) {
+            toggleTabletUI(true);
+        }
+    } else {
+#if !defined(DISABLE_QML)
+        getOffscreenUI()->show(widgetUrl, name);
+#endif
+    }
+}
+
+void Application::loadDialog() {
+    ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_glWidget, tr("Open Script"),
+                                                                 getPreviousScriptLocation(),
+                                                                 tr("JavaScript Files (*.js)"));
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        const QString& response = answer.toString();
+        if (!response.isEmpty() && QFile(response).exists()) {
+            setPreviousScriptLocation(QFileInfo(response).absolutePath());
+            DependencyManager::get<ScriptEngines>()->loadScript(response, true, false, false, true);  // Don't load from cache
+        }
+    });
+}
+
+void Application::loadScriptURLDialog() const {
+    ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
+    connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
+        disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+        const QString& newScript = response.toString();
+        if (QUrl(newScript).scheme() == "atp") {
+            OffscreenUi::asyncWarning("Error Loading Script", "Cannot load client script over ATP");
+        } else if (!newScript.isEmpty()) {
+            DependencyManager::get<ScriptEngines>()->loadScript(newScript.trimmed());
+        }
+    });
+}
+
+void Application::toggleLogDialog() {
+#ifndef ANDROID_APP_QUEST_INTERFACE
+    if (getLoginDialogPoppedUp()) {
+        return;
+    }
+
+    if (!_logDialog) {
+        bool keepOnTop =_keepLogWindowOnTop.get();
+#ifdef Q_OS_WIN
+        _logDialog = new LogDialog(keepOnTop ? qApp->getWindow() : nullptr, getLogger());
+#elif !defined(Q_OS_ANDROID)
+        _logDialog = new LogDialog(nullptr, getLogger());
+
+        if (keepOnTop) {
+            Qt::WindowFlags flags = _logDialog->windowFlags() | Qt::Tool;
+            _logDialog->setWindowFlags(flags);
+        }
+#else
+        Q_UNUSED(keepOnTop)
+#endif
+    }
+
+    if (_logDialog->isVisible()) {
+        _logDialog->hide();
+    } else {
+        _logDialog->show();
+    }
+#endif
+}
+
+void Application::recreateLogWindow(int keepOnTop) {
+    _keepLogWindowOnTop.set(keepOnTop != 0);
+    if (_logDialog) {
+        bool toggle = _logDialog->isVisible();
+        _logDialog->close();
+        _logDialog = nullptr;
+
+        if (toggle) {
+            toggleLogDialog();
+        }
+    }
+}
+
+void Application::toggleEntityScriptServerLogDialog() {
+    if (! _entityScriptServerLogDialog) {
+        _entityScriptServerLogDialog = new EntityScriptServerLogDialog(nullptr);
+    }
+
+    if (_entityScriptServerLogDialog->isVisible()) {
+        _entityScriptServerLogDialog->hide();
+    } else {
+        _entityScriptServerLogDialog->show();
+    }
+}
+
+void Application::showAssetServerWidget(QString filePath) {
+    if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets() || getLoginDialogPoppedUp()) {
+        return;
+    }
+    static const QUrl url { "hifi/AssetServer.qml" };
+
+    auto startUpload = [=](QQmlContext* context, QObject* newObject){
+        if (!filePath.isEmpty()) {
+            emit uploadRequest(filePath);
+        }
+    };
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
+    auto hmd = DependencyManager::get<HMDScriptingInterface>();
+    if (tablet->getToolbarMode()) {
+        getOffscreenUI()->show(url, "AssetServer", startUpload);
+    } else {
+        if (!hmd->getShouldShowTablet() && !isHMDMode()) {
+            getOffscreenUI()->show(url, "AssetServer", startUpload);
+        } else {
+            static const QUrl url("qrc:///qml/hifi/dialogs/TabletAssetServer.qml");
+            if (!tablet->isPathLoaded(url)) {
+                tablet->pushOntoStack(url);
+            }
+        }
+    }
+
+    startUpload(nullptr, nullptr);
+}
+
+void Application::loadAddAvatarBookmarkDialog() const {
+    auto avatarBookmarks = DependencyManager::get<AvatarBookmarks>();
+}
+
+void Application::loadAvatarBrowser() const {
+    auto tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
+    // construct the url to the marketplace item
+    QString url = MetaverseAPI::getCurrentMetaverseServerURL().toString() + "/marketplace?category=avatars";
+
+    QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
+    tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
+    DependencyManager::get<HMDScriptingInterface>()->openTablet();
+}
+
+void Application::showLoginScreen() {
+#if !defined(DISABLE_QML)
+    auto accountManager = DependencyManager::get<AccountManager>();
+    auto dialogsManager = DependencyManager::get<DialogsManager>();
+    if (!accountManager->isLoggedIn()) {
+        if (!isHMDMode()) {
+            auto toolbar =  DependencyManager::get<ToolbarScriptingInterface>()->getToolbar("com.highfidelity.interface.toolbar.system");
+            toolbar->writeProperty("visible", false);
+        }
+        _loginDialogPoppedUp = true;
+        dialogsManager->showLoginDialog();
+        emit loginDialogFocusEnabled();
+        QJsonObject loginData = {};
+        loginData["action"] = "login dialog popped up";
+        UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
+        _window->setWindowTitle("Overte");
+    } else {
+        resumeAfterLoginDialogActionTaken();
+    }
+    _loginDialogPoppedUp = !accountManager->isLoggedIn();
+#else
+    resumeAfterLoginDialogActionTaken();
+#endif
+}
+
+void Application::showHelp() {
+    static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
+    static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
+    static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR";
+
+    static const QString VIVE_PLUGIN_NAME = "HTC Vive";
+    static const QString OCULUS_RIFT_PLUGIN_NAME = "Oculus Rift";
+    static const QString WINDOWS_MR_PLUGIN_NAME = "WindowsMR";
+
+    static const QString TAB_KEYBOARD_MOUSE = "kbm";
+    static const QString TAB_GAMEPAD = "gamepad";
+    static const QString TAB_HAND_CONTROLLERS = "handControllers";
+
+    QString handControllerName;
+    QString defaultTab = TAB_KEYBOARD_MOUSE;
+
+    if (PluginUtils::isHMDAvailable(WINDOWS_MR_PLUGIN_NAME)) {
+        defaultTab = TAB_HAND_CONTROLLERS;
+        handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR;
+    } else if (PluginUtils::isHMDAvailable(VIVE_PLUGIN_NAME)) {
+        defaultTab = TAB_HAND_CONTROLLERS;
+        handControllerName = HAND_CONTROLLER_NAME_VIVE;
+    } else if (PluginUtils::isHMDAvailable(OCULUS_RIFT_PLUGIN_NAME)) {
+        if (PluginUtils::isOculusTouchControllerAvailable()) {
+            defaultTab = TAB_HAND_CONTROLLERS;
+            handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
+        } else if (PluginUtils::isXboxControllerAvailable()) {
+            defaultTab = TAB_GAMEPAD;
+        } else {
+            defaultTab = TAB_KEYBOARD_MOUSE;
+        }
+    } else if (PluginUtils::isXboxControllerAvailable()) {
+        defaultTab = TAB_GAMEPAD;
+    } else {
+        defaultTab = TAB_KEYBOARD_MOUSE;
+    }
+
+    QUrlQuery queryString;
+    queryString.addQueryItem("handControllerName", handControllerName);
+    queryString.addQueryItem("defaultTab", defaultTab);
+    TabletProxy* tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet(SYSTEM_TABLET));
+    tablet->gotoWebScreen(PathUtils::resourcesUrl() + INFO_HELP_PATH + "?" + queryString.toString());
+    DependencyManager::get<HMDScriptingInterface>()->openTablet();
+    //InfoView::show(INFO_HELP_PATH, false, queryString.toString());
+}
+
+void Application::updateSystemTabletMode() {
+    if (_settingsLoaded && !getLoginDialogPoppedUp()) {
+        qApp->setProperty(hifi::properties::HMD, isHMDMode());
+        if (isHMDMode()) {
+            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
+        } else {
+            DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
+        }
+    }
+}
+
+void Application::captureMouseChanged(bool captureMouse) {
+    _captureMouse = captureMouse;
+    if (_captureMouse) {
+        _glWidget->setCursor(QCursor(Qt::BlankCursor));
+    } else {
+        _mouseCaptureTarget = QPointF(NAN, NAN);
+        _glWidget->unsetCursor();
+    }
+}
+
+void Application::toggleOverlays() {
+    auto menu = Menu::getInstance();
+    menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays));
+}
+
+void Application::setOverlaysVisible(bool visible) {
+    auto menu = Menu::getInstance();
+    menu->setIsOptionChecked(MenuOption::Overlays, visible);
+}
+
+void Application::addAssetToWorldMessageClose() {
+    // Clear messages, e.g., if Interface is being closed or domain changes.
+
+    /*
+    Call if user manually closes message box.
+    Call if domain changes.
+    Call if application is shutting down.
+
+    Stop timers.
+    Close the message box if open.
+    Clear lists.
+    */
+
+    _addAssetToWorldInfoTimer.stop();
+    _addAssetToWorldErrorTimer.stop();
+
+    if (_addAssetToWorldMessageBox) {
+        disconnect(_addAssetToWorldMessageBox);
+        _addAssetToWorldMessageBox->setVisible(false);
+        _addAssetToWorldMessageBox->deleteLater();
+        _addAssetToWorldMessageBox = nullptr;
+    }
+
+    _addAssetToWorldInfoKeys.clear();
+    _addAssetToWorldInfoMessages.clear();
+}
+
+void Application::loadLODToolsDialog() {
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
+    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
+        auto dialogsManager = DependencyManager::get<DialogsManager>();
+        dialogsManager->lodTools();
+    } else {
+        tablet->pushOntoStack("hifi/dialogs/TabletLODTools.qml");
+    }
+}
+
+void Application::loadEntityStatisticsDialog() {
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
+    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
+        auto dialogsManager = DependencyManager::get<DialogsManager>();
+        dialogsManager->octreeStatsDetails();
+    } else {
+        tablet->pushOntoStack("hifi/dialogs/TabletEntityStatistics.qml");
+    }
+}
+
+void Application::loadDomainConnectionDialog() {
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
+    if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
+        auto dialogsManager = DependencyManager::get<DialogsManager>();
+        dialogsManager->showDomainConnectionDialog();
+    } else {
+        tablet->pushOntoStack("hifi/dialogs/TabletDCDialog.qml");
+    }
+}
+
+void Application::showScriptLogs() {
+    QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
+    defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/debugging/debugWindow.js");
+    DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
+}
+
+void Application::setPreferredCursor(const QString& cursorName) {
+    qCDebug(interfaceapp) << "setPreferredCursor" << cursorName;
+
+    if (_displayPlugin && _displayPlugin->isHmd()) {
+        _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
+    } else {
+        _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
+    }
+
+    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
+}
+
+void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
+    Stats::show();
+    AnimStats::show();
+    auto surfaceContext = getOffscreenUI()->getSurfaceContext();
+    surfaceContext->setContextProperty("Stats", Stats::getInstance());
+    surfaceContext->setContextProperty("AnimStats", AnimStats::getInstance());
+
+#if !defined(Q_OS_ANDROID)
+    auto offscreenUi = getOffscreenUI();
+    auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
+    offscreenUi->show(qml, "AvatarInputsBar");
+#endif
+}
+
+void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
+    auto engine = surfaceContext->engine();
+    // in Qt 5.10.0 there is already an "Audio" object in the QML context
+    // though I failed to find it (from QtMultimedia??). So..  let it be "AudioScriptingInterface"
+    surfaceContext->setContextProperty("AudioScriptingInterface", DependencyManager::get<AudioScriptingInterface>().data());
+
+    surfaceContext->setContextProperty("AudioStats", DependencyManager::get<AudioClient>()->getStats().data());
+    surfaceContext->setContextProperty("AudioScope", DependencyManager::get<AudioScope>().data());
+
+    surfaceContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
+    surfaceContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
+    surfaceContext->setContextProperty("Performance", new PerformanceScriptingInterface());
+    _fileDownload = new ArchiveDownloadInterface(engine);
+    surfaceContext->setContextProperty("File", _fileDownload);
+    connect(_fileDownload, &ArchiveDownloadInterface::unzipResult, this, &Application::handleUnzip);
+    surfaceContext->setContextProperty("MyAvatar", getMyAvatar().get());
+    surfaceContext->setContextProperty("Messages", DependencyManager::get<MessagesClient>().data());
+    surfaceContext->setContextProperty("Recording", DependencyManager::get<RecordingScriptingInterface>().data());
+    surfaceContext->setContextProperty("Preferences", DependencyManager::get<Preferences>().data());
+    surfaceContext->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
+    surfaceContext->setContextProperty("FrameTimings", &_graphicsEngine->_frameTimingsScriptingInterface);
+    surfaceContext->setContextProperty("Rates", new RatesScriptingInterface(this));
+
+    surfaceContext->setContextProperty("TREE_SCALE", TREE_SCALE);
+    // FIXME Quat and Vec3 won't work with QJSEngine used by QML
+    surfaceContext->setContextProperty("Quat", new Quat());
+    surfaceContext->setContextProperty("Vec3", new Vec3());
+    surfaceContext->setContextProperty("Uuid", new ScriptUUID());
+    surfaceContext->setContextProperty("Assets", DependencyManager::get<AssetMappingsScriptingInterface>().data());
+    surfaceContext->setContextProperty("Keyboard", DependencyManager::get<KeyboardScriptingInterface>().data());
+
+    surfaceContext->setContextProperty("AvatarList", DependencyManager::get<AvatarManager>().data());
+    surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
+
+    surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
+    surfaceContext->setContextProperty("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
+    surfaceContext->setContextProperty("Camera", &_myCamera);
+
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+    surfaceContext->setContextProperty("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
+#endif
+
+    surfaceContext->setContextProperty("Overlays", &_overlays);
+    surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
+    surfaceContext->setContextProperty("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
+    surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
+    surfaceContext->setContextProperty("Settings", new QMLSettingsScriptingInterface(surfaceContext));
+    surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
+    surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
+    surfaceContext->setContextProperty("LocationBookmarks", DependencyManager::get<LocationBookmarks>().data());
+
+    // Caches
+    surfaceContext->setContextProperty("AnimationCache", DependencyManager::get<AnimationCacheScriptingInterface>().data());
+    surfaceContext->setContextProperty("TextureCache", DependencyManager::get<TextureCacheScriptingInterface>().data());
+    surfaceContext->setContextProperty("MaterialCache", DependencyManager::get<MaterialCacheScriptingInterface>().data());
+    surfaceContext->setContextProperty("ModelCache", DependencyManager::get<ModelCacheScriptingInterface>().data());
+    surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data());
+
+    surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
+
+    surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
+    surfaceContext->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
+
+    surfaceContext->setContextProperty("DialogsManager", _dialogsManagerScriptingInterface);
+    surfaceContext->setContextProperty("AvatarManager", DependencyManager::get<AvatarManager>().data());
+    surfaceContext->setContextProperty("LODManager", DependencyManager::get<LODManager>().data());
+    surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
+    surfaceContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
+    surfaceContext->setContextProperty("Render", RenderScriptingInterface::getInstance());
+    surfaceContext->setContextProperty("PlatformInfo", PlatformInfoScriptingInterface::getInstance());
+    surfaceContext->setContextProperty("Workload", _gameWorkload._engine->getConfiguration().get());
+    surfaceContext->setContextProperty("Reticle", getApplicationCompositor().getReticleInterface());
+    surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
+
+    surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());
+
+    surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
+    surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
+    surfaceContext->setContextProperty("About", AboutUtil::getInstance());
+    surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());  // Deprecated
+    surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
+    surfaceContext->setContextProperty("ExternalResource", ExternalResource::getInstance());
+
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
+    }
+
+    _window->setMenuBar(new Menu());
+}
+
+void Application::showDesktop() {}
+
+void Application::notifyPacketVersionMismatch() {
+    if (!_notifiedPacketVersionMismatchThisDomain && !isInterstitialMode()) {
+        _notifiedPacketVersionMismatchThisDomain = true;
+
+        QString message = "The location you are visiting is running an incompatible server version.\n";
+        message += "Content may not display properly.";
+
+        OffscreenUi::asyncWarning("", message);
+    }
+}
+
+bool Application::askToSetAvatarUrl(const QString& url) {
+    QUrl realUrl(url);
+    if (realUrl.isLocalFile()) {
+        OffscreenUi::asyncWarning("", "You can not use local files for avatar components.");
+        return false;
+    }
+
+    // Download the FST file, to attempt to determine its model type
+    QVariantHash fstMapping = FSTReader::downloadMapping(url);
+
+    FSTReader::ModelType modelType = FSTReader::predictModelType(fstMapping);
+
+    QString modelName = fstMapping["name"].toString();
+    QString modelLicense = fstMapping["license"].toString();
+
+    bool agreeToLicense = true; // assume true
+    //create set avatar callback
+    auto setAvatar = [=] (QString url, QString modelName) {
+        ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Set Avatar",
+                                                              "Would you like to use '" + modelName + "' for your avatar?",
+                                                              QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
+        QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+
+            bool ok = (QMessageBox::Ok == static_cast<QMessageBox::StandardButton>(answer.toInt()));
+            if (ok) {
+                getMyAvatar()->useFullAvatarURL(url, modelName);
+                emit fullAvatarURLChanged(url, modelName);
+            } else {
+                qCDebug(interfaceapp) << "Declined to use the avatar";
+            }
+        });
+    };
+
+    if (!modelLicense.isEmpty()) {
+        // word wrap the license text to fit in a reasonable shaped message box.
+        const int MAX_CHARACTERS_PER_LINE = 90;
+        modelLicense = simpleWordWrap(modelLicense, MAX_CHARACTERS_PER_LINE);
+
+        ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Avatar Usage License",
+                                                              modelLicense + "\nDo you agree to these terms?",
+                                                              QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+        QObject::connect(dlg, &ModalDialogListener::response, this, [=, &agreeToLicense] (QVariant answer) {
+            QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+
+            agreeToLicense = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
+            if (agreeToLicense) {
+                switch (modelType) {
+                    case FSTReader::HEAD_AND_BODY_MODEL: {
+                    setAvatar(url, modelName);
+                    break;
+                }
+                default:
+                    OffscreenUi::asyncWarning("", modelName + "Does not support a head and body as required.");
+                    break;
+                }
+            } else {
+                qCDebug(interfaceapp) << "Declined to agree to avatar license";
+            }
+
+            //auto offscreenUi = getOffscreenUI();
+        });
+    } else {
+        setAvatar(url, modelName);
+    }
+
+    return true;
+}
+
+bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
+    QString shortName = scriptFilenameOrURL;
+
+    QUrl scriptURL { scriptFilenameOrURL };
+
+    if (scriptURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
+        int startIndex = shortName.lastIndexOf('/') + 1;
+        int endIndex = shortName.lastIndexOf('?');
+        shortName = shortName.mid(startIndex, endIndex - startIndex);
+    }
+
+#ifdef DISABLE_QML
+    DependencyManager::get<ScriptEngines>()->loadScript(scriptFilenameOrURL);
+#else
+    QString message = "Would you like to run this script:\n" + shortName;
+    ModalDialogListener* dlg = OffscreenUi::asyncQuestion(getWindow(), "Run Script", message,
+                                                           QMessageBox::Yes | QMessageBox::No);
+
+    QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+        const QString& fileName = scriptFilenameOrURL;
+        if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
+            qCDebug(interfaceapp) << "Chose to run the script: " << fileName;
+            DependencyManager::get<ScriptEngines>()->loadScript(fileName);
+        } else {
+            qCDebug(interfaceapp) << "Declined to run the script";
+        }
+        QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+    });
+#endif
+    return true;
+}
+
+bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
+    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
+    QNetworkRequest networkRequest = QNetworkRequest(url);
+    networkRequest.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
+    networkRequest.setHeader(QNetworkRequest::UserAgentHeader, NetworkingConstants::OVERTE_USER_AGENT);
+    QNetworkReply* reply = networkAccessManager.get(networkRequest);
+    int requestNumber = ++_avatarAttachmentRequest;
+    connect(reply, &QNetworkReply::finished, [this, reply, url, requestNumber]() {
+
+        if (requestNumber != _avatarAttachmentRequest) {
+            // this request has been superseded by another more recent request
+            reply->deleteLater();
+            return;
+        }
+
+        QNetworkReply::NetworkError networkError = reply->error();
+        if (networkError == QNetworkReply::NoError) {
+            // download success
+            QByteArray contents = reply->readAll();
+
+            QJsonParseError jsonError;
+            auto doc = QJsonDocument::fromJson(contents, &jsonError);
+            if (jsonError.error == QJsonParseError::NoError) {
+
+                auto jsonObject = doc.object();
+
+                // retrieve optional name field from JSON
+                QString name = tr("Unnamed Attachment");
+                auto nameValue = jsonObject.value("name");
+                if (nameValue.isString()) {
+                    name = nameValue.toString();
+                }
+
+                auto avatarAttachmentConfirmationTitle = tr("Avatar Attachment Confirmation");
+                auto avatarAttachmentConfirmationMessage = tr("Would you like to wear '%1' on your avatar?").arg(name);
+                ModalDialogListener* dlg = OffscreenUi::asyncQuestion(avatarAttachmentConfirmationTitle,
+                                           avatarAttachmentConfirmationMessage,
+                                           QMessageBox::Ok | QMessageBox::Cancel);
+                QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
+                    QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
+                    if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
+                        // add attachment to avatar
+                        auto myAvatar = getMyAvatar();
+                        assert(myAvatar);
+                        auto attachmentDataVec = myAvatar->getAttachmentData();
+                        AttachmentData attachmentData;
+                        attachmentData.fromJson(jsonObject);
+                        attachmentDataVec.push_back(attachmentData);
+                        myAvatar->setAttachmentData(attachmentDataVec);
+                    } else {
+                        qCDebug(interfaceapp) << "User declined to wear the avatar attachment";
+                    }
+                });
+            } else {
+                // json parse error
+                auto avatarAttachmentParseErrorString = tr("Error parsing attachment JSON from url: \"%1\"");
+                displayAvatarAttachmentWarning(avatarAttachmentParseErrorString.arg(url));
+            }
+        } else {
+            // download failure
+            auto avatarAttachmentDownloadErrorString = tr("Error downloading attachment JSON from url: \"%1\"");
+            displayAvatarAttachmentWarning(avatarAttachmentDownloadErrorString.arg(url));
+        }
+        reply->deleteLater();
+    });
+    return true;
+}
+
+void Application::displayAvatarAttachmentWarning(const QString& message) const {
+    auto avatarAttachmentWarningTitle = tr("Avatar Attachment Failure");
+    OffscreenUi::asyncWarning(avatarAttachmentWarningTitle, message);
+}
+
+bool Application::askToReplaceDomainContent(const QString& url) {
+    QString methodDetails;
+    const int MAX_CHARACTERS_PER_LINE = 90;
+    if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
+        QUrl originURL { url };
+        if (originURL.host().endsWith(NetworkingConstants::HF_MARKETPLACE_CDN_HOSTNAME)) {
+            // Create a confirmation dialog when this call is made
+            static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
+                "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
+                "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
+                "\nhttps://docs.overte.org/host/maintain-domain/backup-domain.html";
+
+            ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
+                                                                  infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+
+            QObject::connect(dig, &ModalDialogListener::response, this, [=] (QVariant answer) {
+                QString details;
+                if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
+                    // Given confirmation, send request to domain server to replace content
+                    replaceDomainContent(url, QString());
+                    details = "SuccessfulRequestToReplaceContent";
+                } else {
+                    details = "UserDeclinedToReplaceContent";
+                }
+                QJsonObject messageProperties = {
+                    { "status", details },
+                    { "content_set_url", url }
+                };
+                UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
+                QObject::disconnect(dig, &ModalDialogListener::response, this, nullptr);
+            });
+        } else {
+            methodDetails = "ContentSetDidNotOriginateFromMarketplace";
+            QJsonObject messageProperties = {
+                { "status", methodDetails },
+                { "content_set_url", url }
+            };
+            UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
+        }
+    } else {
+            methodDetails = "UserDoesNotHavePermissionToReplaceContent";
+            static const QString warningMessage = simpleWordWrap("The domain owner must enable 'Replace Content' "
+                "permissions for you in this domain's server settings before you can continue.", MAX_CHARACTERS_PER_LINE);
+            OffscreenUi::asyncWarning("You do not have permissions to replace domain content", warningMessage,
+                                 QMessageBox::Ok, QMessageBox::Ok);
+
+            QJsonObject messageProperties = {
+                { "status", methodDetails },
+                { "content_set_url", url }
+            };
+            UserActivityLogger::getInstance().logAction("replace_domain_content", messageProperties);
+    }
+    return true;
+}
+
+void Application::onDismissedLoginDialog() {
+    _loginDialogPoppedUp = false;
+    auto keyboard = DependencyManager::get<Keyboard>().data();
+    keyboard->setResetKeyboardPositionOnRaise(true);
+    if (!_loginDialogID.isNull()) {
+        DependencyManager::get<EntityScriptingInterface>()->deleteEntity(_loginDialogID);
+        _loginDialogID = QUuid();
+        _loginStateManager.tearDown();
+    }
+    resumeAfterLoginDialogActionTaken();
+}
+
+bool Application::initMenu() {
+    _isMenuInitialized = false;
+    qApp->getWindow()->menuBar();
+    return true;
+}
+
+void Application::pauseUntilLoginDetermined() {
+    if (QThread::currentThread() != qApp->thread()) {
+        QMetaObject::invokeMethod(this, "pauseUntilLoginDetermined");
+        return;
+    }
+
+    auto myAvatar = getMyAvatar();
+    _previousAvatarTargetScale = myAvatar->getTargetScale();
+    _previousAvatarSkeletonModel = myAvatar->getSkeletonModelURL().toString();
+    myAvatar->setTargetScale(1.0f);
+    myAvatar->setSkeletonModelURLFromScript(myAvatar->defaultFullAvatarModelUrl().toString());
+    myAvatar->setEnableMeshVisible(false);
+
+    _controllerScriptingInterface->disableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
+
+    {
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
+        if (userInputMapper->loadMapping(NO_MOVEMENT_MAPPING_JSON)) {
+            _controllerScriptingInterface->enableMapping(NO_MOVEMENT_MAPPING_NAME);
+        }
+    }
+
+    const auto& nodeList = DependencyManager::get<NodeList>();
+    // save interstitial mode setting until resuming.
+    _interstitialModeEnabled = nodeList->getDomainHandler().getInterstitialModeEnabled();
+    nodeList->getDomainHandler().setInterstitialModeEnabled(false);
+
+    auto menu = Menu::getInstance();
+    menu->getMenu("Edit")->setVisible(false);
+    menu->getMenu("View")->setVisible(false);
+    menu->getMenu("Navigate")->setVisible(false);
+    menu->getMenu("Settings")->setVisible(false);
+    _developerMenuVisible = menu->getMenu("Developer")->isVisible();
+    menu->setIsOptionChecked(MenuOption::Stats, false);
+    if (_developerMenuVisible) {
+        menu->getMenu("Developer")->setVisible(false);
+    }
+    _previousCameraMode = _myCamera.getMode();
+    _myCamera.setMode(CAMERA_MODE_FIRST_PERSON_LOOK_AT);
+    cameraModeChanged();
+
+    // disconnect domain handler.
+    nodeList->getDomainHandler().disconnect("Pause until login determined");
+
+    // From now on, it's permissible to call resumeAfterLoginDialogActionTaken()
+    _resumeAfterLoginDialogActionTaken_SafeToRun = true;
+
+    if (_resumeAfterLoginDialogActionTaken_WasPostponed) {
+        // resumeAfterLoginDialogActionTaken() was already called, but it aborted. Now it's safe to call it again.
+        resumeAfterLoginDialogActionTaken();
+    }
+}
+
+void Application::resumeAfterLoginDialogActionTaken() {
+    if (QThread::currentThread() != qApp->thread()) {
+        QMetaObject::invokeMethod(this, "resumeAfterLoginDialogActionTaken");
+        return;
+    }
+
+    if (!_resumeAfterLoginDialogActionTaken_SafeToRun) {
+        _resumeAfterLoginDialogActionTaken_WasPostponed = true;
+        return;
+    }
+
+#if !defined(DISABLE_QML)
+    if (!isHMDMode() && getDesktopTabletBecomesToolbarSetting()) {
+        auto toolbar = DependencyManager::get<ToolbarScriptingInterface>()->getToolbar("com.highfidelity.interface.toolbar.system");
+        toolbar->writeProperty("visible", true);
+    } else {
+        getApplicationCompositor().getReticleInterface()->setAllowMouseCapture(true);
+        getApplicationCompositor().getReticleInterface()->setVisible(true);
+    }
+
+    updateSystemTabletMode();
+#endif
+
+    {
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
+        userInputMapper->unloadMapping(NO_MOVEMENT_MAPPING_JSON);
+        _controllerScriptingInterface->disableMapping(NO_MOVEMENT_MAPPING_NAME);
+    }
+
+    auto myAvatar = getMyAvatar();
+    myAvatar->setTargetScale(_previousAvatarTargetScale);
+    myAvatar->setSkeletonModelURLFromScript(_previousAvatarSkeletonModel);
+    myAvatar->setEnableMeshVisible(true);
+
+    _controllerScriptingInterface->enableMapping(STANDARD_TO_ACTION_MAPPING_NAME);
+
+    const auto& nodeList = DependencyManager::get<NodeList>();
+    nodeList->getDomainHandler().setInterstitialModeEnabled(_interstitialModeEnabled);
+    {
+        auto scriptEngines = DependencyManager::get<ScriptEngines>().data();
+        // this will force the model the look at the correct directory (weird order of operations issue)
+        scriptEngines->reloadLocalFiles();
+
+        // if the --scripts command-line argument was used.
+        if (_overrideDefaultScriptsLocation && _defaultScriptsLocation.exists()) {
+            scriptEngines->loadDefaultScripts();
+            scriptEngines->defaultScriptsLocationOverridden(true);
+        } else {
+            scriptEngines->loadScripts();
+        }
+    }
+
+    auto accountManager = DependencyManager::get<AccountManager>();
+    auto addressManager = DependencyManager::get<AddressManager>();
+
+    // restart domain handler.
+    nodeList->getDomainHandler().resetting();
+
+    QVariant testProperty = property(hifi::properties::TEST);
+    if (testProperty.isValid()) {
+        const auto testScript = property(hifi::properties::TEST).toUrl();
+        // Set last parameter to exit interface when the test script finishes, if so requested
+        DependencyManager::get<ScriptEngines>()->loadScript(testScript, false, false, false, false, _quitWhenFinished);
+        // This is done so we don't get a "connection time-out" message when we haven't passed in a URL.
+        if (!_urlParam.isEmpty()) {
+            auto reply = SandboxUtils::getStatus();
+            connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
+        }
+    } else {
+        auto reply = SandboxUtils::getStatus();
+        connect(reply, &QNetworkReply::finished, this, [this, reply] { handleSandboxStatus(reply); });
+    }
+
+    auto menu = Menu::getInstance();
+    menu->getMenu("Edit")->setVisible(true);
+    menu->getMenu("View")->setVisible(true);
+    menu->getMenu("Navigate")->setVisible(true);
+    menu->getMenu("Settings")->setVisible(true);
+    menu->getMenu("Developer")->setVisible(_developerMenuVisible);
+    _myCamera.setMode(_previousCameraMode);
+    cameraModeChanged();
+    _startUpFinished = true;
+    getRefreshRateManager().setRefreshRateRegime(RefreshRateManager::RefreshRateRegime::FOCUS_ACTIVE);
+}
+
+QSharedPointer<OffscreenUi> Application::getOffscreenUI() {
+#if !defined(DISABLE_QML)
+    return DependencyManager::get<OffscreenUi>();
+#else
+    return nullptr;
+#endif
+}
+
+void Application::updateDialogs(float deltaTime) const {
+    PerformanceTimer perfTimer("updateDialogs");
+    bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
+    PerformanceWarning warn(showWarnings, "Application::updateDialogs()");
+    auto dialogsManager = DependencyManager::get<DialogsManager>();
+
+    QPointer<OctreeStatsDialog> octreeStatsDialog = dialogsManager->getOctreeStatsDialog();
+    if (octreeStatsDialog) {
+        octreeStatsDialog->update();
+    }
+}
+
+void Application::maybeToggleMenuVisible(QMouseEvent* event) const {
+#ifndef Q_OS_MAC
+    // If in full screen, and our main windows menu bar is hidden, and we're close to the top of the QMainWindow
+    // then show the menubar.
+    if (_window->isFullScreen()) {
+        QMenuBar* menuBar = _window->menuBar();
+        if (menuBar) {
+            static const int MENU_TOGGLE_AREA = 10;
+            if (!menuBar->isVisible()) {
+                if (event->pos().y() <= MENU_TOGGLE_AREA) {
+                    menuBar->setVisible(true);
+                }
+            }  else {
+                if (event->pos().y() > MENU_TOGGLE_AREA) {
+                    menuBar->setVisible(false);
+                }
+            }
+        }
+    }
+#endif
+}
+
+void Application::toggleTabletUI(bool shouldOpen) const {
+    auto hmd = DependencyManager::get<HMDScriptingInterface>();
+    if (!(shouldOpen && hmd->getShouldShowTablet())) {
+        auto HMD = DependencyManager::get<HMDScriptingInterface>();
+        HMD->toggleShouldShowTablet();
+
+        if (!HMD->getShouldShowTablet()) {
+            DependencyManager::get<Keyboard>()->setRaised(false);
+            _window->activateWindow();
+            auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet(SYSTEM_TABLET);
+            tablet->unfocus();
+        }
+    }
+}
+
+bool Application::shouldCaptureMouse() const {
+    return _captureMouse && _glWidget->isActiveWindow() && !ui::Menu::isSomeSubmenuShown();
+}
+
+void Application::checkChangeCursor() {
+    QMutexLocker locker(&_changeCursorLock);
+    if (_cursorNeedsChanging) {
+#ifdef Q_OS_MAC
+        auto cursorTarget = _window; // OSX doesn't seem to provide for hiding the cursor only on the GL widget
+#else
+        // On windows and linux, hiding the top level cursor also means it's invisible when hovering over the
+        // window menu, which is a pain, so only hide it for the GL surface
+        auto cursorTarget = _glWidget;
+#endif
+        cursorTarget->setCursor(_desiredCursor);
+
+        _cursorNeedsChanging = false;
+    }
+}
+
+void Application::addAssetToWorldInfo(QString modelName, QString infoText) {
+    // Displays the most recent info message, subject to being overridden by error messages.
+
+    if (_aboutToQuit) {
+        return;
+    }
+
+    /*
+    Cancel info timer if running.
+    If list has an entry for modelName, delete it (just one).
+    Append modelName, infoText to list.
+    Display infoText in message box unless an error is being displayed (i.e., error timer is running).
+    Show message box if not already visible.
+    */
+
+    _addAssetToWorldInfoTimer.stop();
+
+    addAssetToWorldInfoClear(modelName);
+
+    _addAssetToWorldInfoKeys.append(modelName);
+    _addAssetToWorldInfoMessages.append(infoText);
+
+    if (!_addAssetToWorldErrorTimer.isActive()) {
+        if (!_addAssetToWorldMessageBox) {
+            _addAssetToWorldMessageBox = getOffscreenUI()->createMessageBox(OffscreenUi::ICON_INFORMATION,
+                "Downloading Model", "", QMessageBox::NoButton, QMessageBox::NoButton);
+            connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed()));
+        }
+
+        _addAssetToWorldMessageBox->setProperty("text", "\n" + infoText);
+        _addAssetToWorldMessageBox->setVisible(true);
+    }
+}
+
+void Application::addAssetToWorldInfoClear(QString modelName) {
+    // Clears modelName entry from message list without affecting message currently displayed.
+
+    if (_aboutToQuit) {
+        return;
+    }
+
+    /*
+    Delete entry for modelName from list.
+    */
+
+    auto index = _addAssetToWorldInfoKeys.indexOf(modelName);
+    if (index > -1) {
+        _addAssetToWorldInfoKeys.removeAt(index);
+        _addAssetToWorldInfoMessages.removeAt(index);
+    }
+}
+
+void Application::addAssetToWorldInfoDone(QString modelName) {
+    // Continues to display this message if the latest for a few seconds, then deletes it and displays the next latest.
+
+    if (_aboutToQuit) {
+        return;
+    }
+
+    /*
+    Delete entry for modelName from list.
+    (Re)start the info timer to update message box. ... onAddAssetToWorldInfoTimeout()
+    */
+
+    addAssetToWorldInfoClear(modelName);
+    _addAssetToWorldInfoTimer.start();
+}
+
+void Application::addAssetToWorldError(QString modelName, QString errorText) {
+    // Displays the most recent error message for a few seconds.
+
+    if (_aboutToQuit) {
+        return;
+    }
+
+    /*
+    If list has an entry for modelName, delete it.
+    Display errorText in message box.
+    Show message box if not already visible.
+    (Re)start error timer. ... onAddAssetToWorldErrorTimeout()
+    */
+
+    addAssetToWorldInfoClear(modelName);
+
+    if (!_addAssetToWorldMessageBox) {
+        _addAssetToWorldMessageBox = getOffscreenUI()->createMessageBox(OffscreenUi::ICON_INFORMATION,
+            "Downloading Model", "", QMessageBox::NoButton, QMessageBox::NoButton);
+        connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed()));
+    }
+
+    _addAssetToWorldMessageBox->setProperty("text", "\n" + errorText);
+    _addAssetToWorldMessageBox->setVisible(true);
+
+    _addAssetToWorldErrorTimer.start();
+}
diff --git a/interface/src/CrashRecoveryHandler.cpp b/interface/src/CrashRecoveryHandler.cpp
index 1f6cbef9ba6..a3481b474ac 100644
--- a/interface/src/CrashRecoveryHandler.cpp
+++ b/interface/src/CrashRecoveryHandler.cpp
@@ -26,8 +26,6 @@
 #include "Application.h"
 #include "Menu.h"
 
-
-
 #include <RunningMarker.h>
 #include <SettingHandle.h>
 #include <SettingHelpers.h>
@@ -40,7 +38,6 @@
 bool CrashRecoveryHandler::checkForResetSettings(bool wasLikelyCrash, bool suppressPrompt) {
     Setting::Handle<bool> crashReportingAsked { "CrashReportingAsked", false };
 
-
     Settings settings;
     settings.beginGroup("Developer");
     QVariant displayCrashOptions = settings.value(MenuOption::DisplayCrashOptions);
@@ -94,8 +91,6 @@ bool CrashRecoveryHandler::suggestCrashReporting() {
     QString explainText;
     auto &ch = CrashHandler::getInstance();
 
-
-
     switch(BuildInfo::BUILD_TYPE) {
         case BuildInfo::BuildType::Dev:
             explainText = "You're running a pre-release version. This is an official release, but the code\n"
@@ -288,4 +283,3 @@ void CrashRecoveryHandler::handleCrash(CrashRecoveryHandler::Action action) {
         settings.setValue(TUTORIAL_COMPLETE_FLAG_KEY, tutorialComplete);
     }
 }
-
diff --git a/interface/src/CrashRecoveryHandler.h b/interface/src/CrashRecoveryHandler.h
index c0105e90456..429dc1f8372 100644
--- a/interface/src/CrashRecoveryHandler.h
+++ b/interface/src/CrashRecoveryHandler.h
@@ -14,11 +14,6 @@
 
 #include <QString>
 
-
-
-
-
-
 class CrashRecoveryHandler {
 
 public:
diff --git a/interface/src/DeadlockWatchdog.cpp b/interface/src/DeadlockWatchdog.cpp
new file mode 100644
index 00000000000..f734f6bf3a2
--- /dev/null
+++ b/interface/src/DeadlockWatchdog.cpp
@@ -0,0 +1,22 @@
+//
+//  DeadlockWatchdog.cpp
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#include "DeadlockWatchdog.h"
+
+std::atomic<bool> DeadlockWatchdogThread::_paused;
+std::atomic<uint64_t> DeadlockWatchdogThread::_heartbeat;
+std::atomic<uint64_t> DeadlockWatchdogThread::_maxElapsed;
+std::atomic<int> DeadlockWatchdogThread::_maxElapsedAverage;
+ThreadSafeMovingAverage<int, DeadlockWatchdogThread::HEARTBEAT_SAMPLES> DeadlockWatchdogThread::_movingAverage;
diff --git a/interface/src/DeadlockWatchdog.h b/interface/src/DeadlockWatchdog.h
new file mode 100644
index 00000000000..ad206a81ad6
--- /dev/null
+++ b/interface/src/DeadlockWatchdog.h
@@ -0,0 +1,159 @@
+//
+//  DeadlockWatchdog.h
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef hifi_DeadlockWatchdog_h
+#define hifi_DeadlockWatchdog_h
+
+#include <QThread>
+
+#include <NumericalConstants.h>
+#include <SharedUtil.h>
+#include <crash-handler/CrashHandler.h>
+
+#include "InterfaceLogging.h"
+#include "SimpleMovingAverage.h"
+
+class DeadlockWatchdogThread : public QThread {
+public:
+    static const unsigned long HEARTBEAT_UPDATE_INTERVAL_SECS = 1;
+    static const unsigned long MAX_HEARTBEAT_AGE_USECS = 120 * USECS_PER_SECOND; // 2 mins with no checkin probably a deadlock
+    static const int WARNING_ELAPSED_HEARTBEAT = 500 * USECS_PER_MSEC; // warn if elapsed heartbeat average is large
+    static const int HEARTBEAT_SAMPLES = 100000; // ~5 seconds worth of samples
+
+    // Set the heartbeat on launch
+    DeadlockWatchdogThread() {
+        setObjectName("Deadlock Watchdog");
+        // Give the heartbeat an initial value
+        _heartbeat = usecTimestampNow();
+        _paused = false;
+        connect(qApp, &QCoreApplication::aboutToQuit, [this] {
+            _quit = true;
+        });
+    }
+
+    void setMainThreadID(Qt::HANDLE threadID) {
+        _mainThreadID = threadID;
+    }
+
+    static void updateHeartbeat() {
+        auto now = usecTimestampNow();
+        auto elapsed = now - _heartbeat;
+        _movingAverage.addSample(elapsed);
+        _heartbeat = now;
+    }
+
+    void deadlockDetectionCrash() {
+        auto &ch = CrashHandler::getInstance();
+
+        ch.setAnnotation("_mod_faulting_tid", std::to_string((uint64_t)_mainThreadID));
+        ch.setAnnotation("deadlock", "1");
+        uint32_t* crashTrigger = nullptr;
+        *crashTrigger = 0xDEAD10CC;
+    }
+
+    static void withPause(const std::function<void()>& lambda) {
+        pause();
+        lambda();
+        resume();
+    }
+    static void pause() {
+        _paused = true;
+    }
+
+    static void resume() {
+        // Update the heartbeat BEFORE resuming the checks
+        updateHeartbeat();
+        _paused = false;
+    }
+
+    void run() override {
+        while (!_quit) {
+            QThread::sleep(HEARTBEAT_UPDATE_INTERVAL_SECS);
+            // Don't do heartbeat detection under nsight
+            if (_paused) {
+                continue;
+            }
+            uint64_t lastHeartbeat = _heartbeat; // sample atomic _heartbeat, because we could context switch away and have it updated on us
+            uint64_t now = usecTimestampNow();
+            auto lastHeartbeatAge = (now > lastHeartbeat) ? now - lastHeartbeat : 0;
+            auto elapsedMovingAverage = _movingAverage.getAverage();
+
+            if (elapsedMovingAverage > _maxElapsedAverage * 1.1f) {
+#if !defined(NDEBUG)
+                qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
+                    << "lastHeartbeatAge:" << lastHeartbeatAge
+                    << "elapsedMovingAverage:" << elapsedMovingAverage
+                    << "maxElapsed:" << _maxElapsed
+                    << "PREVIOUS maxElapsedAverage:" << _maxElapsedAverage
+                    << "NEW maxElapsedAverage:" << elapsedMovingAverage << "** NEW MAX ELAPSED AVERAGE **"
+                    << "samples:" << _movingAverage.getSamples();
+#endif
+                _maxElapsedAverage = elapsedMovingAverage;
+            }
+            if (lastHeartbeatAge > _maxElapsed) {
+#if !defined(NDEBUG)
+                qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
+                    << "lastHeartbeatAge:" << lastHeartbeatAge
+                    << "elapsedMovingAverage:" << elapsedMovingAverage
+                    << "PREVIOUS maxElapsed:" << _maxElapsed
+                    << "NEW maxElapsed:" << lastHeartbeatAge << "** NEW MAX ELAPSED **"
+                    << "maxElapsedAverage:" << _maxElapsedAverage
+                    << "samples:" << _movingAverage.getSamples();
+#endif
+                _maxElapsed = lastHeartbeatAge;
+            }
+
+#if !defined(NDEBUG)
+            if (elapsedMovingAverage > WARNING_ELAPSED_HEARTBEAT) {
+                qCDebug(interfaceapp_deadlock) << "DEADLOCK WATCHDOG WARNING:"
+                    << "lastHeartbeatAge:" << lastHeartbeatAge
+                    << "elapsedMovingAverage:" << elapsedMovingAverage << "** OVER EXPECTED VALUE **"
+                    << "maxElapsed:" << _maxElapsed
+                    << "maxElapsedAverage:" << _maxElapsedAverage
+                    << "samples:" << _movingAverage.getSamples();
+            }
+#endif
+
+            if (lastHeartbeatAge > MAX_HEARTBEAT_AGE_USECS) {
+                qCDebug(interfaceapp_deadlock) << "DEADLOCK DETECTED -- "
+                         << "lastHeartbeatAge:" << lastHeartbeatAge
+                         << "[ lastHeartbeat :" << lastHeartbeat
+                         << "now:" << now << " ]"
+                         << "elapsedMovingAverage:" << elapsedMovingAverage
+                         << "maxElapsed:" << _maxElapsed
+                         << "maxElapsedAverage:" << _maxElapsedAverage
+                         << "samples:" << _movingAverage.getSamples();
+
+                // Don't actually crash in debug builds, in case this apparent deadlock is simply from
+                // the developer actively debugging code
+                #ifdef NDEBUG
+                deadlockDetectionCrash();
+                #endif
+            }
+        }
+    }
+
+    static std::atomic<bool> _paused;
+    static std::atomic<uint64_t> _heartbeat;
+    static std::atomic<uint64_t> _maxElapsed;
+    static std::atomic<int> _maxElapsedAverage;
+    static ThreadSafeMovingAverage<int, HEARTBEAT_SAMPLES> _movingAverage;
+
+    bool _quit { false };
+
+    Qt::HANDLE _mainThreadID = nullptr;
+};
+
+#endif  // hifi_DeadlockWatchdog_h
diff --git a/interface/src/LODManager.cpp b/interface/src/LODManager.cpp
index fdd1b51fb3d..2fae9476a47 100644
--- a/interface/src/LODManager.cpp
+++ b/interface/src/LODManager.cpp
@@ -21,6 +21,7 @@
 
 #include "Application.h"
 #include "ui/DialogsManager.h"
+#include "ui/LodToolsDialog.h"
 #include "InterfaceLogging.h"
 
 STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
diff --git a/interface/src/WindowsSystemInfo.h b/interface/src/WindowsSystemInfo.h
new file mode 100644
index 00000000000..7c8a1d3e270
--- /dev/null
+++ b/interface/src/WindowsSystemInfo.h
@@ -0,0 +1,240 @@
+//
+//  WindowSystemInfo.h
+//  interface/src
+//
+//  Split from Application.cpp by HifiExperiments on 3/30/24
+//  Created by Andrzej Kapolka on 5/10/13.
+//  Copyright 2013 High Fidelity, Inc.
+//  Copyright 2020 Vircadia contributors.
+//  Copyright 2022-2023 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//  SPDX-License-Identifier: Apache-2.0
+//
+
+#ifndef hifi_WindowSystemInfo_h
+#define hifi_WindowSystemInfo_h
+
+#include <qsystemdetection.h>
+
+#ifdef Q_OS_WIN
+#include <Windows.h>
+#include <TCHAR.h>
+#include <pdh.h>
+#pragma comment(lib, "pdh.lib")
+#pragma comment(lib, "ntdll.lib")
+
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include <glm/glm.hpp>
+
+#include <QThread>
+#include <QTimer>
+
+#include "Profile.h"
+#include "ThreadHelpers.h"
+
+extern "C" {
+    enum SYSTEM_INFORMATION_CLASS {
+        SystemBasicInformation = 0,
+        SystemProcessorPerformanceInformation = 8,
+    };
+
+    struct SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION {
+        LARGE_INTEGER IdleTime;
+        LARGE_INTEGER KernelTime;
+        LARGE_INTEGER UserTime;
+        LARGE_INTEGER DpcTime;
+        LARGE_INTEGER InterruptTime;
+        ULONG InterruptCount;
+    };
+
+    struct SYSTEM_BASIC_INFORMATION {
+        ULONG Reserved;
+        ULONG TimerResolution;
+        ULONG PageSize;
+        ULONG NumberOfPhysicalPages;
+        ULONG LowestPhysicalPageNumber;
+        ULONG HighestPhysicalPageNumber;
+        ULONG AllocationGranularity;
+        ULONG_PTR MinimumUserModeAddress;
+        ULONG_PTR MaximumUserModeAddress;
+        ULONG_PTR ActiveProcessorsAffinityMask;
+        CCHAR NumberOfProcessors;
+    };
+
+    NTSYSCALLAPI LONG NTAPI NtQuerySystemInformation(
+        _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass,
+        _Out_writes_bytes_opt_(SystemInformationLength) PVOID SystemInformation,
+        _In_ ULONG SystemInformationLength,
+        _Out_opt_ PULONG ReturnLength
+    );
+
+}
+template <typename T>
+LONG NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, T& t) {
+    return NtQuerySystemInformation(SystemInformationClass, &t, (ULONG)sizeof(T), nullptr);
+}
+
+template <typename T>
+LONG NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, std::vector<T>& t) {
+    return NtQuerySystemInformation(SystemInformationClass, t.data(), (ULONG)(sizeof(T) * t.size()), nullptr);
+}
+
+
+template <typename T>
+void updateValueAndDelta(std::pair<T, T>& pair, T newValue) {
+    auto& value = pair.first;
+    auto& delta = pair.second;
+    delta = (value != 0) ? newValue - value : 0;
+    value = newValue;
+}
+
+struct MyCpuInfo {
+    using ValueAndDelta = std::pair<LONGLONG, LONGLONG>;
+    std::string name;
+    ValueAndDelta kernel { 0, 0 };
+    ValueAndDelta user { 0, 0 };
+    ValueAndDelta idle { 0, 0 };
+    float kernelUsage { 0.0f };
+    float userUsage { 0.0f };
+
+    void update(const SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION& cpuInfo) {
+        updateValueAndDelta(kernel, cpuInfo.KernelTime.QuadPart);
+        updateValueAndDelta(user, cpuInfo.UserTime.QuadPart);
+        updateValueAndDelta(idle, cpuInfo.IdleTime.QuadPart);
+        auto totalTime = kernel.second + user.second + idle.second;
+        if (totalTime != 0) {
+            kernelUsage = (FLOAT)kernel.second / totalTime;
+            userUsage = (FLOAT)user.second / totalTime;
+        } else {
+            kernelUsage = userUsage = 0.0f;
+        }
+    }
+};
+
+void updateCpuInformation() {
+    static std::once_flag once;
+    static SYSTEM_BASIC_INFORMATION systemInfo {};
+    static SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION cpuTotals;
+    static std::vector<SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION> cpuInfos;
+    static std::vector<MyCpuInfo> myCpuInfos;
+    static MyCpuInfo myCpuTotals;
+    std::call_once(once, [&] {
+        NtQuerySystemInformation( SystemBasicInformation, systemInfo);
+        cpuInfos.resize(systemInfo.NumberOfProcessors);
+        myCpuInfos.resize(systemInfo.NumberOfProcessors);
+        for (size_t i = 0; i < systemInfo.NumberOfProcessors; ++i) {
+            myCpuInfos[i].name = "cpu." + std::to_string(i);
+        }
+        myCpuTotals.name = "cpu.total";
+    });
+    NtQuerySystemInformation(SystemProcessorPerformanceInformation, cpuInfos);
+
+    // Zero the CPU totals.
+    memset(&cpuTotals, 0, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION));
+    for (size_t i = 0; i < systemInfo.NumberOfProcessors; ++i) {
+        auto& cpuInfo = cpuInfos[i];
+        // KernelTime includes IdleTime.
+        cpuInfo.KernelTime.QuadPart -= cpuInfo.IdleTime.QuadPart;
+
+        // Update totals
+        cpuTotals.IdleTime.QuadPart += cpuInfo.IdleTime.QuadPart;
+        cpuTotals.KernelTime.QuadPart += cpuInfo.KernelTime.QuadPart;
+        cpuTotals.UserTime.QuadPart += cpuInfo.UserTime.QuadPart;
+
+        // Update friendly structure
+        auto& myCpuInfo = myCpuInfos[i];
+        myCpuInfo.update(cpuInfo);
+        PROFILE_COUNTER(app, myCpuInfo.name.c_str(), {
+            { "kernel", myCpuInfo.kernelUsage },
+            { "user", myCpuInfo.userUsage }
+        });
+    }
+
+    myCpuTotals.update(cpuTotals);
+    PROFILE_COUNTER(app, myCpuTotals.name.c_str(), {
+        { "kernel", myCpuTotals.kernelUsage },
+        { "user", myCpuTotals.userUsage }
+    });
+}
+
+
+static ULARGE_INTEGER lastCPU, lastSysCPU, lastUserCPU;
+static int numProcessors;
+static HANDLE self;
+static PDH_HQUERY cpuQuery;
+static PDH_HCOUNTER cpuTotal;
+
+void initCpuUsage() {
+    SYSTEM_INFO sysInfo;
+    FILETIME ftime, fsys, fuser;
+
+    GetSystemInfo(&sysInfo);
+    numProcessors = sysInfo.dwNumberOfProcessors;
+
+    GetSystemTimeAsFileTime(&ftime);
+    memcpy(&lastCPU, &ftime, sizeof(FILETIME));
+
+    self = GetCurrentProcess();
+    GetProcessTimes(self, &ftime, &ftime, &fsys, &fuser);
+    memcpy(&lastSysCPU, &fsys, sizeof(FILETIME));
+    memcpy(&lastUserCPU, &fuser, sizeof(FILETIME));
+
+    PdhOpenQuery(NULL, NULL, &cpuQuery);
+    PdhAddCounter(cpuQuery, "\\Processor(_Total)\\% Processor Time", NULL, &cpuTotal);
+    PdhCollectQueryData(cpuQuery);
+}
+
+void getCpuUsage(glm::vec3& systemAndUser) {
+    FILETIME ftime, fsys, fuser;
+    ULARGE_INTEGER now, sys, user;
+
+    GetSystemTimeAsFileTime(&ftime);
+    memcpy(&now, &ftime, sizeof(FILETIME));
+
+    GetProcessTimes(self, &ftime, &ftime, &fsys, &fuser);
+    memcpy(&sys, &fsys, sizeof(FILETIME));
+    memcpy(&user, &fuser, sizeof(FILETIME));
+    systemAndUser.x = (sys.QuadPart - lastSysCPU.QuadPart);
+    systemAndUser.y = (user.QuadPart - lastUserCPU.QuadPart);
+    systemAndUser /= (float)(now.QuadPart - lastCPU.QuadPart);
+    systemAndUser /= (float)numProcessors;
+    systemAndUser *= 100.0f;
+    lastCPU = now;
+    lastUserCPU = user;
+    lastSysCPU = sys;
+
+    PDH_FMT_COUNTERVALUE counterVal;
+    PdhCollectQueryData(cpuQuery);
+    PdhGetFormattedCounterValue(cpuTotal, PDH_FMT_DOUBLE, NULL, &counterVal);
+    systemAndUser.z = (float)counterVal.doubleValue;
+}
+
+void setupCpuMonitorThread() {
+    initCpuUsage();
+    auto cpuMonitorThread = QThread::currentThread();
+    setThreadName("CPU Monitor Thread");
+
+    QTimer* timer = new QTimer();
+    timer->setInterval(50);
+    QObject::connect(timer, &QTimer::timeout, [] {
+        updateCpuInformation();
+        glm::vec3 kernelUserAndSystem;
+        getCpuUsage(kernelUserAndSystem);
+        PROFILE_COUNTER(app, "cpuProcess", { { "system", kernelUserAndSystem.x }, { "user", kernelUserAndSystem.y } });
+        PROFILE_COUNTER(app, "cpuSystem", { { "system", kernelUserAndSystem.z } });
+    });
+    QObject::connect(cpuMonitorThread, &QThread::finished, [=] {
+        timer->deleteLater();
+        cpuMonitorThread->deleteLater();
+    });
+    timer->start();
+}
+
+#endif
+
+#endif  // hifi_WindowSystemInfo_h
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 62100f9cae5..973c2c7c6d4 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -33,6 +33,7 @@
 #include <AnimInverseKinematics.h>
 #include <AudioClient.h>
 #include <ClientTraitsHandler.h>
+#include <controllers/UserInputMapper.h>
 #include <recording/Clip.h>
 #include <recording/Deck.h>
 #include <display-plugins/DisplayPlugin.h>
diff --git a/interface/src/avatar/MyHead.cpp b/interface/src/avatar/MyHead.cpp
index 4b6f85de1c1..ced56a578a5 100644
--- a/interface/src/avatar/MyHead.cpp
+++ b/interface/src/avatar/MyHead.cpp
@@ -15,6 +15,7 @@
 #include <recording/Deck.h>
 #include <Rig.h>
 #include <BlendshapeConstants.h>
+#include <controllers/UserInputMapper.h>
 
 #include "Application.h"
 #include "MyAvatar.h"
diff --git a/interface/src/graphics/RenderEventHandler.cpp b/interface/src/graphics/RenderEventHandler.cpp
index e5777f8f61b..5214bc8e754 100644
--- a/interface/src/graphics/RenderEventHandler.cpp
+++ b/interface/src/graphics/RenderEventHandler.cpp
@@ -13,6 +13,7 @@
 #include <shared/GlobalAppProperties.h>
 #include <shared/QtHelpers.h>
 #include <crash-handler/CrashHandler.h>
+#include "ThreadHelpers.h"
 
 
 RenderEventHandler::RenderEventHandler(CheckCall checkCall, RenderCall renderCall) :
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index 7e8c1afff30..ff946428153 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -18,6 +18,7 @@
 #include <QLocalServer>
 #include <QSharedMemory>
 #include <QTranslator>
+#include <QStandardPaths>
 
 #include <BuildInfo.h>
 #include <SandboxUtils.h>
@@ -25,6 +26,10 @@
 #include <NetworkAccessManager.h>
 #include <gl/GLHelpers.h>
 #include <iostream>
+#include <plugins/InputPlugin.h>
+#include <plugins/PluginManager.h>
+#include <plugins/DisplayPlugin.h>
+#include <plugins/CodecPlugin.h>
 
 #include "AddressManager.h"
 #include "Application.h"
@@ -34,9 +39,7 @@
 #include "MainWindow.h"
 #include "Profile.h"
 #include "LogHandler.h"
-#include <plugins/PluginManager.h>
-#include <plugins/DisplayPlugin.h>
-#include <plugins/CodecPlugin.h>
+#include "RunningMarker.h"
 
 #ifdef Q_OS_WIN
 #include <Windows.h>
@@ -520,10 +523,6 @@ int main(int argc, const char* argv[]) {
     QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
 #endif
 
-
-
-
-
     // Instance UserActivityLogger now that the settings are loaded
     auto& ual = UserActivityLogger::getInstance();
     auto& ch = CrashHandler::getInstance();
@@ -687,7 +686,7 @@ int main(int argc, const char* argv[]) {
 
     int exitCode;
     {
-        RunningMarker runningMarker(RUNNING_MARKER_FILENAME);
+        RunningMarker runningMarker("Interface.running");
         bool runningMarkerExisted = runningMarker.fileExists();
         runningMarker.writeRunningMarkerFile();
 
diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index c2823e364fb..b0f21e2574c 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -17,6 +17,10 @@
 #include "Menu.h"
 #include "SceneScriptingInterface.h"
 
+#ifndef Q_OS_ANDROID
+#include <shared/FileLogger.h>
+#endif
+
 OctreePacketProcessor::OctreePacketProcessor():
     _safeLanding(new SafeLanding())
 {
@@ -55,7 +59,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
     // immediately following them inside the same packet. So, we process the PacketType_OCTREE_STATS first
     // then process any remaining bytes as if it was another packet
     if (octreePacketType == PacketType::OctreeStats) {
-        int statsMessageLength = qApp->processOctreeStats(*message, sendingNode);
+        int statsMessageLength = processOctreeStats(*message, sendingNode);
 
         wasStatsPacket = true;
         int piggybackBytes = message->getSize() - statsMessageLength;
@@ -93,7 +97,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
     }
 
     if (packetType != PacketType::EntityQueryInitialResultsComplete) {
-        qApp->trackIncomingOctreePacket(*message, sendingNode, wasStatsPacket);
+        trackIncomingOctreePacket(*message, sendingNode, wasStatsPacket);
     }
     
     // seek back to beginning of packet after tracking
@@ -175,3 +179,38 @@ bool OctreePacketProcessor::safeLandingIsComplete() const {
     }
     return false;
 }
+
+int OctreePacketProcessor::processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode) {
+    // parse the incoming stats datas stick it in a temporary object for now, while we
+    // determine which server it belongs to
+    int statsMessageLength = 0;
+
+    const QUuid& nodeUUID = sendingNode->getUUID();
+
+    // now that we know the node ID, let's add these stats to the stats for that node...
+    _octreeServerSceneStats.withWriteLock([&] {
+        OctreeSceneStats& octreeStats = _octreeServerSceneStats[nodeUUID];
+        statsMessageLength = octreeStats.unpackFromPacket(message);
+
+        if (octreeStats.isFullScene()) {
+            _fullSceneReceivedCounter++;
+        }
+    });
+
+    return statsMessageLength;
+}
+
+void OctreePacketProcessor::trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket) {
+    // Attempt to identify the sender from its address.
+    if (sendingNode) {
+        const QUuid& nodeUUID = sendingNode->getUUID();
+
+        // now that we know the node ID, let's add these stats to the stats for that node...
+        _octreeServerSceneStats.withWriteLock([&] {
+            if (_octreeServerSceneStats.find(nodeUUID) != _octreeServerSceneStats.end()) {
+                OctreeSceneStats& stats = _octreeServerSceneStats[nodeUUID];
+                stats.trackIncomingOctreePacket(message, wasStatsPacket, sendingNode->getClockSkewUsec());
+            }
+        });
+    }
+}
diff --git a/interface/src/octree/OctreePacketProcessor.h b/interface/src/octree/OctreePacketProcessor.h
index d2210ba41ff..c9a2dae67aa 100644
--- a/interface/src/octree/OctreePacketProcessor.h
+++ b/interface/src/octree/OctreePacketProcessor.h
@@ -17,6 +17,7 @@
 #include <ReceivedPacketProcessor.h>
 #include <ReceivedMessage.h>
 
+#include "OctreeSceneStats.h"
 #include "SafeLanding.h"
 
 /// Handles processing of incoming voxel packets for the interface application. As with other ReceivedPacketProcessor classes
@@ -27,6 +28,9 @@ class OctreePacketProcessor : public ReceivedPacketProcessor {
     OctreePacketProcessor();
     ~OctreePacketProcessor();
 
+    NodeToOctreeSceneStats* getOctreeSceneStats() { return &_octreeServerSceneStats; }
+    std::atomic<uint32_t>& getFullSceneReceivedCounter() { return _fullSceneReceivedCounter; }
+
     void startSafeLanding();
     void updateSafeLanding();
     void stopSafeLanding();
@@ -46,6 +50,12 @@ private slots:
     void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
 
 private:
+    int processOctreeStats(ReceivedMessage& message, SharedNodePointer sendingNode);
+    void trackIncomingOctreePacket(ReceivedMessage& message, SharedNodePointer sendingNode, bool wasStatsPacket);
+
+    NodeToOctreeSceneStats _octreeServerSceneStats;
+    std::atomic<uint32_t> _fullSceneReceivedCounter { 0 };  // how many times have we received a full-scene octree stats packet
+
     OCTREE_PACKET_SEQUENCE _safeLandingSequenceStart { SafeLanding::INVALID_SEQUENCE };
     std::unique_ptr<SafeLanding> _safeLanding;
 };
diff --git a/interface/src/raypick/PointerScriptingInterface.cpp b/interface/src/raypick/PointerScriptingInterface.cpp
index 6ea32725725..ff25db29dec 100644
--- a/interface/src/raypick/PointerScriptingInterface.cpp
+++ b/interface/src/raypick/PointerScriptingInterface.cpp
@@ -24,6 +24,8 @@
 #include "StylusPick.h"
 #include <ScriptManager.h>
 
+#include <controllers/UserInputMapper.h>
+
 STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
     qDebug() << "STATIC_SCRIPT_TYPES_INITIALIZER PointerScriptingInterface";
     auto scriptEngine = manager->engine().get();
diff --git a/interface/src/scripting/PerformanceScriptingInterface.cpp b/interface/src/scripting/PerformanceScriptingInterface.cpp
index 9f3534b3e82..fea824bd777 100644
--- a/interface/src/scripting/PerformanceScriptingInterface.cpp
+++ b/interface/src/scripting/PerformanceScriptingInterface.cpp
@@ -11,6 +11,8 @@
 
 #include "PerformanceScriptingInterface.h"
 
+#include <QtQML>
+
 #include <ScriptEngineCast.h>
 
 #include "../Application.h"
diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp
index 12814aa6b6a..2e408fc4e2c 100644
--- a/interface/src/scripting/RenderScriptingInterface.cpp
+++ b/interface/src/scripting/RenderScriptingInterface.cpp
@@ -9,10 +9,14 @@
 //
 #include "RenderScriptingInterface.h"
 
+#include <QScreen>
+#include <QtQML>
+
+#include <RenderCommonTask.h>
 #include <ScriptEngineCast.h>
 
 #include "LightingModel.h"
-#include <QScreen>
+#include "Menu.h"
 #include "ScreenName.h"
 
 STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
diff --git a/interface/src/ui/HMDToolsDialog.cpp b/interface/src/ui/HMDToolsDialog.cpp
index d04509efa68..1a989b95c57 100644
--- a/interface/src/ui/HMDToolsDialog.cpp
+++ b/interface/src/ui/HMDToolsDialog.cpp
@@ -28,6 +28,8 @@
 #include "MainWindow.h"
 #include "Menu.h"
 #include "DialogsManager.h"
+#include "LodToolsDialog.h"
+#include "OctreeStatsDialog.h"
 
 static const int WIDTH = 350;
 static const int HEIGHT = 100;
diff --git a/interface/src/ui/JSConsole.cpp b/interface/src/ui/JSConsole.cpp
index 9a3b4bb53a5..6344a4ed53c 100644
--- a/interface/src/ui/JSConsole.cpp
+++ b/interface/src/ui/JSConsole.cpp
@@ -17,6 +17,7 @@
 #include <QLabel>
 #include <QScrollBar>
 #include <QtConcurrent/QtConcurrentRun>
+#include <QStandardPaths>
 #include <QStringListModel>
 #include <QListView>
 #include <QToolTip>
diff --git a/interface/src/ui/OctreeStatsDialog.cpp b/interface/src/ui/OctreeStatsDialog.cpp
index 43efe98d9d1..f68f5c8d927 100644
--- a/interface/src/ui/OctreeStatsDialog.cpp
+++ b/interface/src/ui/OctreeStatsDialog.cpp
@@ -21,6 +21,7 @@
 #include <OctreeSceneStats.h>
 
 #include "Application.h"
+#include "Menu.h"
 #include "../octree/OctreePacketProcessor.h"
 
 OctreeStatsDialog::OctreeStatsDialog(QWidget* parent, NodeToOctreeSceneStats* model) :
diff --git a/interface/src/ui/OctreeStatsProvider.cpp b/interface/src/ui/OctreeStatsProvider.cpp
index 8917056be4e..133af1f7fe0 100644
--- a/interface/src/ui/OctreeStatsProvider.cpp
+++ b/interface/src/ui/OctreeStatsProvider.cpp
@@ -12,6 +12,7 @@
 #include "OctreeStatsProvider.h"
 
 #include "Application.h"
+#include "Menu.h"
 #include "octree/OctreePacketProcessor.h"
 
 OctreeStatsProvider::OctreeStatsProvider(QObject* parent, NodeToOctreeSceneStats* model) :
diff --git a/libraries/render-utils/src/AbstractViewStateInterface.h b/libraries/render-utils/src/AbstractViewStateInterface.h
index b90e291da5a..cbe4c281759 100644
--- a/libraries/render-utils/src/AbstractViewStateInterface.h
+++ b/libraries/render-utils/src/AbstractViewStateInterface.h
@@ -30,9 +30,6 @@ using ConicalViewFrustums = std::vector<ConicalViewFrustum>;
 /// Interface provided by Application to other objects that need access to the current view state details
 class AbstractViewStateInterface {
 public:
-    /// copies the current view frustum for rendering the view state
-    virtual void copyCurrentViewFrustum(ViewFrustum& viewOut) const = 0;
-
     virtual const ConicalViewFrustums& getConicalViews() const = 0;
 
     virtual QThread* getMainThread() = 0;
@@ -54,8 +51,6 @@ class AbstractViewStateInterface {
     // is called from
     virtual void sendLambdaEvent(const std::function<void()>& f) = 0;
 
-    virtual qreal getDevicePixelRatio() = 0;
-
     virtual render::ScenePointer getMain3DScene() = 0;
     virtual render::EnginePointer getRenderEngine() = 0;
 

From 3a11ab58386b02f69968f14ba3d413ea152a1560 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Sun, 9 Jun 2024 22:44:04 -0700
Subject: [PATCH 2/4] CR

---
 interface/src/Application.cpp        | 3 ---
 interface/src/Application_Assets.cpp | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9d56810da4c..934b5aabb6f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1160,9 +1160,6 @@ void Application::loadSettings(const QCommandLineParser& parser) {
     DependencyManager::get<AudioClient>()->loadSettings();
     DependencyManager::get<LODManager>()->loadSettings();
 
-    // DONT CHECK IN
-    //DependencyManager::get<LODManager>()->setAutomaticLODAdjust(false);
-
     auto menu = Menu::getInstance();
     menu->loadSettings();
 
diff --git a/interface/src/Application_Assets.cpp b/interface/src/Application_Assets.cpp
index 3a9d641e005..1e1853f2733 100644
--- a/interface/src/Application_Assets.cpp
+++ b/interface/src/Application_Assets.cpp
@@ -35,6 +35,8 @@ static const QString JS_EXTENSION = ".js";
 static const QString FST_EXTENSION = ".fst";
 static const QString FBX_EXTENSION = ".fbx";
 static const QString OBJ_EXTENSION = ".obj";
+static const QString GLTF_EXTENSION = ".gltf";
+static const QString GLB_EXTENSION = ".glb";
 static const QString JSON_GZ_EXTENSION = ".json.gz";
 static const QString CONTENT_ZIP_EXTENSION = ".content.zip";
 static const QString ZIP_EXTENSION = ".zip";
@@ -283,7 +285,8 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q
             addAssetToWorldError(filenameFromPath(filePath), errorInfo);
         } else {
             // to prevent files that aren't models or texture files from being loaded into world automatically
-            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) ||
+            if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION) ||
+                 filePath.toLower().endsWith(GLTF_EXTENSION) || filePath.toLower().endsWith(GLB_EXTENSION)) ||
                 ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) &&
                 ((!isBlocks) && (!isZip)))) {
                 addAssetToWorldAddEntity(filePath, mapping);

From 69de648c8bfc26e968612025cf0cce8a136feb0a Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Sun, 9 Jun 2024 22:46:07 -0700
Subject: [PATCH 3/4] I fucked up the merge but this was 74's fix for the QML
 header names

---
 interface/src/scripting/PerformanceScriptingInterface.cpp | 2 +-
 interface/src/scripting/RenderScriptingInterface.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/scripting/PerformanceScriptingInterface.cpp b/interface/src/scripting/PerformanceScriptingInterface.cpp
index a6419059994..74ee6e6cb09 100644
--- a/interface/src/scripting/PerformanceScriptingInterface.cpp
+++ b/interface/src/scripting/PerformanceScriptingInterface.cpp
@@ -11,7 +11,7 @@
 
 #include "PerformanceScriptingInterface.h"
 
-#include <QtQML>
+#include <QtQml>
 
 #include <ScriptEngineCast.h>
 
diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp
index 2e408fc4e2c..8cfb501cc1b 100644
--- a/interface/src/scripting/RenderScriptingInterface.cpp
+++ b/interface/src/scripting/RenderScriptingInterface.cpp
@@ -10,7 +10,7 @@
 #include "RenderScriptingInterface.h"
 
 #include <QScreen>
-#include <QtQML>
+#include <QtQml>
 
 #include <RenderCommonTask.h>
 #include <ScriptEngineCast.h>

From ba0ab8dc5d83266684e8c5d92aa407e16cb34ab5 Mon Sep 17 00:00:00 2001
From: HifiExperiments <thingsandstuffblog@gmail.com>
Date: Thu, 20 Jun 2024 14:48:52 -0700
Subject: [PATCH 4/4] fix audio devices + login popup

---
 interface/src/Application.h           |  2 +-
 interface/src/Application_Setup.cpp   | 28 +++++++++++++--------------
 interface/src/main.cpp                |  1 +
 libraries/networking/src/NodeList.cpp |  1 -
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index bb5928625c3..9a38e418f36 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -743,7 +743,7 @@ private slots:
     bool _cursorNeedsChanging { false };
     bool _useSystemCursor { false };
 
-    DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface { new DialogsManagerScriptingInterface() };
+    DialogsManagerScriptingInterface* _dialogsManagerScriptingInterface;
 
     QPointer<LogDialog> _logDialog;
     QPointer<EntityScriptServerLogDialog> _entityScriptServerLogDialog;
diff --git a/interface/src/Application_Setup.cpp b/interface/src/Application_Setup.cpp
index 7b87fe5df84..4b760fa4e33 100644
--- a/interface/src/Application_Setup.cpp
+++ b/interface/src/Application_Setup.cpp
@@ -475,6 +475,7 @@ void Application::initialize(const QCommandLineParser &parser) {
     _entityEditSender = std::make_shared<EntityEditPacketSender>();
     _graphicsEngine = std::make_shared<GraphicsEngine>();
     _applicationOverlay = std::make_shared<ApplicationOverlay>();
+    _dialogsManagerScriptingInterface = new DialogsManagerScriptingInterface();
 
     auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
     setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
@@ -585,8 +586,9 @@ void Application::initialize(const QCommandLineParser &parser) {
         }
 
 #if !defined(Q_OS_ANDROID) && !defined(DISABLE_QML)
+        const bool DISABLE_LOGIN_SCREEN = true; // Login screen is currently disabled
         // Do not show login dialog if requested not to on the command line
-        if (parser.isSet("no-login-suggestion")) {
+        if (DISABLE_LOGIN_SCREEN || parser.isSet("no-login-suggestion")) {
             _noLoginSuggestion = true;
         }
 #endif
@@ -803,6 +805,10 @@ void Application::initialize(const QCommandLineParser &parser) {
         showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
     }
 
+    // An audio device changed signal received before the display plugins are set up will cause a crash,
+    // so we defer the setup of the `scripting::Audio` class until this point
+    DependencyManager::set<AudioScriptingInterface, scripting::Audio>();
+
     // Create the rendering engine.  This can be slow on some machines due to lots of
     // GPU pipeline creation.
     initializeRenderEngine();
@@ -2016,17 +2022,13 @@ void Application::setupSignalsAndOperators() {
             resumeAfterLoginDialogActionTaken();
         });
 #else
-        // Do not show login dialog if requested not to on the command line
-        if (_noLoginSuggestion) {
-            connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
-                resumeAfterLoginDialogActionTaken();
-            });
-        } else {
-            connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
+        connect(offscreenUi, &OffscreenUi::keyboardFocusActive, [this]() {
+            // Do not show login dialog if requested not to on the command line
+            if (!_noLoginSuggestion) {
                 showLoginScreen();
-                resumeAfterLoginDialogActionTaken();
-            });
-        }
+            }
+            resumeAfterLoginDialogActionTaken();
+        });
 #endif
 
         // Monitor model assets (e.g., from Clara.io) added to the world that may need resizing.
@@ -2124,9 +2126,7 @@ void Application::setupSignalsAndOperators() {
         });
         audioIO->startThread();
 
-        // An audio device changed signal received before the display plugins are set up will cause a crash,
-        // so we defer the setup of the `scripting::Audio` class until this point
-        auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface, scripting::Audio>().data();
+        auto audioScriptingInterface = DependencyManager::get<AudioScriptingInterface>().data();
         connect(audioIO, &AudioClient::mutedByMixer, audioScriptingInterface, &AudioScriptingInterface::mutedByMixer);
         connect(audioIO, &AudioClient::receivedFirstPacket, audioScriptingInterface, &AudioScriptingInterface::receivedFirstPacket);
         connect(audioIO, &AudioClient::disconnected, audioScriptingInterface, &AudioScriptingInterface::disconnected);
diff --git a/interface/src/main.cpp b/interface/src/main.cpp
index ff946428153..d22089df909 100644
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@@ -311,6 +311,7 @@ int main(int argc, const char* argv[]) {
     parser.addOption(noLauncherOption);
     parser.addOption(responseTokensOption);
     parser.addOption(displayNameOption);
+    parser.addOption(noLoginOption);
     parser.addOption(overrideScriptsPathOption);
     parser.addOption(defaultScriptsOverrideOption);
     parser.addOption(traceFileOption);
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index a2309709092..73243243d37 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -99,7 +99,6 @@ NodeList::NodeList(char newOwnerType, int socketListenPort, int dtlsListenPort)
     // FIXME: Can remove this temporary work-around in version 2021.2.0. (New protocol version implies a domain server upgrade.)
     // Adjust our canRezAvatarEntities permissions on older domains that do not have this setting.
     // DomainServerList and DomainSettings packets can come in either order so need to adjust with both occurrences.
-    auto nodeList = DependencyManager::get<NodeList>();
     connect(&_domainHandler, &DomainHandler::settingsReceived, this, &NodeList::adjustCanRezAvatarEntitiesPerSettings);
 
     auto accountManager = DependencyManager::get<AccountManager>();