diff --git a/.gitmodules b/.gitmodules
index 4311e7851a..3e4cfb738b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "modules/touch/ext/libTUIO11"]
 	path = modules/touch/ext/libTUIO11
 	url = https://github.com/mkalten/TUIO11_CPP
-[submodule "modules/sync/ext/libtorrent"]
-	path = modules/sync/ext/libtorrent
-	url = https://github.com/OpenSpace/libtorrent.git
 [submodule "apps/OpenSpace-MinVR/ext/minvr"]
 	path = apps/OpenSpace-MinVR/ext/minvr
 	url = https://github.com/OpenSpace/minvr
@@ -26,3 +23,6 @@
 [submodule "modules/fitsfilereader/ext/cfitsio"]
 	path = modules/fitsfilereader/ext/cfitsio
 	url = https://github.com/OpenSpace/cfitsio.git
+[submodule "apps/OpenSpace-MinVR/ext/glfw"]
+	path = apps/OpenSpace-MinVR/ext/glfw
+	url = https://github.com/opensgct/glfw
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc5a7104df..724729bcad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,6 +285,11 @@ if (OPENSPACE_WITH_ABUFFER_RENDERER)
   target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER")
 endif ()
 
+option(OPENSPACE_WITH_INSTRUMENTATION "Add instrumentation options" OFF)
+if (OPENSPACE_WITH_INSTRUMENTATION)
+  target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_INSTRUMENTATION")
+endif ()
+
 
 # Just in case, create the bin directory
 add_custom_command(
diff --git a/apps/OpenSpace-MinVR/CMakeLists.txt b/apps/OpenSpace-MinVR/CMakeLists.txt
index 656da9b194..f58a2a13cc 100644
--- a/apps/OpenSpace-MinVR/CMakeLists.txt
+++ b/apps/OpenSpace-MinVR/CMakeLists.txt
@@ -50,7 +50,7 @@ target_include_directories(OpenSpace-MinVR PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ex
 target_include_directories(OpenSpace-MinVR PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/minvr/external/GLFW/src/include)
 
 
-target_link_libraries(OpenSpace-MinVR libOpenSpace MinVR)
+target_link_libraries(OpenSpace-MinVR openspace-core MinVR)
 
 # Web Browser and Web gui
 # Why not put these in the module's path? Because they do not have access to the
diff --git a/apps/OpenSpace-MinVR/ext/glfw b/apps/OpenSpace-MinVR/ext/glfw
new file mode 160000
index 0000000000..7ef34eb06d
--- /dev/null
+++ b/apps/OpenSpace-MinVR/ext/glfw
@@ -0,0 +1 @@
+Subproject commit 7ef34eb06de54dd9186d3d21a401b2ef819b59e7
diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index b4cde8364e..c2d857cc7c 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -200,7 +200,14 @@ void Handler::onVREvent(const VRDataIndex& eventData) {
             if (button == MouseButton::Right && action == MouseAction::Press) {
                 windowingGlobals.mouseButtons |= 1 << 2;
             }
-            global::openSpaceEngine.mouseButtonCallback(button, action);
+
+            using KM = KeyModifier;
+            KM mod = KM::NoModifier;
+            mod |= keyboardState.modifierShift ? KM::Shift : KM::NoModifier;
+            mod |= keyboardState.modifierCtrl ? KM::Control : KM::NoModifier;
+            mod |= keyboardState.modifierAlt ? KM::Alt : KM::NoModifier;
+
+            global::openSpaceEngine.mouseButtonCallback(button, action, mod);
         }
 
     }
@@ -341,6 +348,14 @@ int main(int argc, char** argv) {
 
     ghoul::initialize();
 
+    // Register the path of the executable,
+    // to make it possible to find other files in the same directory.
+    FileSys.registerPathToken(
+        "${BIN}",
+        ghoul::filesystem::File(absPath(argv[0])).directoryName(),
+        ghoul::filesystem::FileSystem::Override::Yes
+    );
+
     // Create the OpenSpace engine and get arguments for the SGCT engine
     std::string windowConfiguration;
     try {
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 99e5595539..25c8d30bde 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 99e5595539225ee0067b17b370f09a2d8aae3dd0
+Subproject commit 25c8d30bde216066840d197e4443def196c70e17
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index ff713b447a..e77ce29331 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -76,6 +76,8 @@ constexpr const bool EnableDetailedVtune = false;
 #include "nvToolsExt.h"
 #endif // OPENSPACE_HAS_NVTOOLS
 
+using namespace openspace;
+
 namespace {
 
 constexpr const char* _loggerCat = "main";
@@ -157,9 +159,9 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {
 
     std::string dumpFile = fmt::format(
         "OpenSpace_{}_{}_{}-{}-{}-{}-{}-{}-{}--{}--{}.dmp",
-        openspace::OPENSPACE_VERSION_MAJOR,
-        openspace::OPENSPACE_VERSION_MINOR,
-        openspace::OPENSPACE_VERSION_PATCH,
+        OPENSPACE_VERSION_MAJOR,
+        OPENSPACE_VERSION_MINOR,
+        OPENSPACE_VERSION_PATCH,
         stLocalTime.wYear,
         stLocalTime.wMonth,
         stLocalTime.wDay,
@@ -260,7 +262,7 @@ void mainInitFunc() {
     LTRACE("main::mainInitFunc(begin)");
 
     LDEBUG("Initializing OpenSpace Engine started");
-    openspace::global::openSpaceEngine.initialize();
+    global::openSpaceEngine.initialize();
     LDEBUG("Initializing OpenSpace Engine finished");
 
     {
@@ -287,7 +289,7 @@ void mainInitFunc() {
 
 
     LDEBUG("Initializing OpenGL in OpenSpace Engine started");
-    openspace::global::openSpaceEngine.initializeGL();
+    global::openSpaceEngine.initializeGL();
     LDEBUG("Initializing OpenGL in OpenSpace Engine finished");
 
 
@@ -366,7 +368,7 @@ void mainInitFunc() {
     //
 
     std::string screenshotPath = "${SCREENSHOTS}";
-    if (openspace::global::configuration.shouldUseScreenshotDate) {
+    if (global::configuration.shouldUseScreenshotDate) {
         std::time_t now = std::time(nullptr);
         std::tm* nowTime = std::localtime(&now);
         char mbstr[128];
@@ -412,13 +414,13 @@ void mainPreSyncFunc() {
 #endif // OPENSPACE_HAS_VTUNE
     LTRACE("main::mainPreSyncFunc(begin)");
 
-    openspace::global::openSpaceEngine.preSynchronization();
+    global::openSpaceEngine.preSynchronization();
 
     // Query joystick status
-    using namespace openspace::interaction;
+    using namespace interaction;
 
     for (int i = GLFW_JOYSTICK_1; i <= GLFW_JOYSTICK_LAST; ++i) {
-        JoystickInputState& state = openspace::global::joystickInputStates[i];
+        JoystickInputState& state = global::joystickInputStates[i];
 
         int present = glfwJoystickPresent(i);
         if (present == GLFW_FALSE) {
@@ -511,7 +513,7 @@ void mainPostSyncPreDrawFunc() {
 #endif // OPENSPACE_HAS_NVTOOLS
     LTRACE("main::postSynchronizationPreDraw(begin)");
 
-    openspace::global::openSpaceEngine.postSynchronizationPreDraw();
+    global::openSpaceEngine.postSynchronizationPreDraw();
 
 #ifdef OPENVR_SUPPORT
     if (FirstOpenVRWindow) {
@@ -559,7 +561,7 @@ void mainRenderFunc() {
 #endif
 
     try {
-        openspace::global::openSpaceEngine.render(
+        global::openSpaceEngine.render(
             SgctEngine->getModelMatrix(),
             viewMatrix,
             projectionMatrix
@@ -591,7 +593,7 @@ void mainDraw2DFunc() {
     LTRACE("main::mainDraw2DFunc(begin)");
 
     try {
-        openspace::global::openSpaceEngine.drawOverlays();
+        global::openSpaceEngine.drawOverlays();
     }
     catch (const ghoul::RuntimeError& e) {
         LERRORC(e.component, e.message);
@@ -627,7 +629,7 @@ void mainPostDrawFunc() {
     }
 #endif // OPENVR_SUPPORT
 
-    openspace::global::openSpaceEngine.postDraw();
+    global::openSpaceEngine.postDraw();
 
 #ifdef OPENSPACE_HAS_SPOUT
     for (const SpoutWindow& w : SpoutWindows) {
@@ -667,7 +669,7 @@ void mainPostDrawFunc() {
 
 
 
-void mainKeyboardCallback(int key, int, int action, int mods) {
+void mainKeyboardCallback(int key, int, int action, int modifiers) {
 #ifdef OPENSPACE_HAS_VTUNE
     if (EnableDetailedVtune) {
         __itt_frame_begin_v3(_vTune.keyboard, nullptr);
@@ -675,11 +677,10 @@ void mainKeyboardCallback(int key, int, int action, int mods) {
 #endif // OPENSPACE_HAS_VTUNE
     LTRACE("main::mainKeyboardCallback(begin)");
 
-    openspace::global::openSpaceEngine.keyboardCallback(
-        openspace::Key(key),
-        openspace::KeyModifier(mods),
-        openspace::KeyAction(action)
-    );
+    const Key k = Key(key);
+    const KeyModifier m = KeyModifier(modifiers);
+    const KeyAction a = KeyAction(action);
+    global::openSpaceEngine.keyboardCallback(k, m, a);
 
     LTRACE("main::mainKeyboardCallback(begin)");
 #ifdef OPENSPACE_HAS_VTUNE
@@ -699,11 +700,10 @@ void mainMouseButtonCallback(int key, int action, int modifiers) {
 #endif // OPENSPACE_HAS_VTUNE
     LTRACE("main::mainMouseButtonCallback(begin)");
 
-    openspace::global::openSpaceEngine.mouseButtonCallback(
-        openspace::MouseButton(key),
-        openspace::MouseAction(action),
-        openspace::KeyModifier(modifiers)
-    );
+    const MouseButton k = MouseButton(key);
+    const MouseAction a = MouseAction(action);
+    const KeyModifier m = KeyModifier(modifiers);
+    global::openSpaceEngine.mouseButtonCallback(k, a, m);
 
     LTRACE("main::mainMouseButtonCallback(end)");
 #ifdef OPENSPACE_HAS_VTUNE
@@ -722,7 +722,7 @@ void mainMousePosCallback(double x, double y) {
     }
 #endif // OPENSPACE_HAS_VTUNE
 
-    openspace::global::openSpaceEngine.mousePositionCallback(x, y);
+    global::openSpaceEngine.mousePositionCallback(x, y);
 
 #ifdef OPENSPACE_HAS_VTUNE
     if (EnableDetailedVtune) {
@@ -741,7 +741,7 @@ void mainMouseScrollCallback(double posX, double posY) {
 #endif // OPENSPACE_HAS_VTUNE
     LTRACE("main::mainMouseScrollCallback(begin");
 
-    openspace::global::openSpaceEngine.mouseScrollWheelCallback(posX, posY);
+    global::openSpaceEngine.mouseScrollWheelCallback(posX, posY);
 
     LTRACE("main::mainMouseScrollCallback(end)");
 #ifdef OPENSPACE_HAS_VTUNE
@@ -753,17 +753,15 @@ void mainMouseScrollCallback(double posX, double posY) {
 
 
 
-void mainCharCallback(unsigned int codepoint, int mods) {
+void mainCharCallback(unsigned int codepoint, int modifiers) {
 #ifdef OPENSPACE_HAS_VTUNE
     if (EnableDetailedVtune) {
         __itt_frame_begin_v3(_vTune.character, nullptr);
     }
 #endif // OPENSPACE_HAS_VTUNE
 
-    openspace::global::openSpaceEngine.charCallback(
-        codepoint,
-        openspace::KeyModifier(mods)
-    );
+    const KeyModifier m = KeyModifier(modifiers);
+    global::openSpaceEngine.charCallback(codepoint, m);
 
 #ifdef OPENSPACE_HAS_VTUNE
     if (EnableDetailedVtune) {
@@ -782,7 +780,7 @@ void mainEncodeFun() {
 #endif // OPENSPACE_HAS_VTUNE
     LTRACE("main::mainEncodeFun(begin)");
 
-    std::vector<char> data = openspace::global::openSpaceEngine.encode();
+    std::vector<char> data = global::openSpaceEngine.encode();
     _synchronizationBuffer.setVal(std::move(data));
     sgct::SharedData::instance()->writeVector(&_synchronizationBuffer);
 
@@ -806,7 +804,7 @@ void mainDecodeFun() {
 
     sgct::SharedData::instance()->readVector(&_synchronizationBuffer);
     std::vector<char> data = _synchronizationBuffer.getVal();
-    openspace::global::openSpaceEngine.decode(std::move(data));
+    global::openSpaceEngine.decode(std::move(data));
 
     LTRACE("main::mainDecodeFun(end)");
 #ifdef OPENSPACE_HAS_VTUNE
@@ -833,7 +831,7 @@ void mainLogCallback(const char* msg) {
 
 
 void setSgctDelegateFunctions() {
-    openspace::WindowDelegate& sgctDelegate = openspace::global::windowDelegate;
+    WindowDelegate& sgctDelegate = global::windowDelegate;
     sgctDelegate.terminate = []() { sgct::Engine::instance()->terminate(); };
     sgctDelegate.setBarrier = [](bool enabled) {
         sgct::SGCTWindow::setBarrier(enabled);
@@ -1101,7 +1099,7 @@ int main(int argc, char** argv) {
         ghoul::cmdparser::CommandlineParser::AllowUnknownCommands::Yes
     );
 
-    openspace::CommandlineArguments commandlineArguments;
+    CommandlineArguments commandlineArguments;
     parser.addCommand(std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
         commandlineArguments.configurationName, "--file", "-f",
         "Provides the path to the OpenSpace configuration file. Only the '${TEMPORARY}' "
@@ -1141,8 +1139,6 @@ int main(int argc, char** argv) {
     // Create the OpenSpace engine and get arguments for the SGCT engine
     std::string windowConfiguration;
     try {
-        using namespace openspace;
-
         // Find configuration
         std::string configurationFilePath = commandlineArguments.configurationName;
         if (commandlineArguments.configurationName.empty()) {
@@ -1178,16 +1174,17 @@ int main(int argc, char** argv) {
         // Determining SGCT configuration file
         LDEBUG("SGCT Configuration file: " + global::configuration.windowConfiguration);
 
-        windowConfiguration = openspace::global::configuration.windowConfiguration;
+        windowConfiguration = global::configuration.windowConfiguration;
     }
-    catch (const openspace::documentation::SpecificationError& e) {
+    catch (const documentation::SpecificationError& e) {
         LFATALC("main", "Loading of configuration file failed");
-        for (const openspace::documentation::TestResult::Offense& o : e.result.offenses) {
+        for (const documentation::TestResult::Offense& o : e.result.offenses) {
             LERRORC(o.offender, ghoul::to_string(o.reason));
         }
-        for (const openspace::documentation::TestResult::Warning& w : e.result.warnings) {
+        for (const documentation::TestResult::Warning& w : e.result.warnings) {
             LWARNINGC(w.offender, ghoul::to_string(w.reason));
         }
+        ghoul::deinitialize();
         exit(EXIT_FAILURE);
     }
     catch (const ghoul::RuntimeError& e) {
@@ -1196,10 +1193,11 @@ int main(int argc, char** argv) {
         if (ghoul::logging::LogManager::isInitialized()) {
             LogMgr.flushLogs();
         }
+        ghoul::deinitialize();
         return EXIT_FAILURE;
     }
 
-    openspace::global::openSpaceEngine.registerPathTokens();
+    global::openSpaceEngine.registerPathTokens();
 
     // Prepend the outgoing sgctArguments with the program name
     // as well as the configuration file that sgct is supposed to use
@@ -1293,8 +1291,8 @@ int main(int argc, char** argv) {
 
     auto cleanup = [&](bool isInitialized) {
         if (isInitialized) {
-            openspace::global::openSpaceEngine.deinitializeGL();
-            openspace::global::openSpaceEngine.deinitialize();
+            global::openSpaceEngine.deinitializeGL();
+            global::openSpaceEngine.deinitialize();
         }
 
         // Clear function bindings to avoid crash after destroying the OpenSpace Engine
@@ -1321,6 +1319,8 @@ int main(int argc, char** argv) {
             }
         }
 #endif // OPENSPACE_HAS_SPOUT
+
+        ghoul::deinitialize();
     };
 
     if (!initSuccess) {
diff --git a/apps/Wormhole/main.cpp b/apps/Wormhole/main.cpp
index 029ee407cb..a988789255 100644
--- a/apps/Wormhole/main.cpp
+++ b/apps/Wormhole/main.cpp
@@ -22,43 +22,26 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-
-#include <ghoul/opengl/ghoul_gl.h>
-
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/filesystem/directory.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/logging/consolelog.h>
-#include <ghoul/ghoul.h>
+#include <openspace/network/parallelserver.h>
+#include <ghoul/fmt.h>
 #include <ghoul/cmdparser/commandlineparser.h>
 #include <ghoul/cmdparser/singlecommand.h>
-
-#include <openspace/engine/windowdelegate.h>
-#include <openspace/scripting/scriptengine.h>
-#include <openspace/rendering/renderable.h>
-
-#include <openspace/network/parallelserver.h>
-
-#include <iostream>
-#include <string>
-#include <ghoul/glm.h>
-#include <functional>
-#include <sstream>
+#include <ghoul/logging/logmanager.h>
 #include <iomanip>
-#include <ios>
 
 namespace {
-    const std::string _loggerCat = "Wormhole";
-}
+    constexpr const char*_loggerCat = "Wormhole";
+} // namespace
 
 int main(int argc, char** argv) {
     using namespace openspace;
+    using namespace ghoul::cmdparser;
 
     std::vector<std::string> arguments(argv, argv + argc);
 
-    ghoul::cmdparser::CommandlineParser commandlineParser(
+    CommandlineParser commandlineParser(
         "Wormhole",
-        ghoul::cmdparser::CommandlineParser::AllowUnknownCommands::Yes
+        CommandlineParser::AllowUnknownCommands::Yes
     );
 
     std::stringstream defaultPassword;
@@ -73,43 +56,43 @@ int main(int argc, char** argv) {
             std::chrono::system_clock::now().time_since_epoch().count() + 1
         ) % 0xffffff);
 
-    std::string portString = "";
+    std::string portString;
     commandlineParser.addCommand(
         std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
             portString,
             "--port",
             "-p",
             "Sets the port to listen on"
-            )
+        )
     );
 
-    std::string password = "";
+    std::string password;
     commandlineParser.addCommand(
         std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
             password,
             "--password",
             "-l",
             "Sets the password to use"
-            )
+        )
     );
 
-    std::string changeHostPassword = "";
+    std::string changeHostPassword;
     commandlineParser.addCommand(
         std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
             changeHostPassword,
             "--hostpassword",
             "-h",
             "Sets the host password to use"
-            )
+        )
     );
 
     commandlineParser.setCommandLine(arguments);
     commandlineParser.execute();
 
-    if (password == "") {
+    if (password.empty()) {
         password = defaultPassword.str();
     }
-    if (changeHostPassword == "") {
+    if (changeHostPassword.empty()) {
         changeHostPassword = defaultChangeHostPassword.str();
     }
 
@@ -118,11 +101,11 @@ int main(int argc, char** argv) {
 
     int port = 25001;
 
-    if (portString != "") {
+    if (!portString.empty()) {
         try {
             port = std::stoi(portString);
         }
-        catch (...) {
+        catch (const std::invalid_argument&) {
             LERROR(fmt::format("Invalid port: {}", portString));
         }
     }
@@ -132,7 +115,9 @@ int main(int argc, char** argv) {
     server.setDefaultHostAddress("127.0.0.1");
     LINFO(fmt::format("Server listening to port {}", port));
 
-    while (std::cin.get() != 'q') {}
+    while (std::cin.get() != 'q') {
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+    }
 
     server.stop();
     LINFO("Server stopped");
diff --git a/data/assets/apollo8.scene b/data/assets/apollo8.scene
index 3301a6720a..6ec4a8b9d5 100644
--- a/data/assets/apollo8.scene
+++ b/data/assets/apollo8.scene
@@ -12,14 +12,19 @@ local Keybindings = {
     {
         Key = "E",
         Command = "openspace.time.setPause(true);" ..
-                  "openspace.setPropertyValue('*Trail.Renderable.Enabled', false)"..
-                  "openspace.setPropertyValue('Scene.Apollo8LaunchTrail.Renderable.Enabled', false)"..
-                  "openspace.sessionRecording.startPlayback('apollo8')",
+                  "openspace.time.setDeltaTime(1);" ..
+                  "openspace.time.setTime('1968 DEC 24 16:37:31');" ..
+                  "openspace.navigation.setNavigationState({" ..
+                  "    Anchor = 'Apollo8'," ..
+                  "    Position = { 1.494592E1, 3.236777E1, -4.171296E1 }," ..
+                  "    ReferenceFrame = 'Root'," ..
+                  "    Up = { 0.960608E0, -0.212013E0, 0.179675E0 }" ..
+                  "});" ..
+                  "openspace.setPropertyValue('*Trail.Renderable.Enabled', false)",
         Documentation = "Jump to right before the earthrise photo",
         Name = "Set Earthrise time",
         GuiPath = "/Missions/Apollo/8",
         Local = false
-
     },
     {
         Key = "U",
@@ -115,13 +120,7 @@ asset.onInitialize(function ()
     openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.MinimumAllowedDistance', 0.000000);
     openspace.setPropertyValueSingle('Scene.Moon.Renderable.LodScaleFactor', 24.0);
 
-    openspace.navigation.setCameraState({
-        Anchor = earthAsset.Earth.Identifier,
-        Position = { 0, 0, 0 },
-        Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 },
-    })
-
-    openspace.globebrowsing.goToGeo(20, -60, 15000000)
+    openspace.globebrowsing.goToGeo(earthAsset.Earth.Identifier, 20, -60, 15000000)
 end)
 
 asset.onDeinitialize(function ()
diff --git a/data/assets/apollo_sites.scene b/data/assets/apollo_sites.scene
index 2c59d6f25a..09721fe7d6 100644
--- a/data/assets/apollo_sites.scene
+++ b/data/assets/apollo_sites.scene
@@ -2,15 +2,15 @@ asset.require('./base')
 
 --moonrocks.scene
 local sceneHelper = asset.require('util/scene_helper')
-
 -- local station2 = asset.require('scene/solarsystem/missions/apollo/bouldersstation2')
 -- local station6 = asset.require('scene/solarsystem/missions/apollo/bouldersstation6')
 -- local station7 = asset.require('scene/solarsystem/missions/apollo/bouldersstation7')
+asset.require('scene/solarsystem/missions/apollo/apollo8')
 asset.require('scene/solarsystem/missions/apollo/apollo11')
-asset.require('scene/solarsystem/missions/apollo/a11_lem')
 asset.require('scene/solarsystem/missions/apollo/a17_lem')
 asset.require('scene/solarsystem/missions/apollo/apollo_globebrowsing')
 asset.require('scene/solarsystem/missions/apollo/apollo_11_lem_flipbook')
+asset.require('scene/solarsystem/missions/apollo/insignias_map')
 
 local Keybindings = {
     {
@@ -37,11 +37,11 @@ local Keybindings = {
     },
     {
         Key = "F11",
-        Command = "openspace.time.setTime('1969 JUL 20 20:17:40');" .. 
+        Command = "openspace.time.setTime('1969 JUL 20 20:17:40');" ..
                   "openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', true);" ..
                   "openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', true);" ..
                   "openspace.setPropertyValueSingle('Scene.Moon.Renderable.LodScaleFactor', 20.11);" ..
-                  "openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo11LemModel');" ..
+                  "openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo11LemPosition');" ..
                   "openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);" ..
                   "openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', true);" ..
                   "openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', true);",
@@ -82,10 +82,14 @@ asset.onInitialize(function ()
 
     sceneHelper.bindKeys(Keybindings)
 
-    openspace.markInterestingNodes({ "Moon", "Apollo11LemModel", "Apollo17LemModel", "Apollo11", "Apollo11LunarLander" })
+    openspace.markInterestingNodes({
+      "Moon", "Apollo11LemModel", "Apollo17LemModel",
+      "Apollo11", "Apollo11LunarLander",
+      -- "Station_2_Boulder2",  "Station_6_Fragment1"
+    })
 
+    openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.BlendMode', 0);
     -- To enable both sites by default, uncomment these lines
-    -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.BlendMode', 0.000000);
     -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.Enabled', true);
     -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', true);
     -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.Enabled', true);
@@ -95,17 +99,19 @@ asset.onInitialize(function ()
     -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_station7.BlendMode', 0.000000);
     -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', true);
     -- openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', true);
-  
-    openspace.navigation.setCameraState({
-        Anchor = moonAsset.Moon.Identifier,
-        Position = { 0, 0, 0 },
-        Rotation = { 0, 0, 0, 0 },
-    })
-    openspace.globebrowsing.goToGeo(20, -60, 15000000)
+
+    openspace.setPropertyValueSingle('Scene.Apollo11LemDescentModel.Renderable.RotationVector', { 273.205475,6.904110,308.712311 });
+    openspace.setPropertyValueSingle('Scene.Apollo11LemLandedModel.Renderable.RotationVector', { 273.205475,6.904110,308.712311 });
+
+    openspace.globebrowsing.goToGeo(moonAsset.Moon.Identifier, 20, -60, 15000000)
 
     openspace.setPropertyValueSingle("Scene.Moon.Renderable.PerformShading", false)
 end)
 
 asset.onDeinitialize(function ()
-    openspace.removeInterestingNodes({ "Moon", "Apollo11Lem", "Apollo17Lem", "Apollo11", "Apollo11LunarLander" })
+    openspace.removeInterestingNodes({
+      "Moon", "Apollo11Lem", "Apollo17Lem",
+      "Apollo11", "Apollo11LemPosition",
+      -- "Station_6_Fragment1", "Station_6_Fragments_2_3"
+    })
 end)
diff --git a/data/assets/dawn.scene b/data/assets/dawn.scene
index b519b87da2..8af4d7bf6d 100644
--- a/data/assets/dawn.scene
+++ b/data/assets/dawn.scene
@@ -10,10 +10,9 @@ asset.onInitialize(function ()
 
     openspace.markInterestingNodes({ "Dawn", "Ceres", "Vesta" })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = DawnAsset.Dawn.Identifier,
         Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
-        Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
     })
 end)
 
diff --git a/data/assets/default.scene b/data/assets/default.scene
index 81300e342a..c6d3e2523c 100644
--- a/data/assets/default.scene
+++ b/data/assets/default.scene
@@ -1,20 +1,15 @@
 asset.require('./base')
 
 local earthAsset = asset.require('scene/solarsystem/planets/earth/earth')
+
 asset.onInitialize(function ()
     local now = openspace.time.currentWallTime()
-    -- Jump back one day to show a complete planet
+    -- Jump back one day to be able to show complete weather data on Earth.
     openspace.time.setTime(openspace.time.advancedTime(now, "-1d"))
 
+    openspace.globebrowsing.goToGeo("Earth", 58.5877, 16.1924, 20000000)
+
     openspace.markInterestingNodes({ "Earth", "Mars", "Moon", "Sun" })
-
-    openspace.navigation.setCameraState({
-        Anchor = earthAsset.Earth.Identifier,
-        Position = { 0, 0, 0 },
-        Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 },
-    })
-
-    openspace.globebrowsing.goToGeo(58.5877, 16.1924, 20000000)
 end)
 
 asset.onDeinitialize(function ()
diff --git a/data/assets/examples/basic.scene b/data/assets/examples/basic.scene
index 182c4776fe..ec17991a57 100644
--- a/data/assets/examples/basic.scene
+++ b/data/assets/examples/basic.scene
@@ -1,8 +1,9 @@
 local assetHelper = asset.require('util/asset_helper')
 local sceneHelper = asset.require('util/scene_helper')
 local propertyHelper = asset.require('util/property_helper')
+local debugHelper = asset.require('util/debug_helper')
 
--- At this point, a sceene needs basic spice data to load.
+-- At this point, a scene needs basic spice data to load.
 asset.require('spice/base')
 
 asset.require('util/default_keybindings')
@@ -12,10 +13,15 @@ asset.require('util/default_joystick')
 asset.require('util/webgui')
 local spheres = asset.require('examples/spheres')
 
+debugHelper.registerCartesianAxes(asset, {
+    Parent = "Root",
+    Scale = 10
+})
+
 asset.onInitialize(function ()   
-    openspace.navigation.setCameraState({
-        Anchor = spheres.ExampleSphere1.Identifier,
-        Position = { 20, 0, 0 },
-        Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 }
+    openspace.navigation.setNavigationState({
+        Anchor = "Root",
+        Position = { 20, 20, 20 },
+        Up = {0, 1, 0},
     })
 end)
diff --git a/data/assets/examples/screenspacebrowser.asset b/data/assets/examples/screenspacebrowser.asset
new file mode 100644
index 0000000000..f10350749e
--- /dev/null
+++ b/data/assets/examples/screenspacebrowser.asset
@@ -0,0 +1,10 @@
+local assetHelper = asset.require('util/asset_helper')
+
+local spec = {
+    Type = "ScreenSpaceBrowser",
+    Identifier = "ScreenSpaceBrowserExample",
+    Name = "Screen Space Browser Example",
+    Url = "https://www.openspaceproject.com/"
+};
+
+assetHelper.registerScreenSpaceRenderables(asset, { spec })
diff --git a/data/assets/gaia.scene b/data/assets/gaia.scene
index 94d2f8ddbb..45213dfeaa 100644
--- a/data/assets/gaia.scene
+++ b/data/assets/gaia.scene
@@ -35,10 +35,9 @@ asset.onInitialize(function ()
 
     openspace.markInterestingNodes({ "Gaia" })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = earthAsset.Earth.Identifier,
         Position = { 1000000000000.0, 1000000000000.0, 1000000000000.0 },
-        Rotation = { 0.683224, -0.765934, -0.601234, -0.418073 },
     })
 end)
 
diff --git a/data/assets/insight.scene b/data/assets/insight.scene
index 3c02820e60..d185471418 100644
--- a/data/assets/insight.scene
+++ b/data/assets/insight.scene
@@ -60,10 +60,11 @@ asset.onInitialize(function ()
 
     openspace.markInterestingNodes({ "Insight" })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = insightAsset.Insight.Identifier,
-        Position = { 0, 0, 0 },
-        Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 },
+        Position = { 8.430115E0, -1.791710E1, 2.813660E0 },
+        ReferenceFrame = "Root",
+        Up = { 0.494659E0,0.357162E0,0.792306E0 },
     })
 
 end)
diff --git a/data/assets/juno.scene b/data/assets/juno.scene
index 9ed6afaccd..f17e5c3f8b 100644
--- a/data/assets/juno.scene
+++ b/data/assets/juno.scene
@@ -18,10 +18,11 @@ asset.onInitialize(function ()
       28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
     })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = junoAsset.Juno.Identifier,
-        Position = { 1837386367.601345, -389860693812.834839, 714830404470.398926 },
-        Rotation = { -0.336540, 0.711402, -0.099212, 0.608937 },
+        Position = { 1.243398E8, 7.176068E7, -1.519733E7 },
+        ReferenceFrame = "Root",
+        Up = { -0.377400E0, 0.764573E0, 0.522492E0 },
     })
 end)
 
diff --git a/data/assets/messenger.scene b/data/assets/messenger.scene
index 850077d2b0..dc2f722880 100644
--- a/data/assets/messenger.scene
+++ b/data/assets/messenger.scene
@@ -33,10 +33,11 @@ asset.onInitialize(function ()
         28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
     })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = "Mercury",
-        Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
-        Rotation = {0.180662, 0.021334, 0.979084, 0.091111},
+        Position = { 2.423690E11, 1.979038E11, -2.241483E10 },
+        ReferenceFrame = "Root",
+        Up = { -0.492046E0, 0.666088E0, 0.560551E0 }
     })
 end)
 
diff --git a/data/assets/newhorizons.scene b/data/assets/newhorizons.scene
index 71f77d618a..9de5012f7d 100644
--- a/data/assets/newhorizons.scene
+++ b/data/assets/newhorizons.scene
@@ -255,10 +255,11 @@ asset.onInitialize(function ()
     openspace.setPropertyValueSingle('Scene.Charon.Renderable.Enabled', false)
     openspace.setPropertyValueSingle("Scene.PlutoBarycenterTrail.Renderable.Enabled", false)
 
-    openspace.navigation.setCameraState({
-        Anchor = NewHorizonsAsset.NewHorizons.Identifier,
-        Position = { 4662120063743.592773, 1263245003503.724854, -955413856565.788086 },
-        Rotation = { 0.683224, -0.165934, 0.701234, 0.118073 },
+    openspace.navigation.setNavigationState({
+        Anchor = "NewHorizons",
+        ReferenceFrame = "Root",
+        Position = { -6.572656E1, -7.239404E1, -2.111890E1 },
+        Up = { 0.102164, -0.362945, 0.926193 }
     })
 end)
 
diff --git a/data/assets/osirisrex.scene b/data/assets/osirisrex.scene
index a53e817cd2..285fdb5252 100644
--- a/data/assets/osirisrex.scene
+++ b/data/assets/osirisrex.scene
@@ -134,10 +134,9 @@ asset.onInitialize(function ()
 
     openspace.markInterestingNodes({ "OsirisRex", "BennuBarycenter", "Earth" })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = OsirisRexAsset.OsirisRex.Identifier,
-        Position = { 26974590199.661884, 76314608558.908020, -127086452897.101791 },
-        Rotation = { 0.729548, -0.126024, 0.416827, 0.527382 },
+        Position = { 26974590199.661884, 76314608558.908020, -127086452897.101791 }
     })
 end)
 
diff --git a/data/assets/rosetta.scene b/data/assets/rosetta.scene
index 67d5dc7951..315c8804fc 100644
--- a/data/assets/rosetta.scene
+++ b/data/assets/rosetta.scene
@@ -134,10 +134,11 @@ asset.onInitialize(function ()
         28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
     })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = Comet67PAsset.Comet67P.Identifier,
-        Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
-        Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
+        ReferenceFrame = "Root",
+        Position = { -7.294781E5 , -6.657894E5, 2.509047E6 },
+        Up = { 0.146529E0, 0.944727E0, 0.293290E0 }
     })
 
     openspace.setPropertyValue('Scene.67P.Renderable.PerformShading', false);
diff --git a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
index 4dac2821f8..d80419ac78 100644
--- a/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
+++ b/data/assets/scene/milkyway/gaia/gaia_dr2_download_stars.asset
@@ -1,19 +1,30 @@
 -- Download a dataset of 618 million stars (28 GB), already preprocessed and stored in a binary octree.
 -- The octree was generated from the full DR2 by filtering away all stars with a parallax error higher than 0.5
 -- Max Star Per Node = 50,000 and max distance = 500kpc
-asset.syncedResource({
+local gaia618Destination = asset.syncedResource({
     Name = "Gaia DR2 618M Octree",
     Type = "HttpSynchronization",
     Identifier = "gaia_stars_618M_octree",
     Version = 1
 })
+local gaia618DestinationExtracted = gaia618Destination + '/data';
 
 -- Download the full DR2 dataset with 24 values per star (preprocessed with theReadFitsTask (gaia_read.task) into 8 binary files).
 -- From these files new subsets can be created with the ConstructOctreeTask (gaia_octree.task). 
 -- Total size of download is 151 GB.
-asset.syncedResource({
+local gaiaFull = asset.syncedResource({
     Name = "Gaia DR2 Full Raw",
     Type = "HttpSynchronization",
     Identifier = "gaia_stars_dr2_raw",
     Version = 1
 })
+
+asset.onInitialize(function()
+    if not openspace.directoryExists(gaia618DestinationExtracted) then
+        openspace.printInfo("Extracted Gaia dataset")
+        openspace.unzipFile(gaia618Destination .. '/DR2_full_Octree[50kSPN,500dist]_50,50.zip', gaia618DestinationExtracted, true)
+    end
+end)
+
+asset.export('GaiaDR2_618M', gaia618DestinationExtracted)
+asset.export('GaiaFullDataset', gaiaFull)
diff --git a/data/assets/scene/solarsystem/interstellar/oumuamua.asset b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
index 33758e6224..2b972b5c3a 100644
--- a/data/assets/scene/solarsystem/interstellar/oumuamua.asset
+++ b/data/assets/scene/solarsystem/interstellar/oumuamua.asset
@@ -20,7 +20,8 @@ local OumuamuaTrail = {
         Color = { 0.9, 0.9, 0.0 },
         StartTime = "2014 JAN 01 00:00:00",
         EndTime = "2023 JAN 01 00:00:00",
-        SampleInterval = 60
+        SampleInterval = 7000,
+        TimeStampSubsampleFactor = 1
     },
     GUI = {
         Name = "'Oumuamua Trail",
diff --git a/data/assets/scene/solarsystem/missions/apollo/a11_lem.asset b/data/assets/scene/solarsystem/missions/apollo/a11_lem.asset
index 2a9182d715..05b81e0af4 100644
--- a/data/assets/scene/solarsystem/missions/apollo/a11_lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/a11_lem.asset
@@ -15,8 +15,8 @@ local Apollo11Lem = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+23.47306,
             Latitude = 0.67402,
-            FixedAltitude = -1927.65,
-            UseFixedAltitude = true
+            Altitude = -1927.65,
+            UseHeightMap = false
         },
     },
     GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/a17_lem.asset b/data/assets/scene/solarsystem/missions/apollo/a17_lem.asset
index 9d6f403071..3a88c8cf75 100644
--- a/data/assets/scene/solarsystem/missions/apollo/a17_lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/a17_lem.asset
@@ -14,6 +14,7 @@ local Apollo17Lem = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -329.22833,
             Latitude = 20.19092,
+            UseHeightmap = true
         },
     },
     GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/apollo11.asset
index 64f5dcd9bd..ac1c6eb153 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo11.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo11.asset
@@ -1,5 +1,8 @@
 local assetHelper = asset.require('util/asset_helper')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
+local descentKeyframes = asset.require('./apollo11_lem_descent.asset')
+local descentRotationKeyframes = asset.require('./apollo11_lem_descent_rotation.asset')
+local model = asset.require('scene/solarsystem/missions/apollo/lem_model')
 
 asset.require('spice/base')
 
@@ -11,7 +14,7 @@ local kernelsFolder = asset.syncedResource({
 })
 
 local modelFolder = asset.syncedResource({
-    Name = "Apollo Kernels",
+    Name = "Apollo Models",
     Type = "HttpSynchronization",
     Identifier = "apollo_11_models",
     Version = 1
@@ -24,7 +27,7 @@ local kernels = {
     kernelsFolder .. '/apollo11_orbits_full9km.bsp',
     kernelsFolder .. '/apollo11_orbits_lm9km.bsp',
 }
-
+--landing - 1969-07-20T20:17:40
 local apolloSpiceId = "-911"
 local apolloLemSpiceId = "-911500"
 
@@ -107,81 +110,44 @@ local Apollo11MoonTrail = {
     }
 }
 
--- Uncomment if you want to follow the mock decent
--- local Apollo11LemPosition = {
---     Identifier = "Apollo11LemPosition",
---     Parent = "Moon",
---     TimeFrame = {
---         Type = "TimeFrameInterval",
---         Start = "1969 JUL 20 19:10:25.183",
---         End = "1969 JUL 20 20:17:46.183"
---     },
---     Transform = {
---         Translation = {
---             Type = "SpiceTranslation",
---             Target = apolloLemSpiceId,
---             Observer = "MOON",
---             Frame = "MOON_ME",         
---             Kernels = kernels
---         },
---     },
---     GUI = {
---         Hidden = true,
---         Name = "Apollo 11 Lunar Lander Position",
---         Path = "/Solar System/Missions/Apollo/11"
---     }
--- }
 
--- local Apollo11LunarLanderModel = {
---     Identifier = "Apollo11LunarLander",
---     Parent = Apollo11LemPosition.Identifier,
---     Transform = {
---         Rotation = {
---             Type = "StaticRotation",
---             Rotation = {0.0, 0.0, -3.1415/2}
---         },
---         Scale = {
---             Type = "StaticScale",
---             Scale = 100.0
---         }
---     },
---     TimeFrame = {
---         Type = "TimeFrameInterval",
---         Start = "1969 JUL 20 19:10:25.183",
---         End = "1969 JUL 20 20:17:46.183"
---     },
---     Renderable = {
---         Type = "RenderableModel",
---         Geometry = {
---             Type = "MultiModelGeometry",
---             GeometryFile = modelFolder .. "/lem_nasa.obj"
---         },
---         ColorTexture = modelFolder .. "/gray.png",
---         LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
---     },
---     GUI = {
---         Hidden = false,
---         Name = "Apollo 11 Lunar Lander",
---         Path = "/Solar System/Missions/Apollo/11"
---     }
--- }
-
-local Apollo11LemTrail = {
-    Identifier = "Apollo11LemTrail",
-    Parent = "Moon",
-    Renderable = {
-        Type = "RenderableTrailTrajectory",
-        Translation = {
+local lemTranslation = {
+    Type = "TimelineTranslation",
+    Keyframes = {
+         -- 20:14:30 is an arbitrary cutoff, but last 4 minutes data in descentKeyframes
+         -- begins at 20.14.40. Due to linear interpolation, we will get
+         -- a 10s linear transition to the location where the descentKeyframes start.
+        ['1969 JUL 20 20:14:30'] = {
             Type = "SpiceTranslation",
             Target = apolloLemSpiceId,
             Observer = "MOON",
             Frame = "IAU_MOON",
             Kernels = kernels
         },
-        Color = {0.780000,0.940000,0.340000 },
+        ['1969 JUL 20 20:14:40'] = {
+            Type = "TimelineTranslation",
+            Keyframes = descentKeyframes.keyframes
+        }
+    }
+}
+
+local lemRotation = {
+    Type = "TimelineRotation",
+    Keyframes = descentRotationKeyframes.keyframes
+}
+
+
+
+local Apollo11LemTrail = {
+    Identifier = "Apollo11LemTrail",
+    Parent = "Moon",
+    Renderable = {
+        Type = "RenderableTrailTrajectory",
+        Translation = lemTranslation,
+        Color = { 0.780000,0.940000,0.340000 },
         StartTime = "1969 JUL 20 19:10:25.183",
         EndTime = "1969 JUL 20 20:17:46.183",
-        SampleInterval = 60,
+        SampleInterval = 2,
         EnableFade = false,
         Enabled = false,
     },
@@ -191,11 +157,91 @@ local Apollo11LemTrail = {
     }
 }
 
+local Apollo11LemPosition = {
+    Identifier = "Apollo11LemPosition",
+    Parent = "Moon",
+    TimeFrame = {
+        Type = "TimeFrameInterval",
+        Start = "1969 JUL 20 19:10:25.183"
+    },
+    Transform = {
+        Translation = lemTranslation,
+        Rotation = lemRotation
+    },
+    GUI = {
+        Hidden = false,
+        Name = "Apollo 11 Lunar Lander Position",
+        Path = "/Solar System/Missions/Apollo/11"
+    }
+}
+--landing - 1969-07-20T20:17:40
+
+local Apollo11LemDescentModel = {
+    Identifier = "Apollo11LemDescentModel",
+    Parent = Apollo11LemPosition.Identifier,
+    TimeFrame = {
+        Type = "TimeFrameInterval",
+        Start = "1969 JUL 19 19:38:29.183",
+        End = "1969 JUL 20 20:17:40.0"
+    },
+    Transform = {
+         Scale = {
+            Type = "StaticScale",
+            Scale = 0.24
+        }
+    },
+    Renderable = {
+        Type = "RenderableModel",
+        Geometry = {
+            Type = "MultiModelGeometry",
+            GeometryFile = model.modelFolder .. "/lmremoved.obj"
+        },
+        ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
+        LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
+    },
+    GUI = {
+        Hidden = false,
+        Name = "Apollo 11 Descent Lem",
+        Path = "/Solar System/Missions/Apollo/11"
+    }
+}
+
+local Apollo11LemLandedModel = {
+    Identifier = "Apollo11LemLandedModel",
+    Parent = Apollo11LemPosition.Identifier,
+    TimeFrame = {
+        Type = "TimeFrameInterval",
+        Start = "1969 JUL 20 20:17:40.0"
+    },
+    Transform = {
+         Scale = {
+            Type = "StaticScale",
+            Scale = 0.24
+        }
+    },
+    Renderable = {
+        Type = "RenderableModel",
+        Geometry = {
+            Type = "MultiModelGeometry",
+            GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj"
+        },
+        ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
+        LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
+    },
+    GUI = {
+        Hidden = false,
+        Name = "Apollo 11 Landed Lem",
+        Path = "/Solar System/Missions/Apollo/11"
+    }
+}
+
+
 local exportList = {
-    Apollo11Position, 
-    -- Apollo11LemPosition, 
+    Apollo11Position,
+    Apollo11LemPosition,
     Apollo11Model,
-    -- Apollo11LunarLanderModel,
+    Apollo11LemDescentModel,
+    Apollo11LemLandedModel,
     Apollo11MoonTrail,
     Apollo11LemTrail,
 }
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo11_lem_descent.asset b/data/assets/scene/solarsystem/missions/apollo/apollo11_lem_descent.asset
new file mode 100644
index 0000000000..93128f5181
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo11_lem_descent.asset
@@ -0,0 +1,1835 @@
+-- The following keyframe data was converted from the_last_four_minutes_2019-06-09.kml,
+-- which is available at http://apollo.mem-tek.com/GoogleMoonKMZ.html
+
+-- In the conversion, some assumptions and simplifications were made:
+--   * The descent markers in the KML have Point nodes expressed "relative to ground"
+--     We assume that the ground is fixed at altitude 1927.65 meters below the reference ellipsoid,
+--     in order to match height data from a height map constructed from LRO data.
+--   * We manually offset the coordiantes slightly, by 0.013496003622691433 degrees in longitude and -0.007472581881668883 degrees in latitude,
+--     in order to match the landing spot specified at long: 23.47306, lat: 0.67402 extracted from footage from LRO.
+--     The kml file provided 23.45956399637731, lat: 0.6814925818816688 as the landing coordinates - hence the manual offset.
+--     If more accurate height/color maps are aqcuired, these values can be adjusted by running the conversion script again.
+--     For more information, contact emil.axelsson@liu.se.
+
+
+local keyframes = {
+    ['1969-07-20T20:13:40'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.64480784327766,
+        Latitude = 0.6899960896998255,
+        Altitude = -1546.3568594681615,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:41'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.64371058653857,
+        Latitude = 0.6878218095380976,
+        Altitude = -1565.4215164947534,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:42'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.64182673932963,
+        Latitude = 0.6868724573827948,
+        Altitude = -1565.4215164947534,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:43'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.64054706630478,
+        Latitude = 0.6858670898943581,
+        Altitude = -1579.0391286566048,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:44'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.63636509003987,
+        Latitude = 0.6869318608730292,
+        Altitude = -1579.0391286566048,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:45'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.63333610553231,
+        Latitude = 0.6875049989808152,
+        Altitude = -1584.4861735213453,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:46'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.630258198415152,
+        Latitude = 0.6879251024075629,
+        Altitude = -1587.2096959537155,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:47'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.62944534804935,
+        Latitude = 0.6868614912680597,
+        Altitude = -1592.656740818456,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:48'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.62679291745059,
+        Latitude = 0.6859161360075229,
+        Altitude = -1604.9125917641222,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:49'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.624085315638872,
+        Latitude = 0.685126212476227,
+        Altitude = -1619.8919651421588,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:50'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.62142772795633,
+        Latitude = 0.6848656185526153,
+        Altitude = -1630.7860548716399,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:51'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.617193313827283,
+        Latitude = 0.6849603490017026,
+        Altitude = -1630.7860548716399,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:52'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.61543137875974,
+        Latitude = 0.68523470439912,
+        Altitude = -1629.4242936554547,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:53'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.61158202958536,
+        Latitude = 0.6853852597026965,
+        Altitude = -1633.5095773040102,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:54'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.60991413189263,
+        Latitude = 0.6852537398149626,
+        Altitude = -1643.041905817306,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:55'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.607915527643012,
+        Latitude = 0.6853963551830907,
+        Altitude = -1662.106562843898,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:56'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.605996916437142,
+        Latitude = 0.6830167672762936,
+        Altitude = -1663.4683240600832,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:57'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.6027345854584,
+        Latitude = 0.6824580715414034,
+        Altitude = -1671.09418687072,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:58'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.60047452065999,
+        Latitude = 0.6837230890353062,
+        Altitude = -1671.638891357194,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:13:59'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.598006245556462,
+        Latitude = 0.6851039272779041,
+        Altitude = -1670.277130141009,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:00'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.594980604909782,
+        Latitude = 0.6859011120513393,
+        Altitude = -1683.8947423028603,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:01'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.595085912567033,
+        Latitude = 0.685405665002322,
+        Altitude = -1698.874115680897,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:02'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.5930664955042,
+        Latitude = 0.6852493785380211,
+        Altitude = -1701.597638113267,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:03'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.591385100243283,
+        Latitude = 0.6848676328581234,
+        Altitude = -1709.768205410378,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:04'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.58888799865371,
+        Latitude = 0.6847945134519827,
+        Altitude = -1717.9387727074889,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:05'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.58707895840121,
+        Latitude = 0.6847997274847563,
+        Altitude = -1720.662295139859,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:06'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.585134523523262,
+        Latitude = 0.6844679679748537,
+        Altitude = -1726.1093400045995,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:07'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.58309233633901,
+        Latitude = 0.6845115405154798,
+        Altitude = -1730.194623653155,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:08'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.581800658763132,
+        Latitude = 0.6837790677972603,
+        Altitude = -1737.0034297340808,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:09'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.580055660445762,
+        Latitude = 0.6831436064664251,
+        Altitude = -1741.0887133826361,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:10'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.57863282556605,
+        Latitude = 0.6828140286921376,
+        Altitude = -1749.259280679747,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:11'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.57640031861404,
+        Latitude = 0.6825176811105468,
+        Altitude = -1751.9828031121174,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:12'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.57398679174075,
+        Latitude = 0.6826876185178852,
+        Altitude = -1750.6210418959322,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:13'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.57156483164977,
+        Latitude = 0.6825035088375115,
+        Altitude = -1758.7916091930429,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:14'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.568805614344672,
+        Latitude = 0.6825830127392937,
+        Altitude = -1764.2386540577836,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:15'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.56712274763365,
+        Latitude = 0.6821390846562359,
+        Altitude = -1764.2386540577836,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:16'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.56530723506546,
+        Latitude = 0.6815597518028071,
+        Altitude = -1772.4092213548943,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:17'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.56412162578659,
+        Latitude = 0.6811736246098009,
+        Altitude = -1773.7709825710795,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:18'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.56276962682385,
+        Latitude = 0.6808738576281527,
+        Altitude = -1779.2180274358202,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:19'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.560994966586822,
+        Latitude = 0.6806433210749815,
+        Altitude = -1781.9415498681901,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:20'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.55943927760013,
+        Latitude = 0.680762500394614,
+        Altitude = -1788.7503559491158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:21'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.55808185917876,
+        Latitude = 0.6806932677701746,
+        Altitude = -1788.205651462642,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:22'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.556393791415733,
+        Latitude = 0.6811207130416086,
+        Altitude = -1791.4738783814862,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:23'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.55496480157647,
+        Latitude = 0.6814204204715102,
+        Altitude = -1792.8356395976714,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:24'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.55306742293409,
+        Latitude = 0.6817752241315425,
+        Altitude = -1795.5591620300418,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:25'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.55137129589691,
+        Latitude = 0.6815869620825672,
+        Altitude = -1802.3679681109675,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:26'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.54977453252549,
+        Latitude = 0.681089420496018,
+        Altitude = -1805.0914905433376,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:27'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.548083879890072,
+        Latitude = 0.6807962459602379,
+        Altitude = -1807.8150129757078,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:28'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.546540200146502,
+        Latitude = 0.6805000865197504,
+        Altitude = -1810.5385354080781,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:29'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.54516644867878,
+        Latitude = 0.6804026508636472,
+        Altitude = -1815.9855802728187,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:30'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.54408346592703,
+        Latitude = 0.6805503084088244,
+        Altitude = -1817.3473414890038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:31'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.54339758182375,
+        Latitude = 0.6804859303352504,
+        Altitude = -1818.709102705189,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:32'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.54194570925206,
+        Latitude = 0.6803064377127922,
+        Altitude = -1821.4326251375592,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:33'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.54085221251783,
+        Latitude = 0.6801546546560774,
+        Altitude = -1824.9732042996407,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:34'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.53954140597472,
+        Latitude = 0.6797325898259152,
+        Altitude = -1827.696726732011,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:35'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.537934104316932,
+        Latitude = 0.679569186740729,
+        Altitude = -1831.7820103805664,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:36'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.53689199133522,
+        Latitude = 0.6794114031790662,
+        Altitude = -1833.6884760832256,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:37'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.53536814560564,
+        Latitude = 0.6791732992510942,
+        Altitude = -1836.9567030020698,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:38'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.53395331216349,
+        Latitude = 0.6792039275673737,
+        Altitude = -1839.4078731912032,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:39'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.53275788877434,
+        Latitude = 0.6790059399149831,
+        Altitude = -1840.497282164151,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:40'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.531279977460432,
+        Latitude = 0.6788794363528592,
+        Altitude = -1844.5825658127067,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:41'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.52959475512685,
+        Latitude = 0.6788906739797406,
+        Altitude = -1845.9443270288918,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:42'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.52769228385669,
+        Latitude = 0.6787279693068425,
+        Altitude = -1848.123144974788,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:43'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.52685377337869,
+        Latitude = 0.6787634478561919,
+        Altitude = -1850.8466674071583,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:44'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.526284004538702,
+        Latitude = 0.6785694853441325,
+        Altitude = -1853.0254853530546,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:45'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.5258419320743,
+        Latitude = 0.6784720829848033,
+        Altitude = -1852.2084286233435,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:46'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.524906401275462,
+        Latitude = 0.6784174518581257,
+        Altitude = -1855.7490077854247,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:47'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.52349915098792,
+        Latitude = 0.6782893729810321,
+        Altitude = -1857.383121244847,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:48'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.522315823805602,
+        Latitude = 0.6780556991046269,
+        Altitude = -1859.5619391907433,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:49'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.52101739233993,
+        Latitude = 0.6779647310824661,
+        Altitude = -1862.2854616231134,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:50'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.51994166433182,
+        Latitude = 0.6778711676787862,
+        Altitude = -1864.7366318122467,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:51'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.51898851685442,
+        Latitude = 0.6778817565177891,
+        Altitude = -1866.643097514906,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:52'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.51808183367586,
+        Latitude = 0.6778718533214779,
+        Altitude = -1868.821915460802,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:53'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.517315195124922,
+        Latitude = 0.6777409244088132,
+        Altitude = -1869.6389721905132,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:54'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.516423288093712,
+        Latitude = 0.6776383502937863,
+        Altitude = -1872.0901423796465,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:55'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.515618488386473,
+        Latitude = 0.6775904175972421,
+        Altitude = -1873.7242558390685,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:56'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.514931748492103,
+        Latitude = 0.677451729714544,
+        Altitude = -1875.0860170552537,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:57'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.5141592094038,
+        Latitude = 0.6774090469390076,
+        Altitude = -1876.1754260282019,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:58'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.513268517407862,
+        Latitude = 0.677380792748438,
+        Altitude = -1878.3542439740982,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:14:59'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.51249864236425,
+        Latitude = 0.6773301671802587,
+        Altitude = -1878.8989484605722,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:00'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.511670817073732,
+        Latitude = 0.6773498341149018,
+        Altitude = -1879.9883574335202,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:01'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.510927468201952,
+        Latitude = 0.6773124695718212,
+        Altitude = -1881.0777664064683,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:02'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.510140364179833,
+        Latitude = 0.6772452153026853,
+        Altitude = -1882.9842321091276,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:03'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50940612514804,
+        Latitude = 0.6772084204274821,
+        Altitude = -1884.3459933253127,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:04'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.508556629045042,
+        Latitude = 0.6771417022964165,
+        Altitude = -1885.1630500550239,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:05'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.5078270022667,
+        Latitude = 0.6770996409435569,
+        Altitude = -1885.707754541498,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:06'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50712374883535,
+        Latitude = 0.6770942256987497,
+        Altitude = -1886.7971635144459,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:07'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50638631083077,
+        Latitude = 0.6770208020089364,
+        Altitude = -1888.158924730631,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:08'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50572166907488,
+        Latitude = 0.6769421116864789,
+        Altitude = -1888.431276973868,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:09'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.505080467779102,
+        Latitude = 0.6769068207439769,
+        Altitude = -1889.5206859468162,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:10'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.504394828536693,
+        Latitude = 0.6768437996516232,
+        Altitude = -1890.6100949197644,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:11'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50370057106609,
+        Latitude = 0.6767452474349132,
+        Altitude = -1891.9718561359496,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:12'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.503056349392182,
+        Latitude = 0.6766723806693259,
+        Altitude = -1893.3336173521345,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:13'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50246925266341,
+        Latitude = 0.6766252349202276,
+        Altitude = -1893.8783218386086,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:14'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50184956306549,
+        Latitude = 0.6765535257068991,
+        Altitude = -1894.9677308115567,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:15'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.501422630419572,
+        Latitude = 0.6765112802947014,
+        Altitude = -1894.1506740818456,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:16'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50104221348722,
+        Latitude = 0.676487362071662,
+        Altitude = -1893.8783218386086,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:17'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50076948252455,
+        Latitude = 0.6764658967447386,
+        Altitude = -1892.2442083791866,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:18'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.50013364513089,
+        Latitude = 0.6764482060496164,
+        Altitude = -1893.3336173521345,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:19'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.499460285339502,
+        Latitude = 0.6764309028737,
+        Altitude = -1894.9677308115567,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:20'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.498899330647752,
+        Latitude = 0.6763755753041285,
+        Altitude = -1896.057139784505,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:21'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.49826864115494,
+        Latitude = 0.6763489810183512,
+        Altitude = -1896.601844270979,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:22'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.49765193973772,
+        Latitude = 0.6763177659437667,
+        Altitude = -1897.41890100069,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:23'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.49706547748806,
+        Latitude = 0.6762368192356724,
+        Altitude = -1898.2359577304012,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:24'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.496489420526313,
+        Latitude = 0.676209886695223,
+        Altitude = -1899.053014460112,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:25'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.495878153012562,
+        Latitude = 0.6761763249034947,
+        Altitude = -1900.1424234330602,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:26'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.4953425244022,
+        Latitude = 0.6761311089575274,
+        Altitude = -1901.5041846492454,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:27'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.494725217962213,
+        Latitude = 0.6761017566851846,
+        Altitude = -1902.5935936221936,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:28'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.494112443564592,
+        Latitude = 0.6760842983575135,
+        Altitude = -1903.4106503519047,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:29'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.493537644480202,
+        Latitude = 0.6760386448926926,
+        Altitude = -1903.9553548383788,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:30'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.49299719757025,
+        Latitude = 0.6760147528943234,
+        Altitude = -1903.9553548383788,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:31'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.492415313069813,
+        Latitude = 0.6759919962423392,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:32'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.491877755110142,
+        Latitude = 0.6759640721591937,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:33'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.49128819308786,
+        Latitude = 0.6759491077295323,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:34'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.49073158429634,
+        Latitude = 0.6759379383686839,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:35'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.490174891596332,
+        Latitude = 0.6759054634588104,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:36'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.489635065407523,
+        Latitude = 0.6758939648884956,
+        Altitude = -1904.5000593248528,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:37'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.4891060535486,
+        Latitude = 0.6759004097281942,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:38'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48855436619652,
+        Latitude = 0.6758862600165565,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:39'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.488052711552413,
+        Latitude = 0.6758544116957282,
+        Altitude = -1904.5000593248528,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:40'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48754943516269,
+        Latitude = 0.6758316193430558,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:41'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.487094304824993,
+        Latitude = 0.6758175052522961,
+        Altitude = -1904.2277070816158,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:42'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.486618165034592,
+        Latitude = 0.6757757367756437,
+        Altitude = -1904.7724115680899,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:43'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48604740534131,
+        Latitude = 0.675733428263931,
+        Altitude = -1905.3171160545637,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:44'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48548248435554,
+        Latitude = 0.6756797157749009,
+        Altitude = -1905.8618205410378,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:45'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48494957486896,
+        Latitude = 0.6756120527881188,
+        Altitude = -1905.8618205410378,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:46'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.484598386683622,
+        Latitude = 0.675584857481579,
+        Altitude = -1907.49593400046,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:47'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.4841269963268,
+        Latitude = 0.6755482784409179,
+        Altitude = -1908.040638486934,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:48'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48373390336955,
+        Latitude = 0.6754890811171497,
+        Altitude = -1908.8576952166452,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:49'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48325134882829,
+        Latitude = 0.6754258626149947,
+        Altitude = -1908.4491668517896,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:50'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48284574619883,
+        Latitude = 0.6753753196460469,
+        Altitude = -1909.1300474598822,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:51'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48245362823393,
+        Latitude = 0.6753264776464533,
+        Altitude = -1909.4023997031193,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:52'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.482060114185842,
+        Latitude = 0.6752749804130574,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:53'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.481698202127482,
+        Latitude = 0.675223605520775,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:54'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48129046365451,
+        Latitude = 0.6751730022703166,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:55'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.480893026154902,
+        Latitude = 0.6751376710849429,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:56'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48059324160945,
+        Latitude = 0.6750772226256051,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:57'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48034984354739,
+        Latitude = 0.6750430267458865,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:58'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.48005268645993,
+        Latitude = 0.6750019848756621,
+        Altitude = -1909.6747519463563,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:15:59'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47978070153665,
+        Latitude = 0.6749655364121049,
+        Altitude = -1909.9471041895933,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:00'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47951311851127,
+        Latitude = 0.6749420304945992,
+        Altitude = -1909.9471041895933,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:01'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47927978098579,
+        Latitude = 0.6748989409040068,
+        Altitude = -1909.9471041895933,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:02'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47904250519933,
+        Latitude = 0.6748472712728636,
+        Altitude = -1910.4918086760674,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:03'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47879202998348,
+        Latitude = 0.674809514541568,
+        Altitude = -1910.7641609193045,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:04'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.478567222437622,
+        Latitude = 0.6747692774477394,
+        Altitude = -1910.7641609193045,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:05'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47836548542964,
+        Latitude = 0.6747160116119115,
+        Altitude = -1910.7641609193045,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:06'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47818769774975,
+        Latitude = 0.6746866473279819,
+        Altitude = -1911.3088654057785,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:07'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.477896613823983,
+        Latitude = 0.6746547793250971,
+        Altitude = -1913.2153311084376,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:08'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47781195503974,
+        Latitude = 0.6746276583132307,
+        Altitude = -1913.2153311084376,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:09'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.477664452707373,
+        Latitude = 0.6746112868414526,
+        Altitude = -1914.0323878381487,
+        UseHeightmap = false
+    },
+    -- ['1969-07-20T20:16:10'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.477750217762413,
+    --     Latitude = 0.6745910947360472,
+    --     Altitude = -1912.6706266219635,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:11'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.477590925415402,
+    --     Latitude = 0.6745598993839581,
+    --     Altitude = -1912.6706266219635,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:12'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47745952757753,
+    --     Latitude = 0.6745298610932787,
+    --     Altitude = -1912.6706266219635,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:13'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.477271343369093,
+    --     Latitude = 0.6745166392893209,
+    --     Altitude = -1913.2153311084376,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:14'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.477100932665042,
+    --     Latitude = 0.6744937499451563,
+    --     Altitude = -1914.3047400813857,
+    --     UseHeightmap = false
+    -- },
+    ['1969-07-20T20:16:15'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47697690593997,
+        Latitude = 0.6744644602883288,
+        Altitude = -1914.8494445678598,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:16'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.476842953277412,
+        Latitude = 0.6744457159538018,
+        Altitude = -1915.1217968110968,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:17'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.476774052091812,
+        Latitude = 0.6744243634139203,
+        Altitude = -1914.8494445678598,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:18'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47665204889191,
+        Latitude = 0.6743981221140924,
+        Altitude = -1915.1217968110968,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:19'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47657652039885,
+        Latitude = 0.6743808573601865,
+        Altitude = -1915.1217968110968,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:20'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.476475036022492,
+        Latitude = 0.6743552389834175,
+        Altitude = -1914.8494445678598,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:21'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47638671770867,
+        Latitude = 0.6743412077411113,
+        Altitude = -1915.3941490543339,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:22'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.476286834646782,
+        Latitude = 0.6743241644041175,
+        Altitude = -1915.3941490543339,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:23'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47623840477727,
+        Latitude = 0.6743121023448013,
+        Altitude = -1915.3941490543339,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:24'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.476125794037742,
+        Latitude = 0.6743019779643423,
+        Altitude = -1915.938853540808,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:25'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47604582826371,
+        Latitude = 0.6742984062330349,
+        Altitude = -1916.211205784045,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:26'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47599605084473,
+        Latitude = 0.6742864748966985,
+        Altitude = -1916.211205784045,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:27'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47598166921822,
+        Latitude = 0.6742856341308172,
+        Altitude = -1916.755910270519,
+        UseHeightmap = false
+    },
+    -- ['1969-07-20T20:16:28'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47600003592791,
+    --     Latitude = 0.6742816108377042,
+    --     Altitude = -1916.211205784045,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:29'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47593990066764,
+    --     Latitude = 0.6742699316275284,
+    --     Altitude = -1916.483558027282,
+    --     UseHeightmap = false
+    -- },
+    ['1969-07-20T20:16:30'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47587957412098,
+        Latitude = 0.6742661771136219,
+        Altitude = -1916.755910270519,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:31'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47579282136856,
+        Latitude = 0.6742214263433656,
+        Altitude = -1917.028262513756,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:32'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47571834266516,
+        Latitude = 0.6741885448706321,
+        Altitude = -1917.5729670002302,
+        UseHeightmap = false
+    },
+    -- ['1969-07-20T20:16:33'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47569457676149,
+    --     Latitude = 0.6741859152655852,
+    --     Altitude = -1917.3006147569931,
+    --     UseHeightmap = false
+    -- },
+    ['1969-07-20T20:16:34'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47557041293751,
+        Latitude = 0.6741798073326593,
+        Altitude = -1918.117671486704,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:35'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.475475681892203,
+        Latitude = 0.6741822414281841,
+        Altitude = -1918.117671486704,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:36'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47541533097675,
+        Latitude = 0.6742009046793005,
+        Altitude = -1918.390023729941,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:37'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47532207549478,
+        Latitude = 0.6742269926054295,
+        Altitude = -1918.662375973178,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:38'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47522251798864,
+        Latitude = 0.6742695236577596,
+        Altitude = -1918.662375973178,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:39'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47513564425997,
+        Latitude = 0.6742809051574165,
+        Altitude = -1918.662375973178,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:40'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47498810518855,
+        Latitude = 0.6743095342428154,
+        Altitude = -1920.2964894326003,
+        UseHeightmap = false
+    },
+    -- ['1969-07-20T20:16:41'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47489523759891,
+    --     Latitude = 0.6743154022599566,
+    --     Altitude = -1920.0241371893633,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:42'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47479438729774,
+    --     Latitude = 0.6743324078003049,
+    --     Altitude = -1920.2964894326003,
+    --     UseHeightmap = false
+    -- },
+    -- ['1969-07-20T20:16:43'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47475788126512,
+    --     Latitude = 0.674345583979325,
+    --     Altitude = -1920.0241371893633,
+    --     UseHeightmap = false
+    -- },
+    ['1969-07-20T20:16:44'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.474678823712882,
+        Latitude = 0.6743691203511213,
+        Altitude = -1920.2964894326003,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:45'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47460302474115,
+        Latitude = 0.6743890347121807,
+        Altitude = -1920.2964894326003,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:46'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47450130965027,
+        Latitude = 0.6744202280781089,
+        Altitude = -1920.8411939190744,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:47'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.474379586340042,
+        Latitude = 0.6744490653475903,
+        Altitude = -1921.1135461623114,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:48'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47431921657337,
+        Latitude = 0.6745028925523043,
+        Altitude = -1921.1135461623114,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:49'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47424698504895,
+        Latitude = 0.6745115395661241,
+        Altitude = -1921.1135461623114,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:50'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.474158028620153,
+        Latitude = 0.6745268900936557,
+        Altitude = -1921.6582506487855,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:51'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47408003386958,
+        Latitude = 0.674531434078838,
+        Altitude = -1921.6582506487855,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:52'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473993195514502,
+        Latitude = 0.6745434127092755,
+        Altitude = -1921.9306028920225,
+        UseHeightmap = false
+    },
+    -- ['1969-07-20T20:16:53'] = {
+    --     Type = "GlobeTranslation",
+    --     Globe = "Moon",
+    --     Longitude = 23.47392353665608,
+    --     Latitude = 0.6745464032805983,
+    --     Altitude = -1922.2029551352596,
+    --     UseHeightmap = false
+    -- },
+    ['1969-07-20T20:16:54'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47388537487237,
+        Latitude = 0.674552865152663,
+        Altitude = -1921.9306028920225,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:55'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47382957912373,
+        Latitude = 0.6745443566727537,
+        Altitude = -1921.9306028920225,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:56'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47378652829031,
+        Latitude = 0.6745361955127924,
+        Altitude = -1921.6582506487855,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:57'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473741159081282,
+        Latitude = 0.6745139398577651,
+        Altitude = -1921.6582506487855,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:58'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473674434325403,
+        Latitude = 0.6745046665169872,
+        Altitude = -1922.2029551352596,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:16:59'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47366202033169,
+        Latitude = 0.6744553774680945,
+        Altitude = -1922.2029551352596,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:00'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47360771579434,
+        Latitude = 0.6744345598586292,
+        Altitude = -1922.7476596217336,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:01'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47357090816817,
+        Latitude = 0.6744054827778567,
+        Altitude = -1923.0200118649707,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:02'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47354290217646,
+        Latitude = 0.6743765403194303,
+        Altitude = -1923.2923641082077,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:03'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47354640286736,
+        Latitude = 0.6743332580785223,
+        Altitude = -1923.5647163514448,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:04'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473541367503802,
+        Latitude = 0.6742974556070759,
+        Altitude = -1923.8370685946818,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:05'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47350854369485,
+        Latitude = 0.6742858449512636,
+        Altitude = -1924.1094208379188,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:06'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47347424911663,
+        Latitude = 0.6742611487873781,
+        Altitude = -1924.6541253243927,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:07'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473503629496022,
+        Latitude = 0.6742462694505276,
+        Altitude = -1924.6541253243927,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:08'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473512768546712,
+        Latitude = 0.6742384048959066,
+        Altitude = -1924.6541253243927,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:09'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47353343175876,
+        Latitude = 0.6742241072273591,
+        Altitude = -1924.3817730811559,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:10'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47353316391657,
+        Latitude = 0.6742142580747189,
+        Altitude = -1925.4711820541038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:11'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47355774790429,
+        Latitude = 0.6742015107317392,
+        Altitude = -1924.9264775676297,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:12'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.4735540335665,
+        Latitude = 0.6741800864866416,
+        Altitude = -1924.9264775676297,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:13'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47353500681606,
+        Latitude = 0.6741617950501063,
+        Altitude = -1925.1988298108668,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:14'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47350664772458,
+        Latitude = 0.6741447111551033,
+        Altitude = -1925.4711820541038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:15'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473494757982273,
+        Latitude = 0.6741430011390509,
+        Altitude = -1925.4711820541038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:16'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473485349949943,
+        Latitude = 0.6741431504511513,
+        Altitude = -1925.4711820541038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:17'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473464448566723,
+        Latitude = 0.674141681840806,
+        Altitude = -1925.4711820541038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:18'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47344203973089,
+        Latitude = 0.6741518055278933,
+        Altitude = -1925.4711820541038,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:19'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473416197134252,
+        Latitude = 0.6741705280217748,
+        Altitude = -1925.7435342973408,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:20'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47339416150648,
+        Latitude = 0.6741799656622618,
+        Altitude = -1925.7435342973408,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:21'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.4733232813815,
+        Latitude = 0.6741727841821631,
+        Altitude = -1926.288238783815,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:24'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47324174890097,
+        Latitude = 0.6742091863213222,
+        Altitude = -1926.288238783815,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:27'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47317556908458,
+        Latitude = 0.6742072669430229,
+        Altitude = -1926.560591027052,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:30'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47310752310149,
+        Latitude = 0.6742134078571678,
+        Altitude = -1926.832943270289,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:32'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.473074792306253,
+        Latitude = 0.6741925230045956,
+        Altitude = -1927.105295513526,
+        UseHeightmap = false
+    },
+    ['1969-07-20T20:17:40'] = {
+        Type = "GlobeTranslation",
+        Globe = "Moon",
+        Longitude = 23.47306,
+        Latitude = 0.67402,
+        Altitude = -1927.65,
+        UseHeightmap = false
+    },
+};
+
+asset.export('keyframes', keyframes);
+
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo11_lem_descent_rotation.asset b/data/assets/scene/solarsystem/missions/apollo/apollo11_lem_descent_rotation.asset
new file mode 100644
index 0000000000..2c45cb9d0f
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo11_lem_descent_rotation.asset
@@ -0,0 +1,1587 @@
+asset.export('keyframes', {
+    -- ['1969-7-20T20:9:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3815, -0.0048, -0.4891}
+    -- },
+    -- ['1969-7-20T20:9:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3773, 0.0042, -0.3557}
+    -- },
+    -- ['1969-7-20T20:9:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3677, 0.0184, -0.2218}
+    -- },
+    -- ['1969-7-20T20:9:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3606, -0.0117, -0.0861}
+    -- },
+    -- ['1969-7-20T20:10:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3587, -0.0222, -0.0219}
+    -- },
+    -- ['1969-7-20T20:10:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3622, -0.0207, -0.0533}
+    -- },
+    -- ['1969-7-20T20:10:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3639, -0.0032, -0.0640}
+    -- },
+    -- ['1969-7-20T20:10:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3612, 0.0178, -0.0685}
+    -- },
+    -- ['1969-7-20T20:10:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3571, 0.0196, -0.0796}
+    -- },
+    -- ['1969-7-20T20:10:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3484, 0.0029, -0.0913}
+    -- },
+    -- ['1969-7-20T20:10:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3597, -0.0149, -0.0832}
+    -- },
+    -- ['1969-7-20T20:10:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3587, -0.0220, -0.0679}
+    -- },
+    -- ['1969-7-20T20:10:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3482, -0.0121, -0.0736}
+    -- },
+    -- ['1969-7-20T20:10:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3520, -0.0098, -0.0876}
+    -- },
+    -- ['1969-7-20T20:10:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3503, -0.0240, -0.0872}
+    -- },
+    -- ['1969-7-20T20:10:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3470, 0.0245, -0.0545}
+    -- },
+    -- ['1969-7-20T20:10:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3420, 0.0115, -0.0518}
+    -- },
+    -- ['1969-7-20T20:10:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3294, -0.0153, -0.0556}
+    -- },
+    -- ['1969-7-20T20:10:31'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3399, -0.0136, -0.0573}
+    -- },
+    -- ['1969-7-20T20:10:33'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3459, 0.0002, -0.0569}
+    -- },
+    -- ['1969-7-20T20:10:35'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3440, 0.0012, -0.0542}
+    -- },
+    -- ['1969-7-20T20:10:37'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3230, -0.0096, -0.0527}
+    -- },
+    -- ['1969-7-20T20:10:39'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2966, -0.0119, -0.0510}
+    -- },
+    -- ['1969-7-20T20:10:41'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3146, -0.0040, -0.0504}
+    -- },
+    -- ['1969-7-20T20:10:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.3355, -0.0015, -0.0514}
+    -- },
+    -- ['1969-7-20T20:10:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2916, 0.0061, -0.0516}
+    -- },
+    -- ['1969-7-20T20:10:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2901, -0.0257, -0.0516}
+    -- },
+    -- ['1969-7-20T20:10:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2818, -0.0123, -0.0495}
+    -- },
+    -- ['1969-7-20T20:10:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2682, 0.0058, -0.0477}
+    -- },
+    -- ['1969-7-20T20:10:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2732, 0.0035, -0.0195}
+    -- },
+    -- ['1969-7-20T20:10:54'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2740, 0.0029, 0.0123}
+    -- },
+    -- ['1969-7-20T20:10:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2778, 0.0035, 0.0234}
+    -- },
+    -- ['1969-7-20T20:10:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2573, 0.0069, 0.0174}
+    -- },
+    -- ['1969-7-20T20:10:58'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2515, -0.0023, 0.0115}
+    -- },
+    -- ['1969-7-20T20:10:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2333, -0.0092, 0.0092}
+    -- },
+    -- ['1969-7-20T20:11:0'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2191, -0.0157, 0.0056}
+    -- },
+    -- ['1969-7-20T20:11:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2246, -0.0195, 0.0029}
+    -- },
+    -- ['1969-7-20T20:11:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2419, -0.0146, -0.0019}
+    -- },
+    -- ['1969-7-20T20:11:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2274, -0.0054, -0.0048}
+    -- },
+    -- ['1969-7-20T20:11:6'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2218, -0.0042, -0.0056}
+    -- },
+    -- ['1969-7-20T20:11:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2047, 0.0010, -0.0065}
+    -- },
+    -- ['1969-7-20T20:11:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2042, -0.0054, -0.0069}
+    -- },
+    -- ['1969-7-20T20:11:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2007, -0.0100, -0.0077}
+    -- },
+    -- ['1969-7-20T20:11:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2136, -0.0173, -0.0077}
+    -- },
+    -- ['1969-7-20T20:11:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.2013, -0.0021, -0.0077}
+    -- },
+    -- ['1969-7-20T20:11:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1928, 0.0102, -0.0056}
+    -- },
+    -- ['1969-7-20T20:11:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1854, 0.0090, -0.0057}
+    -- },
+    -- ['1969-7-20T20:11:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1856, -0.0075, -0.0044}
+    -- },
+    -- ['1969-7-20T20:11:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1670, -0.0157, -0.0023}
+    -- },
+    -- ['1969-7-20T20:11:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1599, -0.0149, 0.0012}
+    -- },
+    -- ['1969-7-20T20:11:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1514, -0.0119, 0.0012}
+    -- },
+    -- ['1969-7-20T20:11:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1465, -0.0094, 0.0040}
+    -- },
+    -- ['1969-7-20T20:11:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1593, -0.0176, 0.0063}
+    -- },
+    -- ['1969-7-20T20:11:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1712, -0.0144, 0.0132}
+    -- },
+    -- ['1969-7-20T20:11:24'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1727, -0.0052, 0.0176}
+    -- },
+    -- ['1969-7-20T20:11:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1652, 0.0083, 0.0190}
+    -- },
+    -- ['1969-7-20T20:11:26'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1827, -0.0044, 0.0178}
+    -- },
+    -- ['1969-7-20T20:11:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1942, -0.0172, 0.0180}
+    -- },
+    -- ['1969-7-20T20:11:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1788, -0.0071, 0.0188}
+    -- },
+    -- ['1969-7-20T20:11:30'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1639, 0.0035, 0.0176}
+    -- },
+    -- ['1969-7-20T20:11:31'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1614, 0.0048, 0.0178}
+    -- },
+    -- ['1969-7-20T20:11:31'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1551, 0.0083, 0.0169}
+    -- },
+    -- ['1969-7-20T20:11:33'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1643, 0.0060, 0.0175}
+    -- },
+    -- ['1969-7-20T20:11:35'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1746, 0.0006, 0.0173}
+    -- },
+    -- ['1969-7-20T20:11:35'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1679, -0.0008, 0.0178}
+    -- },
+    -- ['1969-7-20T20:11:37'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1735, -0.0127, 0.0173}
+    -- },
+    -- ['1969-7-20T20:11:37'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1599, -0.0044, 0.0186}
+    -- },
+    -- ['1969-7-20T20:11:39'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1545, 0.0012, 0.0167}
+    -- },
+    -- ['1969-7-20T20:11:39'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1461, 0.0075, 0.0169}
+    -- },
+    -- ['1969-7-20T20:11:41'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1470, 0.0012, 0.0155}
+    -- },
+    -- ['1969-7-20T20:11:41'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1442, -0.0086, 0.0148}
+    -- },
+    -- ['1969-7-20T20:11:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1411, -0.0236, 0.0142}
+    -- },
+    -- ['1969-7-20T20:11:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1302, -0.0240, 0.0131}
+    -- },
+    -- ['1969-7-20T20:11:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1098, -0.0115, 0.0140}
+    -- },
+    -- ['1969-7-20T20:11:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1043, -0.0088, 0.0134}
+    -- },
+    -- ['1969-7-20T20:11:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0979, -0.0025, 0.0144}
+    -- },
+    -- ['1969-7-20T20:11:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1092, -0.0125, 0.0144}
+    -- },
+    -- ['1969-7-20T20:11:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1175, -0.0205, 0.0146}
+    -- },
+    -- ['1969-7-20T20:11:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1230, -0.0249, 0.0157}
+    -- },
+    -- ['1969-7-20T20:11:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1099, -0.0119, 0.0161}
+    -- },
+    -- ['1969-7-20T20:11:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.1056, -0.0071, 0.0167}
+    -- },
+    -- ['1969-7-20T20:11:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0916, 0.0044, 0.0131}
+    -- },
+    -- ['1969-7-20T20:11:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0901, 0.0073, 0.0111}
+    -- },
+    -- ['1969-7-20T20:11:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0839, 0.0040, 0.0075}
+    -- },
+    -- ['1969-7-20T20:11:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0832, 0.0015, 0.0050}
+    -- },
+    -- ['1969-7-20T20:11:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0831, -0.0109, 0.0003}
+    -- },
+    -- ['1969-7-20T20:11:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0812, -0.0147, -0.0009}
+    -- },
+    -- ['1969-7-20T20:11:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0814, -0.0278, -0.0031}
+    -- },
+    -- ['1969-7-20T20:11:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0696, -0.0224, -0.0050}
+    -- },
+    -- ['1969-7-20T20:12:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0617, -0.0242, -0.0067}
+    -- },
+    -- ['1969-7-20T20:12:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0508, -0.0174, -0.0075}
+    -- },
+    -- ['1969-7-20T20:12:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0523, -0.0174, -0.0094}
+    -- },
+    -- ['1969-7-20T20:12:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0466, -0.0117, -0.0094}
+    -- },
+    -- ['1969-7-20T20:12:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0565, -0.0107, -0.0109}
+    -- },
+    -- ['1969-7-20T20:12:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0559, -0.0080, -0.0109}
+    -- },
+    -- ['1969-7-20T20:12:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0686, -0.0065, -0.0113}
+    -- },
+    -- ['1969-7-20T20:12:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0692, -0.0082, -0.0115}
+    -- },
+    -- ['1969-7-20T20:12:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0722, -0.0075, -0.0107}
+    -- },
+    -- ['1969-7-20T20:12:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0707, -0.0144, -0.0113}
+    -- },
+    -- ['1969-7-20T20:12:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0630, -0.0153, -0.0103}
+    -- },
+    -- ['1969-7-20T20:12:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0605, -0.0261, -0.0102}
+    -- },
+    -- ['1969-7-20T20:12:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0441, -0.0305, -0.0096}
+    -- },
+    -- ['1969-7-20T20:12:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0427, -0.0410, -0.0086}
+    -- },
+    -- ['1969-7-20T20:12:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0283, -0.0228, -0.0075}
+    -- },
+    -- ['1969-7-20T20:12:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0329, -0.0178, -0.0050}
+    -- },
+    -- ['1969-7-20T20:12:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0260, -0.0009, -0.0027}
+    -- },
+    -- ['1969-7-20T20:12:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0404, -0.0059, -0.0004}
+    -- },
+    -- ['1969-7-20T20:12:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0467, -0.0140, 0.0023}
+    -- },
+    -- ['1969-7-20T20:12:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0584, -0.0220, 0.0044}
+    -- },
+    -- ['1969-7-20T20:12:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0416, -0.0176, 0.0088}
+    -- },
+    -- ['1969-7-20T20:12:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0370, -0.0102, 0.0104}
+    -- },
+    -- ['1969-7-20T20:12:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0222, -0.0063, 0.0121}
+    -- },
+    -- ['1969-7-20T20:12:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0193, 0.0006, 0.0108}
+    -- },
+    -- ['1969-7-20T20:12:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0166, -0.0059, 0.0098}
+    -- },
+    -- ['1969-7-20T20:12:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0164, -0.0038, 0.0092}
+    -- },
+    -- ['1969-7-20T20:12:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0237, -0.0188, 0.0081}
+    -- },
+    -- ['1969-7-20T20:12:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0249, -0.0199, 0.0081}
+    -- },
+    -- ['1969-7-20T20:12:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0329, -0.0330, 0.0077}
+    -- },
+    -- ['1969-7-20T20:12:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0209, -0.0255, 0.0079}
+    -- },
+    -- ['1969-7-20T20:12:31'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0157, -0.0205, 0.0084}
+    -- },
+    -- ['1969-7-20T20:12:31'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0034, -0.0159, 0.0092}
+    -- },
+    -- ['1969-7-20T20:12:33'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0044, -0.0136, 0.0106}
+    -- },
+    -- ['1969-7-20T20:12:33'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9963, -0.0161, 0.0096}
+    -- },
+    -- ['1969-7-20T20:12:35'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0036, -0.0180, 0.0084}
+    -- },
+    -- ['1969-7-20T20:12:35'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9998, -0.0253, 0.0073}
+    -- },
+    -- ['1969-7-20T20:12:37'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0088, -0.0265, 0.0065}
+    -- },
+    -- ['1969-7-20T20:12:37'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0105, -0.0339, 0.0065}
+    -- },
+    -- ['1969-7-20T20:12:39'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0230, -0.0280, 0.0060}
+    -- },
+    -- ['1969-7-20T20:12:39'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0253, -0.0282, 0.0067}
+    -- },
+    -- ['1969-7-20T20:12:41'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0216, -0.0071, 0.0067}
+    -- },
+    -- ['1969-7-20T20:12:42'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0118, -0.0115, 0.0079}
+    -- },
+    -- ['1969-7-20T20:12:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9946, -0.0098, 0.0077}
+    -- },
+    -- ['1969-7-20T20:12:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9927, -0.0172, 0.0081}
+    -- },
+    -- ['1969-7-20T20:12:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9890, -0.0147, 0.0094}
+    -- },
+    -- ['1969-7-20T20:12:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0046, -0.0125, 0.0094}
+    -- },
+    -- ['1969-7-20T20:12:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0109, -0.0048, 0.0104}
+    -- },
+    -- ['1969-7-20T20:12:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0186, -0.0057, 0.0083}
+    -- },
+    -- ['1969-7-20T20:12:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9940, -0.0226, 0.0048}
+    -- },
+    -- ['1969-7-20T20:12:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9861, -0.0278, 0.0023}
+    -- },
+    -- ['1969-7-20T20:12:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9712, -0.0301, 0.0000}
+    -- },
+    -- ['1969-7-20T20:12:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9768, -0.0176, -0.0013}
+    -- },
+    -- ['1969-7-20T20:12:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9791, -0.0088, -0.0025}
+    -- },
+    -- ['1969-7-20T20:12:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9890, -0.0017, -0.0036}
+    -- },
+    -- ['1969-7-20T20:12:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9906, -0.0245, -0.0056}
+    -- },
+    -- ['1969-7-20T20:12:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9892, -0.0303, -0.0067}
+    -- },
+    -- ['1969-7-20T20:12:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9852, -0.0470, -0.0086}
+    -- },
+    -- ['1969-7-20T20:12:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9837, -0.0307, -0.0088}
+    -- },
+    -- ['1969-7-20T20:12:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9873, -0.0128, -0.0090}
+    -- },
+    -- ['1969-7-20T20:12:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9861, 0.0010, -0.0088}
+    -- },
+    -- ['1969-7-20T20:13:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9944, -0.0117, -0.0094}
+    -- },
+    -- ['1969-7-20T20:13:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9900, -0.0194, -0.0100}
+    -- },
+    -- ['1969-7-20T20:13:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9917, -0.0355, -0.0103}
+    -- },
+    -- ['1969-7-20T20:13:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9856, -0.0395, -0.0105}
+    -- },
+    -- ['1969-7-20T20:13:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9969, -0.0299, -0.0096}
+    -- },
+    -- ['1969-7-20T20:13:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9965, -0.0228, -0.0088}
+    -- },
+    -- ['1969-7-20T20:13:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-1.0015, -0.0073, -0.0075}
+    -- },
+    -- ['1969-7-20T20:13:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9908, -0.0098, -0.0067}
+    -- },
+    -- ['1969-7-20T20:13:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9814, -0.0034, -0.0057}
+    -- },
+    -- ['1969-7-20T20:13:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9729, -0.0071, -0.0044}
+    -- },
+    -- ['1969-7-20T20:13:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9716, -0.0002, -0.0029}
+    -- },
+    -- ['1969-7-20T20:13:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9729, -0.0044, -0.0013}
+    -- },
+    -- ['1969-7-20T20:13:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9793, 0.0010, 0.0006}
+    -- },
+    -- ['1969-7-20T20:13:14'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9869, -0.0040, 0.0031}
+    -- },
+    -- ['1969-7-20T20:13:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9938, -0.0031, 0.0048}
+    -- },
+    -- ['1969-7-20T20:13:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9978, -0.0134, 0.0067}
+    -- },
+    -- ['1969-7-20T20:13:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9881, -0.0334, 0.0048}
+    -- },
+    -- ['1969-7-20T20:13:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9881, -0.0449, 0.0023}
+    -- },
+    -- ['1969-7-20T20:13:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9756, -0.0447, -0.0015}
+    -- },
+    -- ['1969-7-20T20:13:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9804, -0.0351, -0.0034}
+    -- },
+    -- ['1969-7-20T20:13:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9769, -0.0269, -0.0052}
+    -- },
+    -- ['1969-7-20T20:13:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9816, -0.0182, -0.0073}
+    -- },
+    -- ['1969-7-20T20:13:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9783, -0.0192, -0.0084}
+    -- },
+    -- ['1969-7-20T20:13:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9808, -0.0149, -0.0103}
+    -- },
+    -- ['1969-7-20T20:13:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9771, -0.0197, -0.0117}
+    -- },
+    -- ['1969-7-20T20:13:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9748, -0.0171, -0.0127}
+    -- },
+    -- ['1969-7-20T20:13:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9710, -0.0197, -0.0144}
+    -- },
+    -- ['1969-7-20T20:13:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9643, -0.0186, -0.0146}
+    -- },
+    -- ['1969-7-20T20:13:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9616, -0.0165, -0.0159}
+    -- },
+    -- ['1969-7-20T20:13:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9534, -0.0163, -0.0159}
+    -- },
+    -- ['1969-7-20T20:13:31'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.9605, -0.0096, -0.0165}
+    -- },
+    -- ['1969-7-20T20:13:41'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.8092, -0.0297, -0.0155}
+    -- },
+    -- ['1969-7-20T20:13:41'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.8097, -0.0389, -0.0149}
+    -- },
+    -- ['1969-7-20T20:13:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7923, -0.0358, -0.0138}
+    -- },
+    -- ['1969-7-20T20:13:43'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7988, -0.0267, -0.0125}
+    -- },
+    -- ['1969-7-20T20:13:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7909, -0.0128, -0.0094}
+    -- },
+    -- ['1969-7-20T20:13:45'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7967, -0.0061, -0.0080}
+    -- },
+    -- ['1969-7-20T20:13:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7748, -0.0207, -0.0056}
+    -- },
+    -- ['1969-7-20T20:13:47'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7681, -0.0278, -0.0048}
+    -- },
+    -- ['1969-7-20T20:13:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7574, -0.0426, -0.0027}
+    -- },
+    -- ['1969-7-20T20:13:49'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7582, -0.0364, -0.0004}
+    -- },
+    -- ['1969-7-20T20:13:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7699, -0.0324, 0.0036}
+    -- },
+    -- ['1969-7-20T20:13:51'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7676, -0.0245, 0.0040}
+    -- },
+    -- ['1969-7-20T20:13:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7733, -0.0194, 0.0023}
+    -- },
+    -- ['1969-7-20T20:13:53'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7574, -0.0207, 0.0008}
+    -- },
+    -- ['1969-7-20T20:13:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7440, -0.0310, -0.0017}
+    -- },
+    -- ['1969-7-20T20:13:55'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7405, -0.0569, -0.0044}
+    -- },
+    -- ['1969-7-20T20:13:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7549, -0.0587, -0.0054}
+    -- },
+    -- ['1969-7-20T20:13:57'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7518, -0.0326, -0.0046}
+    -- },
+    -- ['1969-7-20T20:13:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7465, 0.0040, -0.0050}
+    -- },
+    -- ['1969-7-20T20:13:59'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.7465, 0.0113, -0.0050}
+    -- },
+    -- ['1969-7-20T20:14:1'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6939, 0.0029, -0.0063}
+    -- },
+    -- ['1969-7-20T20:14:2'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6912, 0.0079, -0.0079}
+    -- },
+    -- ['1969-7-20T20:14:3'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6793, 0.0048, -0.0077}
+    -- },
+    -- ['1969-7-20T20:14:4'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6817, 0.0090, -0.0098}
+    -- },
+    -- ['1969-7-20T20:14:5'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6730, 0.0117, -0.0090}
+    -- },
+    -- ['1969-7-20T20:14:6'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6684, 0.0102, -0.0096}
+    -- },
+    -- ['1969-7-20T20:14:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6604, 0.0115, -0.0109}
+    -- },
+    -- ['1969-7-20T20:14:7'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6418, 0.0006, -0.0098}
+    -- },
+    -- ['1969-7-20T20:14:9'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6301, -0.0067, -0.0121}
+    -- },
+    -- ['1969-7-20T20:14:10'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6128, -0.0142, -0.0119}
+    -- },
+    -- ['1969-7-20T20:14:11'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6180, -0.0134, -0.0119}
+    -- },
+    -- ['1969-7-20T20:14:12'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6249, -0.0057, -0.0121}
+    -- },
+    -- ['1969-7-20T20:14:13'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6299, -0.0057, -0.0098}
+    -- },
+    -- ['1969-7-20T20:14:14'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6437, -0.0009, -0.0100}
+    -- },
+    -- ['1969-7-20T20:14:15'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6328, -0.0105, -0.0100}
+    -- },
+    -- ['1969-7-20T20:14:16'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6285, -0.0232, -0.0088}
+    -- },
+    -- ['1969-7-20T20:14:17'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6195, -0.0291, -0.0117}
+    -- },
+    -- ['1969-7-20T20:14:18'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6073, -0.0374, -0.0127}
+    -- },
+    -- ['1969-7-20T20:14:19'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.6027, -0.0362, -0.0132}
+    -- },
+    -- ['1969-7-20T20:14:20'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5892, -0.0314, -0.0147}
+    -- },
+    -- ['1969-7-20T20:14:21'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5829, -0.0096, -0.0157}
+    -- },
+    -- ['1969-7-20T20:14:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5674, 0.0119, -0.0263}
+    -- },
+    -- ['1969-7-20T20:14:23'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5674, 0.0261, -0.0324}
+    -- },
+    -- ['1969-7-20T20:14:25'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5637, 0.0232, -0.0439}
+    -- },
+    -- ['1969-7-20T20:14:26'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5670, 0.0081, -0.0525}
+    -- },
+    -- ['1969-7-20T20:14:27'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5739, 0.0013, -0.0564}
+    -- },
+    -- ['1969-7-20T20:14:28'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5660, -0.0021, -0.0587}
+    -- },
+    -- ['1969-7-20T20:14:29'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5603, -0.0025, -0.0604}
+    -- },
+    -- ['1969-7-20T20:14:30'] = {
+    --     Type = "StaticRotation",
+    --     Rotation  = {-0.5394, 0.0092, -0.0562}
+    -- },
+    ['1969-7-20T20:10:00'] = {
+        Type = "StaticRotation",
+        Rotation  = {0, 0, 1.5708}
+    },
+    ['1969-7-20T20:12:10'] = {
+        Type = "StaticRotation",
+        Rotation  = {0, 0, 1.5708}
+    },
+    ['1969-7-20T20:12:14'] = {
+        Type = "StaticRotation",
+        Rotation  = {0, 0, 1.5708}
+    },
+    ['1969-7-20T20:14:30'] = {
+        Type = "StaticRotation",
+        Rotation  = {0, 0, 1.5708}
+    },
+
+    ['1969-7-20T20:14:31'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.5133, 0.0131, -0.0531}
+    },
+    ['1969-7-20T20:14:32'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.5043, 0.0117, -0.0487}
+    },
+    ['1969-7-20T20:14:33'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4893, 0.0090, -0.0447}
+    },
+    ['1969-7-20T20:14:33'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4851, -0.0008, -0.0429}
+    },
+    ['1969-7-20T20:14:35'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4865, -0.0057, -0.0382}
+    },
+    ['1969-7-20T20:14:35'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4788, -0.0073, -0.0345}
+    },
+    ['1969-7-20T20:14:37'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4824, -0.0130, -0.0307}
+    },
+    ['1969-7-20T20:14:37'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4836, -0.0103, -0.0268}
+    },
+    ['1969-7-20T20:14:39'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4792, -0.0121, -0.0203}
+    },
+    ['1969-7-20T20:14:40'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4874, -0.0140, -0.0211}
+    },
+    ['1969-7-20T20:14:41'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.5030, 0.0002, -0.0209}
+    },
+    ['1969-7-20T20:14:42'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.5361, -0.0040, -0.0209}
+    },
+    ['1969-7-20T20:14:44'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4715, -0.0040, -0.0234}
+    },
+    ['1969-7-20T20:14:45'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4433, -0.0050, -0.0238}
+    },
+    ['1969-7-20T20:14:46'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4280, -0.0019, -0.0268}
+    },
+    ['1969-7-20T20:14:47'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4310, -0.0069, -0.0259}
+    },
+    ['1969-7-20T20:14:48'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4389, -0.0147, -0.0257}
+    },
+    ['1969-7-20T20:14:49'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4519, -0.0178, -0.0287}
+    },
+    ['1969-7-20T20:14:50'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4579, -0.0201, -0.0278}
+    },
+    ['1969-7-20T20:14:51'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4554, -0.0147, -0.0265}
+    },
+    ['1969-7-20T20:14:52'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4468, -0.0084, -0.0284}
+    },
+    ['1969-7-20T20:14:53'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4316, -0.0127, -0.0268}
+    },
+    ['1969-7-20T20:14:53'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4228, -0.0171, -0.0255}
+    },
+    ['1969-7-20T20:14:55'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.4046, -0.0174, -0.0274}
+    },
+    ['1969-7-20T20:14:57'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3806, -0.0211, -0.0243}
+    },
+    ['1969-7-20T20:14:57'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3751, -0.0178, -0.0249}
+    },
+    ['1969-7-20T20:14:59'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3670, -0.0153, -0.0230}
+    },
+    ['1969-7-20T20:14:59'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3641, -0.0100, -0.0209}
+    },
+    ['1969-7-20T20:15:1'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3526, -0.0021, -0.0207}
+    },
+    ['1969-7-20T20:15:1'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3457, -0.0038, -0.0195}
+    },
+    ['1969-7-20T20:15:3'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3371, -0.0038, -0.0161}
+    },
+    ['1969-7-20T20:15:3'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3309, -0.0015, -0.0192}
+    },
+    ['1969-7-20T20:15:5'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3263, -0.0096, -0.0232}
+    },
+    ['1969-7-20T20:15:5'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3240, 0.0015, -0.0243}
+    },
+    ['1969-7-20T20:15:7'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3160, 0.0061, -0.0295}
+    },
+    ['1969-7-20T20:15:7'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3135, 0.0035, -0.0318}
+    },
+    ['1969-7-20T20:15:9'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3074, 0.0108, -0.0341}
+    },
+    ['1969-7-20T20:15:9'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.3022, 0.0027, -0.0360}
+    },
+    ['1969-7-20T20:15:11'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2995, -0.0061, -0.0406}
+    },
+    ['1969-7-20T20:15:11'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2976, -0.0098, -0.0416}
+    },
+    ['1969-7-20T20:15:13'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2901, -0.0127, -0.0447}
+    },
+    ['1969-7-20T20:15:14'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2886, -0.0169, -0.0470}
+    },
+    ['1969-7-20T20:15:15'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2700, -0.0174, -0.0491}
+    },
+    ['1969-7-20T20:15:15'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2107, -0.0119, -0.0512}
+    },
+    ['1969-7-20T20:15:17'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1630, -0.0123, -0.0560}
+    },
+    ['1969-7-20T20:15:18'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1101, -0.0077, -0.0583}
+    },
+    ['1969-7-20T20:15:19'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0868, -0.0029, -0.0613}
+    },
+    ['1969-7-20T20:15:19'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0893, -0.0036, -0.0642}
+    },
+    ['1969-7-20T20:15:21'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0892, -0.0029, -0.0675}
+    },
+    ['1969-7-20T20:15:21'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0970, -0.0004, -0.0698}
+    },
+    ['1969-7-20T20:15:23'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1020, -0.0079, -0.0736}
+    },
+    ['1969-7-20T20:15:24'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0959, -0.0069, -0.0771}
+    },
+    ['1969-7-20T20:15:25'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0999, -0.0057, -0.0794}
+    },
+    ['1969-7-20T20:15:26'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1001, -0.0075, -0.0828}
+    },
+    ['1969-7-20T20:15:27'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0966, -0.0067, -0.0849}
+    },
+    ['1969-7-20T20:15:28'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1039, -0.0050, -0.0876}
+    },
+    ['1969-7-20T20:15:29'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1055, -0.0059, -0.0893}
+    },
+    ['1969-7-20T20:15:30'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1010, -0.0050, -0.0909}
+    },
+    ['1969-7-20T20:15:31'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1066, -0.0036, -0.0903}
+    },
+    ['1969-7-20T20:15:32'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1106, -0.0032, -0.0882}
+    },
+    ['1969-7-20T20:15:33'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1074, -0.0019, -0.0874}
+    },
+    ['1969-7-20T20:15:34'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1131, 0.0021, -0.0857}
+    },
+    ['1969-7-20T20:15:35'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1193, 0.0036, -0.0842}
+    },
+    ['1969-7-20T20:15:36'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1193, 0.0083, -0.0819}
+    },
+    ['1969-7-20T20:15:37'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1233, 0.0129, -0.0809}
+    },
+    ['1969-7-20T20:15:38'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1365, 0.0194, -0.0786}
+    },
+    ['1969-7-20T20:15:39'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1334, 0.0230, -0.0765}
+    },
+    ['1969-7-20T20:15:40'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1267, 0.0257, -0.0744}
+    },
+    ['1969-7-20T20:15:41'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1271, 0.0288, -0.0732}
+    },
+    ['1969-7-20T20:15:42'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1206, 0.0272, -0.0700}
+    },
+    ['1969-7-20T20:15:43'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1465, 0.0244, -0.0692}
+    },
+    ['1969-7-20T20:15:44'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1931, 0.0217, -0.0692}
+    },
+    ['1969-7-20T20:15:45'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1981, 0.0205, -0.0679}
+    },
+    ['1969-7-20T20:15:46'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2048, 0.0173, -0.0656}
+    },
+    ['1969-7-20T20:15:47'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2151, 0.0169, -0.0650}
+    },
+    ['1969-7-20T20:15:48'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2385, 0.0132, -0.0633}
+    },
+    ['1969-7-20T20:15:49'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2590, 0.0092, -0.0623}
+    },
+    ['1969-7-20T20:15:50'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2607, 0.0077, -0.0608}
+    },
+    ['1969-7-20T20:15:51'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2646, 0.0056, -0.0600}
+    },
+    ['1969-7-20T20:15:52'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2680, 0.0004, -0.0575}
+    },
+    ['1969-7-20T20:15:53'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2682, -0.0011, -0.0560}
+    },
+    ['1969-7-20T20:15:54'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2742, -0.0044, -0.0543}
+    },
+    ['1969-7-20T20:15:55'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2757, -0.0061, -0.0522}
+    },
+    ['1969-7-20T20:15:56'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2727, -0.0065, -0.0491}
+    },
+    ['1969-7-20T20:15:57'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2724, -0.0063, -0.0474}
+    },
+    ['1969-7-20T20:15:58'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2732, -0.0077, -0.0445}
+    },
+    ['1969-7-20T20:15:59'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2709, -0.0092, -0.0420}
+    },
+    ['1969-7-20T20:16:0'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2690, -0.0102, -0.0387}
+    },
+    ['1969-7-20T20:16:1'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2704, -0.0115, -0.0368}
+    },
+    ['1969-7-20T20:16:2'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2704, -0.0142, -0.0332}
+    },
+    ['1969-7-20T20:16:3'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2700, -0.0153, -0.0305}
+    },
+    ['1969-7-20T20:16:4'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2736, -0.0176, -0.0268}
+    },
+    ['1969-7-20T20:16:5'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2752, -0.0199, -0.0243}
+    },
+    ['1969-7-20T20:16:6'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2752, -0.0238, -0.0207}
+    },
+    ['1969-7-20T20:16:7'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.2702, -0.0245, -0.0205}
+    },
+    ['1969-7-20T20:16:8'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1841, -0.0217, -0.0219}
+    },
+    ['1969-7-20T20:16:9'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1632, -0.0217, -0.0226}
+    },
+    ['1969-7-20T20:16:26'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0989, -0.0184, -0.0391}
+    },
+    ['1969-7-20T20:16:27'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0968, -0.0167, -0.0393}
+    },
+    ['1969-7-20T20:16:28'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0171, -0.0103, -0.0406}
+    },
+    ['1969-7-20T20:16:29'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0157, -0.0105, -0.0412}
+    },
+    ['1969-7-20T20:16:30'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0127, -0.0103, -0.0427}
+    },
+    ['1969-7-20T20:16:31'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0134, -0.0147, -0.0433}
+    },
+    ['1969-7-20T20:16:32'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0042, -0.0370, -0.0470}
+    },
+    ['1969-7-20T20:16:33'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0092, -0.0506, -0.0487}
+    },
+    ['1969-7-20T20:16:34'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0244, -0.0512, -0.0510}
+    },
+    ['1969-7-20T20:16:35'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0042, -0.0546, -0.0512}
+    },
+    ['1969-7-20T20:16:36'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0006, -0.0558, -0.0533}
+    },
+    ['1969-7-20T20:16:37'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0050, -0.0522, -0.0543}
+    },
+    ['1969-7-20T20:16:38'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0077, -0.0343, -0.0548}
+    },
+    ['1969-7-20T20:16:39'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0004, -0.0155, -0.0550}
+    },
+    ['1969-7-20T20:16:40'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0036, -0.0105, -0.0571}
+    },
+    ['1969-7-20T20:16:41'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0080, -0.0086, -0.0579}
+    },
+    ['1969-7-20T20:16:42'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0698, -0.0140, -0.0604}
+    },
+    ['1969-7-20T20:16:43'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0579, -0.0134, -0.0623}
+    },
+    ['1969-7-20T20:16:44'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0462, -0.0090, -0.0648}
+    },
+    ['1969-7-20T20:16:45'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0466, -0.0067, -0.0665}
+    },
+    ['1969-7-20T20:16:46'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0529, -0.0027, -0.0694}
+    },
+    ['1969-7-20T20:16:47'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0518, 0.0079, -0.0707}
+    },
+    ['1969-7-20T20:16:48'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0602, 0.0299, -0.0729}
+    },
+    ['1969-7-20T20:16:49'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0510, 0.0562, -0.0729}
+    },
+    ['1969-7-20T20:16:50'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0539, 0.0562, -0.0765}
+    },
+    ['1969-7-20T20:16:51'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0928, 0.0545, -0.0813}
+    },
+    ['1969-7-20T20:16:52'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0886, 0.0560, -0.0844}
+    },
+    ['1969-7-20T20:16:53'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0832, 0.0552, -0.0865}
+    },
+    ['1969-7-20T20:16:54'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0805, 0.0573, -0.0899}
+    },
+    ['1969-7-20T20:16:55'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0784, 0.0614, -0.0924}
+    },
+    ['1969-7-20T20:16:56'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0729, 0.0635, -0.0945}
+    },
+    ['1969-7-20T20:16:57'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0792, 0.0627, -0.0976}
+    },
+    ['1969-7-20T20:17:7'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1056, -0.0366, -0.1402}
+    },
+    ['1969-7-20T20:17:7'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.1053, -0.0395, -0.1428}
+    },
+    ['1969-7-20T20:17:9'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0725, -0.0314, -0.1503}
+    },
+    ['1969-7-20T20:17:9'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0259, -0.0270, -0.1542}
+    },
+    ['1969-7-20T20:17:11'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0874, -0.0059, -0.1614}
+    },
+    ['1969-7-20T20:17:12'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0769, -0.0096, -0.1678}
+    },
+    ['1969-7-20T20:17:13'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0740, -0.0270, -0.1743}
+    },
+    ['1969-7-20T20:17:14'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0673, -0.0458, -0.1810}
+    },
+    ['1969-7-20T20:17:15'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0550, -0.0506, -0.1860}
+    },
+    ['1969-7-20T20:17:16'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0449, -0.0577, -0.1931}
+    },
+    ['1969-7-20T20:17:17'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0437, -0.0617, -0.1967}
+    },
+    ['1969-7-20T20:17:18'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0297, -0.0650, -0.2027}
+    },
+    ['1969-7-20T20:17:19'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0203, -0.0518, -0.2061}
+    },
+    ['1969-7-20T20:17:20'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0211, -0.0201, -0.2109}
+    },
+    ['1969-7-20T20:17:21'] = {
+        Type = "StaticRotation",
+        Rotation  = {0.0228, -0.0197, -0.2159}
+    },
+    ['1969-7-20T20:17:22'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0201, -0.0257, -0.2230}
+    },
+    ['1969-7-20T20:17:23'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0299, -0.0125, -0.2287}
+    },
+    ['1969-7-20T20:17:24'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0368, -0.0025, -0.2355}
+    },
+    ['1969-7-20T20:17:25'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0464, 0.0209, -0.2408}
+    },
+    ['1969-7-20T20:17:26'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0548, 0.0474, -0.2472}
+    },
+    ['1969-7-20T20:17:27'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0535, 0.0464, -0.2481}
+    },
+    ['1969-7-20T20:17:28'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0512, 0.0508, -0.2491}
+    },
+    ['1969-7-20T20:17:29'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0625, 0.0781, -0.2504}
+    },
+    ['1969-7-20T20:17:30'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0811, 0.0711, -0.2531}
+    },
+    ['1969-7-20T20:17:31'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0855, 0.0692, -0.2544}
+    },
+    ['1969-7-20T20:17:32'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0940, 0.0673, -0.2569}
+    },
+    ['1969-7-20T20:17:33'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0963, 0.0648, -0.2587}
+    },
+    ['1969-7-20T20:17:34'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0909, 0.0619, -0.2587}
+    },
+    ['1969-7-20T20:17:35'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0832, 0.0602, -0.2585}
+    },
+    ['1969-7-20T20:17:36'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0761, 0.0326, -0.2602}
+    },
+    ['1969-7-20T20:17:37'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0612, 0.0013, -0.2635}
+    },
+    ['1969-7-20T20:17:38'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0274, -0.0079, -0.2727}
+    },
+    ['1969-7-20T20:17:39'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0061, -0.0470, -0.2732}
+    },
+    ['1969-7-20T20:17:40'] = {
+        Type = "StaticRotation",
+        Rotation  = {-0.0794, -0.0088, -0.2447}
+    },
+})
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo8launchtrail.asset b/data/assets/scene/solarsystem/missions/apollo/apollo8launchtrail.asset
new file mode 100644
index 0000000000..701051ff6e
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo8launchtrail.asset
@@ -0,0 +1,74 @@
+local assetHelper = asset.require('util/asset_helper')
+local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
+local kernelsFolder = asset.syncedResource({
+    Name = "Apollo Kernels",
+    Type = "HttpSynchronization",
+    Identifier = "apollo_spice",
+    Version = 1
+})
+
+local kernels = {
+    kernelsFolder .. "/moon_080317.tf",
+    kernelsFolder .. "/apollo8.tf",
+    kernelsFolder .. "/moon_pa_de421_1900-2050.bpc",
+    kernelsFolder .. '/apollo8.tsc',
+    kernelsFolder .. '/apollo8.bsp',
+    kernelsFolder .. '/apollo8_earthrise.bc',
+}
+
+local apolloSpiceId = "-908"
+
+
+local Apollo8LaunchTrail = {
+    Identifier = "Apollo8LaunchTrail",
+    Parent = "Earth",
+    Renderable = {
+        Type = "RenderableTrailTrajectory",
+        Translation = {
+            Type = "SpiceTranslation",
+            Target = apolloSpiceId,
+            Observer = "EARTH",
+            Frame = "IAU_EARTH",            
+            Kernels = kernels
+        },
+        Color = { 0.70, 0.50, 0.20 },
+        StartTime = "1968 DEC 21 12:51:00",
+        EndTime = "1968 DEC 21 23:23:22",
+        SampleInterval = 30
+    },
+    GUI = {
+        Name = "Apollo 8 Launch Trail",
+        Path = "/Solar System/Missions/Apollo"
+    }
+}
+
+local Apollo8EarthBarycenterTrail = {
+    Identifier = "Apollo8EarthBarycenterTrail",
+    Parent = "EarthBarycenter",
+    Renderable = {
+        Type = "RenderableTrailTrajectory",
+        Translation = {
+            Type = "SpiceTranslation",
+            Target = apolloSpiceId,
+            Observer = "EARTH BARYCENTER",
+            Frame = "GALACTIC",            
+            Kernels = kernels
+        },
+        Color = { 1, 0.0, 0.0 },
+        StartTime = "1968 DEC 21",
+        EndTime = "1968 DEC 28",
+        SampleInterval = 30,
+        Enabled = false,
+    },
+    GUI = {
+        Name = "Apollo 8 Earth Barycenter Trail",
+        Path = "/Solar System/Missions/Apollo"
+    }
+}
+
+local exportList = {
+    Apollo8LaunchTrail,
+    Apollo8EarthBarycenterTrail,
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, exportList)
diff --git a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
index aaab113192..fb9f1e14c5 100644
--- a/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
@@ -2,36 +2,36 @@
 
 
 local heightmaps = asset.syncedResource({
-    Name = "Apollo Globebrowsing",
+    Name = "Apollo Globebrowsing Heightmaps",
     Type = "HttpSynchronization",
     Identifier = "apollo_globebrowsing_heightmaps",
     Version = 1
 })
 
 local basemaps = asset.syncedResource({
-    Name = "Apollo Globebrowsing",
+    Name = "Apollo Globebrowsing Basemaps",
     Type = "HttpSynchronization",
     Identifier = "apollo_globebrowsing_basemaps",
     Version = 1
 })
 
 local naclighting = asset.syncedResource({
-    Name = "Apollo Globebrowsing",
+    Name = "Apollo Globebrowsing NAC Lighting",
     Type = "HttpSynchronization",
     Identifier = "apollo_globebrowsing_naclighting",
     Version = 1
 })
 
 local stations = asset.syncedResource({
-    Name = "Apollo 17 Globebrowsing",
+    Name = "Apollo 17 Globebrowsing Stations",
     Type = "HttpSynchronization",
     Identifier = "apollo_17_stations",
     Version = 1
 })
 
 asset.onInitialize(function ()
-    openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps,"Moon")
-    openspace.globebrowsing.addBlendingLayersFromDirectory(basemaps,"Moon")
-    openspace.globebrowsing.addBlendingLayersFromDirectory(naclighting,"Moon")
-    openspace.globebrowsing.addBlendingLayersFromDirectory(stations,"Moon")
+    openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps, "Moon")
+    openspace.globebrowsing.addBlendingLayersFromDirectory(basemaps, "Moon")
+    openspace.globebrowsing.addBlendingLayersFromDirectory(naclighting, "Moon")
+    openspace.globebrowsing.addBlendingLayersFromDirectory(stations, "Moon")
 end)
diff --git a/data/assets/scene/solarsystem/missions/apollo/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/bouldersstation2.asset
index 5723c970bc..2d096b99d0 100644
--- a/data/assets/scene/solarsystem/missions/apollo/bouldersstation2.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/bouldersstation2.asset
@@ -33,8 +33,8 @@ local Station2Boulder1Holder = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.5294692,
             Latitude = 20.098824,
-            FixedAltitude = -2442.8,
-            UseFixedAltitude = true
+            Altitude = -2442.8,
+            UseHeightMap = false
         }
     },
     GUI = {
@@ -78,8 +78,8 @@ local Station2Boulder2Holder = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.5287892,
             Latitude = 20.098240,
-            FixedAltitude = -2434.6,
-            UseFixedAltitude = true
+            Altitude = -2434.6,
+            UseHeightMap = false
         }
     },
     GUI = {
@@ -123,8 +123,8 @@ local Station2Boulder3Holder = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.5294692,
             Latitude = 20.098610,
-            FixedAltitude = -2441.55,
-            UseFixedAltitude = true
+            Altitude = -2441.55,
+            UseHeightMap = false
         }
     },
     GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/bouldersstation6.asset
index dba9844a7c..919de3f9a8 100644
--- a/data/assets/scene/solarsystem/missions/apollo/bouldersstation6.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/bouldersstation6.asset
@@ -37,6 +37,8 @@ local Station6Frag1Holder = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.80068,
             Latitude = 20.2903,
+            Altitude = -2562.6,
+            UseHeightmap = false
         }
     },
     GUI = {
@@ -54,6 +56,8 @@ local Station6Frag1Model = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.8007,
             Latitude = 20.2903,
+            Altitude = -2562.6,
+            UseHeightmap = false
         }
     },
     Transform = {
@@ -104,8 +108,8 @@ local Station6Frag2Model = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.80055,
             Latitude = 20.289808,
-            FixedAltitude = -2566.5,
-            UseFixedAltitude = true
+            Altitude = -2566.5,
+            UseHeightmap = false
         }
     },
     Renderable = {
@@ -140,8 +144,8 @@ local Station6Frag3Model = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.80053,
             Latitude = 20.29030,
-            FixedAltitude = -2563.0,
-            UseFixedAltitude = true
+            Altitude = -2563.0,
+            UseHeightMap = false
         }
     },
     Renderable = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/bouldersstation7.asset
index 555d4fcb82..d2eab52355 100644
--- a/data/assets/scene/solarsystem/missions/apollo/bouldersstation7.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/bouldersstation7.asset
@@ -34,8 +34,8 @@ local Station7BoulderHolder = {
             Globe = moonAsset.Moon.Identifier,
             Longitude = -360+30.8165882,
             Latitude = 20.2908556,
-            FixedAltitude = -2593.5,
-            UseFixedAltitude = true
+            Altitude = -2593.5,
+            UseHeightMap = true
         }
     },
     GUI = {
diff --git a/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
new file mode 100644
index 0000000000..7aa0159960
--- /dev/null
+++ b/data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
@@ -0,0 +1,120 @@
+-- Apollo mission insignias on their locations on the Lunar surface.
+-- The insignias are invisible by default, but can be enabled using shown or hidden using
+-- the exported functions `showInsignias(interpolationDuration)` and `hideInsignias(interpolationDuration)`.
+
+local assetHelper = asset.require('util/asset_helper')
+
+local insigniasPath =  asset.syncedResource({
+    Name = "Apollo Insignias",
+    Type = "HttpSynchronization",
+    Identifier = "apollo_insignias",
+    Version = 1
+})
+local moon = asset.require('scene/solarsystem/planets/earth/moon/moon')
+
+local landingData = {
+    {
+        Identifier = "Apollo11",
+        Name = "Apollo 11",
+        Name = "Apollo 11",
+        Texture = "apollo11.png",
+        LunarModule = {0.67409, 23.47298, 0.0},
+    },
+    {
+        Identifier = "Apollo12",
+        Name = "Apollo 12",
+        Texture = "apollo12.png",
+        LunarModule = {-3.01381, -23.41930, 0.0}    
+    },
+    {
+        Identifier = "Apollo14",
+        Name = "Apollo 14",
+        Texture = "apollo14.png",
+        LunarModule = {-3.64544, -17.47139, 0.0}
+    },
+    {
+        Identifier = "Apollo15",
+        Name = "Apollo 15",
+        Texture = "apollo15.png",
+        LunarModule = {26.13224, 3.63400, 0.0}
+    },
+    {
+        Identifier = "Apollo16",
+        Name = "Apollo 16",
+        Texture = "apollo16.png",
+        LunarModule = {-8.97341, 15.49859, 0.0}
+    },
+    {
+        Identifier = "Apollo17",
+        Name = "Apollo 17",
+        Texture = "apollo17.png",
+        LunarModule = {20.18809, 30.77475, 0.0}
+    }
+}
+
+local nodes = {}
+local size = 100000;
+
+for i = 1, #landingData do
+    local entry = landingData[i]
+    nodes[i] = {
+        Identifier = entry.Identifier .. "Insignia",
+        Parent = moon.Moon.Identifier,
+        Transform = {
+            Translation = {
+                Type = "GlobeTranslation",
+                Globe = moon.Moon.Identifier,
+                Latitude = entry.LunarModule[1],
+                Longitude = entry.LunarModule[2],
+                Altitude = entry.LunarModule[3] + size * 1.1,
+                UseHeightmap = false
+            },
+        },
+        Renderable = {
+            Type = "RenderablePlaneImageLocal",
+            Size = size,
+            Origin = "Center",
+            Billboard = true,
+            Texture = insigniasPath .. "/" .. entry.Texture,
+            Opacity = 0.0
+        },
+        GUI = {
+            Path = "/Other/Labels",
+            Name = entry.Name .. " Insignia"
+        }
+    }
+end
+
+asset.onInitialize(function () 
+    openspace.bindShortcut(
+        'Show Apollo Landing Labels',
+        'openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, 0.5)',
+        'Show patches of the Apollo missions on their respective landing sites',
+        '/Missions/Apollo'
+    )
+
+    openspace.bindShortcut(
+        'Hide Apollo Landing Labels',
+        'openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, 0.5)',
+        'Hide patches of the Apollo missions on their respective landing sites',
+        '/Missions/Apollo'
+    )
+end)
+
+asset.export('showInsignia', function (missinNumber, interpolationDuration)
+    openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 1, interpolationDuration)
+end)
+
+asset.export('hideInsignia', function (missinNumber, interpolationDuration)
+    openspace.setPropertyValue("Scene.Apollo" .. missionNumber .. "Insignia.Renderable.Opacity", 0, interpolationDuration)
+end)
+
+asset.export('showInsignias', function (interpolationDuration)
+    openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, interpolationDuration)
+end)
+
+asset.export('hideInsignias', function (interpolationDuration)
+    openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, interpolationDuration)
+end)
+
+assetHelper.registerSceneGraphNodesAndExport(asset, nodes)
\ No newline at end of file
diff --git a/data/assets/scene/solarsystem/missions/apollo/lem_model.asset b/data/assets/scene/solarsystem/missions/apollo/lem_model.asset
index cd592de5e8..dbc9210394 100644
--- a/data/assets/scene/solarsystem/missions/apollo/lem_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/lem_model.asset
@@ -2,7 +2,7 @@ local modelFolder = asset.syncedResource({
     Name = "Apollo Lem Models",
     Type = "HttpSynchronization",
     Identifier = "apollo_lem_model",
-    Version = 2
+    Version = 3
 })
 
 asset.export('modelFolder', modelFolder)
diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
index d6b1735e36..64bfabfca8 100644
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -20,7 +20,7 @@ local images = asset.syncedResource({
 local models = asset.syncedResource({
     Name = "Vesta Models",
     Type = "HttpSynchronization",
-    Identifier = "vesta_comet",
+    Identifier = "vesta_model",
     Version = 1
 })
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
index 157b5dbbfd..7938f89387 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -14,7 +14,7 @@ local carpoGroup = {
     {
         Identifier = "Carpo",
         Parent = {
-            Name = parentIdentifier,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CARPO",
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index ce0b6a175c..3d2d7e3f10 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -25,6 +25,7 @@ local color_layers = {
         FilePath = mapServiceConfigs .. "/Utah/Mars_Color.wms",
         Enabled = true,
         Fallback =  {
+            Identifier = "Mars_Texture",
             Name = "Mars Texture",
             FilePath = textures .. "/mars.jpg",
             Enabled = true
@@ -35,6 +36,7 @@ local color_layers = {
         Name = "MOC WA Color [Sweden]",
         FilePath = mapServiceConfigs .. "/LiU/Color.wms",
         Fallback =  {
+            Identifier = "Mars_Texture",
             Name = "Mars Texture",
             FilePath = textures .. "/mars.jpg",
             Enabled = true
diff --git a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
index 5fd6308fdc..ca2a577dff 100644
--- a/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
+++ b/data/assets/scene/solarsystem/sssb/tesla_roadster.asset
@@ -20,7 +20,8 @@ local TeslaRoadsterTrail = {
         Color = { 0.9, 0.9, 0.0 },
         StartTime = "2018 FEB 8 00:00:00",
         EndTime = "2022 FEB 7 00:00:00",
-        SampleInterval = 60
+        SampleInterval = 3000,
+        TimeStampSubsampleFactor = 1
     },
     GUI = {
         Name = "Tesla Roadster Trail",
diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset
index 8664122cbc..a785329785 100644
--- a/data/assets/util/asset_helper.asset
+++ b/data/assets/util/asset_helper.asset
@@ -42,6 +42,29 @@ local registerSceneGraphNodes = function (sceneAsset, nodes, override)
     end)
 end
 
+
+local registerScreenSpaceRenderables = function (sceneAsset, renderables, override)
+    override = override or false
+    if not override then
+        if tableLength(renderables) == 0 then
+            openspace.printWarning(sceneAsset.filePath .. ": Register function was called with an empty node list. Pass 'true' as third argument to silence this warning.")
+            return
+        end
+    end
+
+    sceneAsset.onInitialize(function ()
+        for i, node in ipairs(renderables) do
+            openspace.addScreenSpaceRenderable(node)
+        end
+    end)
+    sceneAsset.onDeinitialize(function ()
+        for i = #renderables, 1, -1 do
+            renderable = renderables[i]
+            openspace.removeScreenSpaceRenderable(renderable.Identifier)
+        end
+    end)
+end
+
 local registerDashboardItems = function (dashboardAsset, items)
     dashboardAsset.onInitialize(
         function ()
@@ -176,6 +199,7 @@ end
 
 asset.export("registerSceneGraphNodes", registerSceneGraphNodes)
 asset.export("registerSceneGraphNodesAndExport", registerSceneGraphNodesAndExport)
+asset.export("registerScreenSpaceRenderables", registerScreenSpaceRenderables)
 asset.export("registerSpiceKernels", registerSpiceKernels)
 asset.export("registerDashboardItems", registerDashboardItems)
 asset.export("requireAll", requireAll)
diff --git a/data/assets/util/ipac.asset b/data/assets/util/ipac.asset
new file mode 100644
index 0000000000..5d9140d4eb
--- /dev/null
+++ b/data/assets/util/ipac.asset
@@ -0,0 +1,18 @@
+asset.onInitialize(function()
+    openspace.clearKeys()
+    openspace.bindKey("RIGHT", "openspace.navigation.addGlobalRotation(-5.0, 0.0)");
+    openspace.bindKey("LEFT", "openspace.navigation.addGlobalRotation(5.0, 0.0)");
+    openspace.bindKey("UP", "openspace.navigation.addGlobalRotation(0.0, 5.0)");
+    openspace.bindKey("DOWN", "openspace.navigation.addGlobalRotation(0.0, -5.0)");
+
+    openspace.bindKey("CTRL+RIGHT", "openspace.navigation.addLocalRotation(-5.0, 0.0)");
+    openspace.bindKey("CTRL+LEFT", "openspace.navigation.addLocalRotation(5.0, 0.0)");
+    openspace.bindKey("CTRL+UP", "openspace.navigation.addLocalRotation(0.0, 5.0)");
+    openspace.bindKey("CTRL+DOWN", "openspace.navigation.addLocalRotation(0.0, -5.0)");
+
+    openspace.bindKey("ALT+UP", "openspace.navigation.addTruckMovement(0.0, 5.0)");
+    openspace.bindKey("ALT+DOWN", "openspace.navigation.addTruckMovement(0.0, -5.0)");
+
+    openspace.bindKey("SPACE", "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);")
+    openspace.bindKey("Z", "openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);")
+end)
diff --git a/data/assets/util/static_server.asset b/data/assets/util/static_server.asset
new file mode 100644
index 0000000000..94759f5936
--- /dev/null
+++ b/data/assets/util/static_server.asset
@@ -0,0 +1,21 @@
+local backendHash = "7ca0a34e9c4c065b7bfad0623db0e322bf3e0af9"
+local dataProvider = "data.openspaceproject.com/files/webgui"
+
+local backend = asset.syncedResource({
+    Identifier = "WebGuiBackend",
+    Name = "Web Gui Backend",
+    Type = "UrlSynchronization",
+    Url = dataProvider .. "/backend/" ..  backendHash .. "/backend.zip"
+})
+
+asset.onInitialize(function ()
+    -- Unzip the server bundle
+    dest = backend .. "/backend"
+    if not openspace.directoryExists(dest) then
+        openspace.unzipFile(backend .. "/backend.zip", dest, true)
+    end
+
+    openspace.setPropertyValueSingle(
+        "Modules.WebGui.ServerProcessEntryPoint", backend .. "/backend/backend.js"
+    )
+end)
\ No newline at end of file
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index d4d54451c5..b51a582660 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -1,18 +1,11 @@
+asset.require('./static_server')
+
 local guiCustomization = asset.require('customization/gui')
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "c603ad07d1407a7d3def43f1e203244cee1c06f6"
-local backendHash = "84737f9785f12efbb12d2de9d511154c6215fe9c"
-
+local frontendHash = "2d1bb8d8d8478b6ed025ccc6f1e0ceacf04b6114"
 local dataProvider = "data.openspaceproject.com/files/webgui"
 
-local backend = asset.syncedResource({
-    Identifier = "WebGuiBackend",
-    Name = "Web Gui Backend",
-    Type = "UrlSynchronization",
-    Url = dataProvider .. "/backend/" ..  backendHash .. "/backend.zip"
-})
-
 local frontend = asset.syncedResource({
     Identifier = "WebGuiFrontend",
     Name = "Web Gui Frontend",
@@ -27,22 +20,21 @@ asset.onInitialize(function ()
         openspace.unzipFile(frontend .. "/frontend.zip", dest, true)
     end
 
-    -- Unzip the frontend bundle
-    dest = backend .. "/backend"
-    if not openspace.directoryExists(dest) then
-        openspace.unzipFile(backend .. "/backend.zip", dest, true)
-    end
+    -- Serve the production GUI:
+    local directories = openspace.getPropertyValue("Modules.WebGui.Directories")
+    directories[#directories + 1] = "frontend"
+    directories[#directories + 1] = frontend .. '/frontend'
+    openspace.setPropertyValueSingle("Modules.WebGui.Directories", directories)
+    openspace.setPropertyValueSingle("Modules.WebGui.DefaultEndpoint", "frontend")
 
-    -- Do not serve the files if we are in webgui development mode.
-    -- In that case, you have to serve the webgui manually, using `npm start`.
-    if not guiCustomization.webguiDevelopmentMode then
+    if guiCustomization.webguiDevelopmentMode then
+        -- Route CEF to the deveopment version of the GUI.
+        -- This must be manually served using `npm start`
+        -- in the OpenSpace-WebGuiFrontend repository.
         openspace.setPropertyValueSingle(
-            "Modules.WebGui.ServerProcessEntryPoint", backend .. "/backend/backend.js"
+            "Modules.CefWebGui.GuiUrl",
+            "http://127.0.0.1:4690/frontend/#/onscreen"
         )
-        openspace.setPropertyValueSingle(
-            "Modules.WebGui.WebDirectory", frontend .. "/frontend"
-        )
-        openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", true)
     end
 
     -- The GUI contains date and simulation increment,
@@ -54,5 +46,17 @@ asset.onInitialize(function ()
 end)
 
 asset.onDeinitialize(function ()
-    openspace.setPropertyValueSingle("Modules.WebGui.ServerProcessEnabled", false)
+    -- Remove the frontend endpoint
+    local directories = openspace.getPropertyValue("Modules.WebGui.Directories")
+    local newDirectories;
+
+    openspace.setPropertyValueSingle("Modules.WebGui.DefaultEndpoint", "")
+
+    for i = 0, #directories, 2 do
+        if (string.find(directories[i], "frontend") == nil) then
+            newDirectories[#newDirectories + 1] = directories[i]
+            newDirectories[#newDirectories + 1] = directories[i + 1]
+        end
+    end
+    openspace.setPropertyValueSingle("Modules.WebGui.Directories", newDirectories)
 end)
diff --git a/data/assets/voyager.scene b/data/assets/voyager.scene
index d91cc5254d..c5789bf926 100644
--- a/data/assets/voyager.scene
+++ b/data/assets/voyager.scene
@@ -47,10 +47,10 @@ asset.onInitialize(function ()
         "Earth", "Voyager 1", "Voyager 2", "Jupiter", "Saturn", "Uranus", "Neptune"
     })
 
-    openspace.navigation.setCameraState({
+    openspace.navigation.setNavigationState({
         Anchor = VoyagerAsset.Voyager_1.Identifier,
-        Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
-        Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
+        ReferenceFrame = "Root",
+        Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 }
     })
 end)
 
diff --git a/ext/ghoul b/ext/ghoul
index cf5b311dda..526b27cb65 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit cf5b311ddac167c8542914afc54a9f878c7a79ce
+Subproject commit 526b27cb653fe9befc324278debc701297694207
diff --git a/ext/json/json.hpp b/ext/json/json.hpp
index 6dfc1831fa..5003a4fa2d 100644
--- a/ext/json/json.hpp
+++ b/ext/json/json.hpp
@@ -1,11 +1,12 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 2.1.1
+|  |  |__   |  |  | | | |  version 3.6.1
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
@@ -26,45 +27,445 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef NLOHMANN_JSON_HPP
-#define NLOHMANN_JSON_HPP
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
 
-#include <algorithm> // all_of, copy, fill, find, for_each, none_of, remove, reverse, transform
-#include <array> // array
+#define NLOHMANN_JSON_VERSION_MAJOR 3
+#define NLOHMANN_JSON_VERSION_MINOR 6
+#define NLOHMANN_JSON_VERSION_PATCH 1
+
+#include <algorithm> // all_of, find, for_each
 #include <cassert> // assert
-#include <cctype> // isdigit
 #include <ciso646> // and, not, or
-#include <cmath> // isfinite, labs, ldexp, signbit
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
-#include <cstdint> // int64_t, uint64_t
-#include <cstdlib> // abort, strtod, strtof, strtold, strtoul, strtoll, strtoull
-#include <cstring> // strlen
-#include <forward_list> // forward_list
-#include <functional> // function, hash, less
+#include <functional> // hash, less
 #include <initializer_list> // initializer_list
-#include <iomanip> // setw
-#include <iostream> // istream, ostream
-#include <iterator> // advance, begin, back_inserter, bidirectional_iterator_tag, distance, end, inserter, iterator, iterator_traits, next, random_access_iterator_tag, reverse_iterator
-#include <limits> // numeric_limits
-#include <locale> // locale
-#include <map> // map
-#include <memory> // addressof, allocator, allocator_traits, unique_ptr
+#include <iosfwd> // istream, ostream
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
 #include <numeric> // accumulate
-#include <sstream> // stringstream
-#include <stdexcept> // domain_error, invalid_argument, out_of_range
-#include <string> // getline, stoi, string, to_string
-#include <type_traits> // add_pointer, conditional, decay, enable_if, false_type, integral_constant, is_arithmetic, is_base_of, is_const, is_constructible, is_convertible, is_default_constructible, is_enum, is_floating_point, is_integral, is_nothrow_move_assignable, is_nothrow_move_constructible, is_pointer, is_reference, is_same, is_scalar, is_signed, remove_const, remove_cv, remove_pointer, remove_reference, true_type, underlying_type
-#include <utility> // declval, forward, make_pair, move, pair, swap
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
 #include <vector> // vector
 
+// #include <nlohmann/adl_serializer.hpp>
+
+
+#include <utility>
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <ciso646> // and, not
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+
+#include <exception> // exception
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+
+#include <cstddef> // size_t
+
+namespace nlohmann
+{
+namespace detail
+{
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+} // namespace detail
+} // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/*!
+@brief general exception of the @ref basic_json class
+
+This class is an extension of `std::exception` objects with a member @a id for
+exception ids. It is used as the base class for all exceptions thrown by the
+@ref basic_json class. This class can hence be used as "wildcard" to catch
+exceptions.
+
+Subclasses:
+- @ref parse_error for exceptions indicating a parse error
+- @ref invalid_iterator for exceptions indicating errors with iterators
+- @ref type_error for exceptions indicating executing a member function with
+                  a wrong type
+- @ref out_of_range for exceptions indicating access out of the defined range
+- @ref other_error for exceptions indicating other library errors
+
+@internal
+@note To have nothrow-copy-constructible exceptions, we internally use
+      `std::runtime_error` which can cope with arbitrary-length error messages.
+      Intermediate strings are built with static functions and then passed to
+      the actual constructor.
+@endinternal
+
+@liveexample{The following code shows how arbitrary library exceptions can be
+caught.,exception}
+
+@since version 3.0.0
+*/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id;
+
+  protected:
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/*!
+@brief exception indicating a parse error
+
+This exception is thrown by the library when a parse error occurs. Parse errors
+can occur during the deserialization of JSON text, CBOR, MessagePack, as well
+as when using JSON Patch.
+
+Member @a byte holds the byte index of the last read character in the input
+file.
+
+Exceptions have ids 1xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
+json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
+json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
+json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
+json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
+json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
+json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
+json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
+json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
+json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
+
+@note For an input with n bytes, 1 is the index of the first character and n+1
+      is the index of the terminating null byte or the end of file. This also
+      holds true when reading a byte vector (CBOR or MessagePack).
+
+@liveexample{The following code shows how a `parse_error` exception can be
+caught.,parse_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        position_string(pos) + ": " + what_arg;
+        return parse_error(id_, pos.chars_read_total, w.c_str());
+    }
+
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
+                        ": " + what_arg;
+        return parse_error(id_, byte_, w.c_str());
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return " at line " + std::to_string(pos.lines_read + 1) +
+               ", column " + std::to_string(pos.chars_read_current_line);
+    }
+};
+
+/*!
+@brief exception indicating errors with iterators
+
+This exception is thrown if iterators passed to a library function do not match
+the expected semantics.
+
+Exceptions have ids 2xx.
+
+name / id                           | example message | description
+----------------------------------- | --------------- | -------------------------
+json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
+json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
+json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
+json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
+json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
+json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
+json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
+json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
+json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
+
+@liveexample{The following code shows how an `invalid_iterator` exception can be
+caught.,invalid_iterator}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class invalid_iterator : public exception
+{
+  public:
+    static invalid_iterator create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("invalid_iterator", id_) + what_arg;
+        return invalid_iterator(id_, w.c_str());
+    }
+
+  private:
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating executing a member function with a wrong type
+
+This exception is thrown in case of a type error; that is, a library function is
+executed on a JSON value whose type does not match the expected semantics.
+
+Exceptions have ids 3xx.
+
+name / id                     | example message | description
+----------------------------- | --------------- | -------------------------
+json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
+json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
+json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
+json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
+json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
+json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
+json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
+json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
+json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
+json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
+json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
+json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
+json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
+json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
+json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
+json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
+
+@liveexample{The following code shows how a `type_error` exception can be
+caught.,type_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class type_error : public exception
+{
+  public:
+    static type_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("type_error", id_) + what_arg;
+        return type_error(id_, w.c_str());
+    }
+
+  private:
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating access out of the defined range
+
+This exception is thrown in case a library function is called on an input
+parameter that exceeds the expected range, for instance in case of array
+indices or nonexisting object keys.
+
+Exceptions have ids 4xx.
+
+name / id                       | example message | description
+------------------------------- | --------------- | -------------------------
+json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
+json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
+json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
+json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
+json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. |
+json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
+json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
+
+@liveexample{The following code shows how an `out_of_range` exception can be
+caught.,out_of_range}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class out_of_range : public exception
+{
+  public:
+    static out_of_range create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("out_of_range", id_) + what_arg;
+        return out_of_range(id_, w.c_str());
+    }
+
+  private:
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating other library errors
+
+This exception is thrown in case of errors that cannot be classified with the
+other exception types.
+
+Exceptions have ids 5xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+
+@liveexample{The following code shows how an `other_error` exception can be
+caught.,other_error}
+
+@since version 3.0.0
+*/
+class other_error : public exception
+{
+  public:
+    static other_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("other_error", id_) + what_arg;
+        return other_error(id_, w.c_str());
+    }
+
+  private:
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#include <utility> // pair
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
 // exclude unsupported compilers
-#if defined(__clang__)
-    #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-        #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-    #endif
-#elif defined(__GNUC__)
-    #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
-        #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
     #endif
 #endif
 
@@ -89,17 +490,333 @@ SOFTWARE.
     #define JSON_DEPRECATED
 #endif
 
+// allow for portable nodiscard warnings
+#if defined(__has_cpp_attribute)
+    #if __has_cpp_attribute(nodiscard)
+        #define JSON_NODISCARD [[nodiscard]]
+    #elif __has_cpp_attribute(gnu::warn_unused_result)
+        #define JSON_NODISCARD [[gnu::warn_unused_result]]
+    #else
+        #define JSON_NODISCARD
+    #endif
+#else
+    #define JSON_NODISCARD
+#endif
+
 // allow to disable exceptions
-#if not defined(JSON_NOEXCEPTION) || defined(__EXCEPTIONS)
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
     #define JSON_THROW(exception) throw exception
     #define JSON_TRY try
     #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
 #else
+    #include <cstdlib>
     #define JSON_THROW(exception) std::abort()
     #define JSON_TRY if(true)
     #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
 #endif
 
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// manual branch prediction
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #define JSON_LIKELY(x)      __builtin_expect(x, 1)
+    #define JSON_UNLIKELY(x)    __builtin_expect(x, 0)
+#else
+    #define JSON_LIKELY(x)      x
+    #define JSON_UNLIKELY(x)    x
+#endif
+
+// C++ language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+    #define JSON_HAS_CPP_14
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                           \
+    template<typename BasicJsonType>                                                           \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                  \
+    {                                                                                          \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");         \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                    \
+        auto it = std::find_if(std::begin(m), std::end(m),                                     \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                      \
+            return ej_pair.first == e;                                                         \
+        });                                                                                    \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                \
+    }                                                                                          \
+    template<typename BasicJsonType>                                                           \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                \
+    {                                                                                          \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");         \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                    \
+        auto it = std::find_if(std::begin(m), std::end(m),                                     \
+                               [j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                      \
+            return ej_pair.second == j;                                                        \
+        });                                                                                    \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                 \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+#include <ciso646> // not
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+
+namespace nlohmann
+{
+namespace detail
+{
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+// implementation of C++14 index_sequence and affiliates
+// source: https://stackoverflow.com/a/32223343
+template<std::size_t... Ints>
+struct index_sequence
+{
+    using type = index_sequence;
+    using value_type = std::size_t;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+template<class Sequence1, class Sequence2>
+struct merge_and_renumber;
+
+template<std::size_t... I1, std::size_t... I2>
+struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
+        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
+
+template<std::size_t N>
+struct make_index_sequence
+    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
+      typename make_index_sequence < N - N / 2 >::type > {};
+
+template<> struct make_index_sequence<0> : index_sequence<> {};
+template<> struct make_index_sequence<1> : index_sequence<0> {};
+
+template<typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+#include <ciso646> // not
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template <typename ...Ts> using void_t = typename make_void<Ts...>::type;
+} // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename It, typename = void>
+struct iterator_types {};
+
+template <typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template <typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template <typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template <typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+// http://en.cppreference.com/w/cpp/experimental/is_detected
+namespace nlohmann
+{
+namespace detail
+{
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template <class Default,
+          class AlwaysVoid,
+          template <class...> class Op,
+          class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template <class Default, template <class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template <template <class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template <template <class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template <class Default, template <class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template <class Default, template <class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template <class Expected, template <class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template <class To, template <class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/json_fwd.hpp>
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
 /*!
 @brief namespace for Niels Lohmann
 @see https://github.com/nlohmann
@@ -107,17 +824,405 @@ SOFTWARE.
 */
 namespace nlohmann
 {
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer>
+class basic_json;
 
 /*!
-@brief unnamed namespace with internal helper functions
+@brief JSON Pointer
 
-This namespace collects some functions that could not be defined inside the
-@ref basic_json class.
+A JSON pointer defines a string syntax for identifying a specific value
+within a JSON document. It can be used with functions `at` and
+`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+
+@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+
+@since version 2.0.0
+*/
+template<typename BasicJsonType>
+class json_pointer;
+
+/*!
+@brief default JSON class
+
+This type is the default specialization of the @ref basic_json class which
+uses the standard template types.
+
+@since version 1.0.0
+*/
+using json = basic_json<>;
+}  // namespace nlohmann
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+namespace nlohmann
+{
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
 
 @since version 2.1.0
 */
 namespace detail
 {
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template <typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template <typename T>
+using key_type_t = typename T::key_type;
+
+template <typename T>
+using value_type_t = typename T::value_type;
+
+template <typename T>
+using difference_type_t = typename T::difference_type;
+
+template <typename T>
+using pointer_t = typename T::pointer;
+
+template <typename T>
+using reference_t = typename T::reference;
+
+template <typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template <typename T>
+using iterator_t = typename T::iterator;
+
+template <typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template <typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template <typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template <typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+template <typename BasicJsonType, typename T>
+struct has_from_json<BasicJsonType, T,
+           enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template <typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template <typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template <typename BasicJsonType, typename T>
+struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+
+///////////////////
+// is_ functions //
+///////////////////
+
+template <typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template <typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+// source: https://stackoverflow.com/a/37193089/4116453
+
+template <typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template <typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template <typename BasicJsonType, typename CompatibleObjectType,
+          typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t<is_detected<mapped_type_t, CompatibleObjectType>::value and
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        std::is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value and
+        std::is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template <typename BasicJsonType, typename ConstructibleObjectType,
+          typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t<is_detected<mapped_type_t, ConstructibleObjectType>::value and
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (std::is_constructible<typename ConstructibleObjectType::key_type, typename object_t::key_type>::value and
+         std::is_same<typename object_t::mapped_type, typename ConstructibleObjectType::mapped_type>::value) or
+        (has_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type>::value or
+         has_non_default_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template <typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template <typename BasicJsonType, typename CompatibleStringType,
+          typename = void>
+struct is_compatible_string_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type_impl <
+    BasicJsonType, CompatibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, CompatibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_compatible_string_type
+    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template <typename BasicJsonType, typename ConstructibleStringType,
+          typename = void>
+struct is_constructible_string_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type_impl <
+    BasicJsonType, ConstructibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, ConstructibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<ConstructibleStringType,
+        typename BasicJsonType::string_t>::value;
+};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template <typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t<is_detected<value_type_t, CompatibleArrayType>::value and
+    is_detected<iterator_t, CompatibleArrayType>::value and
+// This is needed because json_reverse_iterator has a ::iterator type...
+// Therefore it is detected as a CompatibleArrayType.
+// The real fix would be to have an Iterable concept.
+    not is_iterator_traits<
+    iterator_traits<CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        std::is_constructible<BasicJsonType,
+        typename CompatibleArrayType::value_type>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<not std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value and
+    is_detected<value_type_t, ConstructibleArrayType>::value and
+    is_detected<iterator_t, ConstructibleArrayType>::value and
+    is_complete_type<
+    detected_t<value_type_t, ConstructibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        // This is needed because json_reverse_iterator has a ::iterator type,
+        // furthermore, std::back_insert_iterator (and other iterators) have a base class `iterator`...
+        // Therefore it is detected as a ConstructibleArrayType.
+        // The real fix would be to have an Iterable concept.
+        not is_iterator_traits <
+        iterator_traits<ConstructibleArrayType >>::value and
+
+        (std::is_same<typename ConstructibleArrayType::value_type, typename BasicJsonType::array_t::value_type>::value or
+         has_from_json<BasicJsonType,
+         typename ConstructibleArrayType::value_type>::value or
+         has_non_default_from_json <
+         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
+};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType,
+          typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t<std::is_integral<RealIntegerType>::value and
+    std::is_integral<CompatibleNumberIntegerType>::value and
+    not std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        std::is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value and
+        CompatibleLimits::is_integer and
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template <typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#include <array> // array
+#include <ciso646> // and
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+namespace nlohmann
+{
+namespace detail
+{
 ///////////////////////////
 // JSON type enumeration //
 ///////////////////////////
@@ -146,17 +1251,17 @@ value with the default value for a given type
 
 @since version 1.0.0
 */
-enum class value_t : uint8_t
+enum class value_t : std::uint8_t
 {
-    null,            ///< null value
-    object,          ///< object (unordered set of name/value pairs)
-    array,           ///< array (ordered collection of values)
-    string,          ///< string value
-    boolean,         ///< boolean value
-    number_integer,  ///< number value (signed integer)
-    number_unsigned, ///< number value (unsigned integer)
-    number_float,    ///< number value (floating-point)
-    discarded        ///< discarded by the the parser callback function
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    discarded         ///< discarded by the the parser callback function
 };
 
 /*!
@@ -165,76 +1270,574 @@ enum class value_t : uint8_t
 Returns an ordering that is similar to Python:
 - order: null < boolean < number < object < array < string
 - furthermore, each type is not smaller than itself
+- discarded values are not comparable
 
 @since version 1.0.0
 */
 inline bool operator<(const value_t lhs, const value_t rhs) noexcept
 {
-    static constexpr std::array<uint8_t, 8> order = {{
-            0, // null
-            3, // object
-            4, // array
-            5, // string
-            1, // boolean
-            2, // integer
-            2, // unsigned
-            2, // float
+    static constexpr std::array<std::uint8_t, 8> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */
         }
     };
 
-    // discarded values are not comparable
-    if (lhs == value_t::discarded or rhs == value_t::discarded)
-    {
-        return false;
-    }
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+    return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index];
+}
+}  // namespace detail
+}  // namespace nlohmann
 
-    return order[static_cast<std::size_t>(lhs)] <
-           order[static_cast<std::size_t>(rhs)];
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_UNLIKELY(not j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
+    }
+    n = nullptr;
 }
 
+// overloads for basic_json template parameters
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
+                     not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                     int> = 0>
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
 
-/////////////
-// helpers //
-/////////////
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
 
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_UNLIKELY(not j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
 
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
 
-// taken from http://stackoverflow.com/a/26936864/266378
-template<typename T>
-using is_unscoped_enum =
-    std::integral_constant<bool, std::is_convertible<T, int>::value and
-    std::is_enum<T>::value>;
+template <
+    typename BasicJsonType, typename ConstructibleStringType,
+    enable_if_t <
+        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value and
+        not std::is_same<typename BasicJsonType::string_t,
+                         ConstructibleStringType>::value,
+        int > = 0 >
+void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+{
+    if (JSON_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
 
-/*
-Implementation of two C++17 constructs: conjunction, negation. This is needed
-to avoid evaluating all the traits in a condition
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
 
-For example: not std::is_same<void, T>::value and has_value_type<T>::value
-will not compile when T = void (on MSVC at least). Whereas
-conjunction<negation<std::is_same<void, T>>, has_value_type<T>>::value will
-stop evaluating if negation<...>::value == false
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
 
-Please note that those constructs must be used with caution, since symbols can
-become very long quickly (which can slow down compilation and cause MSVC
-internal compiler errors). Only use it when you have to (see example ahead).
-*/
-template<class...> struct conjunction : std::true_type {};
-template<class B1> struct conjunction<B1> : B1 {};
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
 
-template<class B> struct negation : std::integral_constant < bool, !B::value > {};
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
 
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.resize(j.size());
+    std::copy(j.m_value.array->begin(), j.m_value.array->end(), std::begin(l));
+}
+
+template<typename BasicJsonType>
+void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template <typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    arr.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+}
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                          priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    std::transform(
+        j.begin(), j.end(), std::inserter(arr, end(arr)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+}
+
+template <typename BasicJsonType, typename ConstructibleArrayType,
+          enable_if_t <
+              is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_basic_json<ConstructibleArrayType>::value,
+              int > = 0 >
+
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " +
+                                      std::string(j.type_name())));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_UNLIKELY(not j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
+    }
+
+    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(obj, obj.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t <
+             std::is_arithmetic<ArithmeticType>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+             int> = 0>
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+{
+    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+{
+    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+          typename = enable_if_t<not std::is_constructible<
+                                     typename BasicJsonType::string_t, Key>::value>>
+void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    for (const auto& p : j)
+    {
+        if (JSON_UNLIKELY(not p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template <typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+          typename = enable_if_t<not std::is_constructible<
+                                     typename BasicJsonType::string_t, Key>::value>>
+void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    for (const auto& p : j)
+    {
+        if (JSON_UNLIKELY(not p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T& val) const
+    noexcept(noexcept(from_json(j, val)))
+    -> decltype(from_json(j, val), void())
+    {
+        return from_json(j, val);
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace
+{
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
+} // namespace
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
 
 
+#include <algorithm> // copy
+#include <ciso646> // or, and, not
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type * ;
+    using reference = value_type & ;
+    using iterator_category = std::input_iterator_tag;
+
+  private:
+    /// the iterator
+    IteratorType anchor;
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable std::string array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    const std::string empty_str = "";
+
+  public:
+    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
+
+    /// dereference operator (needed for range-based for)
+    iteration_proxy_value& operator*()
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const std::string& key() const
+    {
+        assert(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    array_index_str = std::to_string(array_index);
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::reference container;
+
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.end());
+    }
+};
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template <std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template <std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template <typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+            : public std::integral_constant<std::size_t, 2> {};
+
+template <std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+} // namespace std
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
 //////////////////
 // constructors //
 //////////////////
@@ -263,6 +1866,24 @@ struct external_constructor<value_t::string>
         j.m_value = s;
         j.assert_invariant();
     }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleStringType,
+             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
 };
 
 template<>
@@ -271,16 +1892,8 @@ struct external_constructor<value_t::number_float>
     template<typename BasicJsonType>
     static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
     {
-        // replace infinity and NAN by null
-        if (not std::isfinite(val))
-        {
-            j = BasicJsonType{};
-        }
-        else
-        {
-            j.m_type = value_t::number_float;
-            j.m_value = val;
-        }
+        j.m_type = value_t::number_float;
+        j.m_value = val;
         j.assert_invariant();
     }
 };
@@ -320,9 +1933,16 @@ struct external_constructor<value_t::array>
         j.assert_invariant();
     }
 
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.assert_invariant();
+    }
+
     template<typename BasicJsonType, typename CompatibleArrayType,
-             enable_if_t<not std::is_same<CompatibleArrayType,
-                                          typename BasicJsonType::array_t>::value,
+             enable_if_t<not std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
                          int> = 0>
     static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
     {
@@ -332,6 +1952,30 @@ struct external_constructor<value_t::array>
         j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
         j.assert_invariant();
     }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        j.assert_invariant();
+    }
 };
 
 template<>
@@ -345,10 +1989,16 @@ struct external_constructor<value_t::object>
         j.assert_invariant();
     }
 
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.assert_invariant();
+    }
+
     template<typename BasicJsonType, typename CompatibleObjectType,
-             enable_if_t<not std::is_same<CompatibleObjectType,
-                                          typename BasicJsonType::object_t>::value,
-                         int> = 0>
+             enable_if_t<not std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int> = 0>
     static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
     {
         using std::begin;
@@ -360,184 +2010,30 @@ struct external_constructor<value_t::object>
     }
 };
 
-
-////////////////////////
-// has_/is_ functions //
-////////////////////////
-
-/*!
-@brief Helper to determine whether there's a key_type for T.
-
-This helper is used to tell associative containers apart from other containers
-such as sequence containers. For instance, `std::map` passes the test as it
-contains a `mapped_type`, whereas `std::vector` fails the test.
-
-@sa http://stackoverflow.com/a/7728728/266378
-@since version 1.0.0, overworked in version 2.0.6
-*/
-#define NLOHMANN_JSON_HAS_HELPER(type)                                        \
-    template<typename T> struct has_##type {                                  \
-    private:                                                                  \
-        template<typename U, typename = typename U::type>                     \
-        static int detect(U &&);                                              \
-        static void detect(...);                                              \
-    public:                                                                   \
-        static constexpr bool value =                                         \
-                std::is_integral<decltype(detect(std::declval<T>()))>::value; \
-    }
-
-NLOHMANN_JSON_HAS_HELPER(mapped_type);
-NLOHMANN_JSON_HAS_HELPER(key_type);
-NLOHMANN_JSON_HAS_HELPER(value_type);
-NLOHMANN_JSON_HAS_HELPER(iterator);
-
-#undef NLOHMANN_JSON_HAS_HELPER
-
-
-template<bool B, class RealType, class CompatibleObjectType>
-struct is_compatible_object_type_impl : std::false_type {};
-
-template<class RealType, class CompatibleObjectType>
-struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
-{
-    static constexpr auto value =
-        std::is_constructible<typename RealType::key_type,
-        typename CompatibleObjectType::key_type>::value and
-        std::is_constructible<typename RealType::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
-};
-
-template<class BasicJsonType, class CompatibleObjectType>
-struct is_compatible_object_type
-{
-    static auto constexpr value = is_compatible_object_type_impl <
-                                  conjunction<negation<std::is_same<void, CompatibleObjectType>>,
-                                  has_mapped_type<CompatibleObjectType>,
-                                  has_key_type<CompatibleObjectType>>::value,
-                                  typename BasicJsonType::object_t, CompatibleObjectType >::value;
-};
-
-template<typename BasicJsonType, typename T>
-struct is_basic_json_nested_type
-{
-    static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::const_iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::reverse_iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::const_reverse_iterator>::value or
-                                  std::is_same<T, typename BasicJsonType::json_pointer>::value;
-};
-
-template<class BasicJsonType, class CompatibleArrayType>
-struct is_compatible_array_type
-{
-    static auto constexpr value =
-        conjunction<negation<std::is_same<void, CompatibleArrayType>>,
-        negation<is_compatible_object_type<
-        BasicJsonType, CompatibleArrayType>>,
-        negation<std::is_constructible<typename BasicJsonType::string_t,
-        CompatibleArrayType>>,
-        negation<is_basic_json_nested_type<BasicJsonType, CompatibleArrayType>>,
-        has_value_type<CompatibleArrayType>,
-        has_iterator<CompatibleArrayType>>::value;
-};
-
-template<bool, typename, typename>
-struct is_compatible_integer_type_impl : std::false_type {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl<true, RealIntegerType, CompatibleNumberIntegerType>
-{
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
-
-    static constexpr auto value =
-        std::is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value and
-        CompatibleLimits::is_integer and
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-{
-    static constexpr auto value =
-        is_compatible_integer_type_impl <
-        std::is_integral<CompatibleNumberIntegerType>::value and
-        not std::is_same<bool, CompatibleNumberIntegerType>::value,
-        RealIntegerType, CompatibleNumberIntegerType > ::value;
-};
-
-
-// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template<typename BasicJsonType, typename T>
-struct has_from_json
-{
-  private:
-    // also check the return type of from_json
-    template<typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
-                 std::declval<BasicJsonType>(), std::declval<T&>()))>::value>>
-    static int detect(U&&);
-    static void detect(...);
-
-  public:
-    static constexpr bool value = std::is_integral<decltype(
-                                      detect(std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
-};
-
-// This trait checks if JSONSerializer<T>::from_json(json const&) exists
-// this overload is used for non-default-constructible user-defined-types
-template<typename BasicJsonType, typename T>
-struct has_non_default_from_json
-{
-  private:
-    template <
-        typename U,
-        typename = enable_if_t<std::is_same<
-                                   T, decltype(uncvref_t<U>::from_json(std::declval<BasicJsonType>()))>::value >>
-    static int detect(U&&);
-    static void detect(...);
-
-  public:
-    static constexpr bool value = std::is_integral<decltype(detect(
-                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
-};
-
-// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-template<typename BasicJsonType, typename T>
-struct has_to_json
-{
-  private:
-    template<typename U, typename = decltype(uncvref_t<U>::to_json(
-                 std::declval<BasicJsonType&>(), std::declval<T>()))>
-    static int detect(U&&);
-    static void detect(...);
-
-  public:
-    static constexpr bool value = std::is_integral<decltype(detect(
-                                      std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
-};
-
-
 /////////////
 // to_json //
 /////////////
 
-template<typename BasicJsonType, typename T, enable_if_t<
-             std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
 void to_json(BasicJsonType& j, T b) noexcept
 {
     external_constructor<value_t::boolean>::construct(j, b);
 }
 
 template<typename BasicJsonType, typename CompatibleString,
-         enable_if_t<std::is_constructible<typename BasicJsonType::string_t,
-                     CompatibleString>::value, int> = 0>
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
 void to_json(BasicJsonType& j, const CompatibleString& s)
 {
     external_constructor<value_t::string>::construct(j, s);
 }
 
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
 template<typename BasicJsonType, typename FloatType,
          enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
 void to_json(BasicJsonType& j, FloatType val) noexcept
@@ -545,369 +2041,132 @@ void to_json(BasicJsonType& j, FloatType val) noexcept
     external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
 }
 
-template <
-    typename BasicJsonType, typename CompatibleNumberUnsignedType,
-    enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t,
-                CompatibleNumberUnsignedType>::value, int> = 0 >
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
 void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
 {
     external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
 }
 
-template <
-    typename BasicJsonType, typename CompatibleNumberIntegerType,
-    enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t,
-                CompatibleNumberIntegerType>::value, int> = 0 >
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
 void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
 {
     external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
 }
 
-template<typename BasicJsonType, typename UnscopedEnumType,
-         enable_if_t<is_unscoped_enum<UnscopedEnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, UnscopedEnumType e) noexcept
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
 {
-    external_constructor<value_t::number_integer>::construct(j, e);
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
 }
 
-template <
-    typename BasicJsonType, typename CompatibleArrayType,
-    enable_if_t <
-        is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or
-        std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value,
-        int > = 0 >
-void to_json(BasicJsonType& j, const  CompatibleArrayType& arr)
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template <typename BasicJsonType, typename CompatibleArrayType,
+          enable_if_t<is_compatible_array_type<BasicJsonType,
+                      CompatibleArrayType>::value and
+                      not is_compatible_object_type<
+                          BasicJsonType, CompatibleArrayType>::value and
+                      not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
+                      not is_basic_json<CompatibleArrayType>::value,
+                      int> = 0>
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
-template <
-    typename BasicJsonType, typename CompatibleObjectType,
-    enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value,
-                int> = 0 >
-void to_json(BasicJsonType& j, const  CompatibleObjectType& arr)
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::valarray<T>& arr)
 {
-    external_constructor<value_t::object>::construct(j, arr);
-}
-
-
-///////////////
-// from_json //
-///////////////
-
-// overloads for basic_json template parameters
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
-                     not std::is_same<ArithmeticType,
-                                      typename BasicJsonType::boolean_t>::value,
-                     int> = 0>
-void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(
-                      *j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(
-                      *j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(
-                      *j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        default:
-        {
-            JSON_THROW(
-                std::domain_error("type must be number, but is " + j.type_name()));
-        }
-    }
+    external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
 template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
 {
-    if (not j.is_boolean())
-    {
-        JSON_THROW(std::domain_error("type must be boolean, but is " + j.type_name()));
-    }
-    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
-{
-    if (not j.is_string())
-    {
-        JSON_THROW(std::domain_error("type must be string, but is " + j.type_name()));
-    }
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType, typename UnscopedEnumType,
-         enable_if_t<is_unscoped_enum<UnscopedEnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, UnscopedEnumType& e)
-{
-    typename std::underlying_type<UnscopedEnumType>::type val;
-    get_arithmetic_value(j, val);
-    e = static_cast<UnscopedEnumType>(val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::array_t& arr)
-{
-    if (not j.is_array())
-    {
-        JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-    }
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
-
-// forward_list doesn't have an insert method
-template<typename BasicJsonType, typename T, typename Allocator>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
-{
-    // do not perform the check when user wants to retrieve jsons
-    // (except when it's null.. ?)
-    if (j.is_null())
-    {
-        JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-    }
-    if (not std::is_same<T, BasicJsonType>::value)
-    {
-        if (not j.is_array())
-        {
-            JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-        }
-    }
-    for (auto it = j.rbegin(), end = j.rend(); it != end; ++it)
-    {
-        l.push_front(it->template get<T>());
-    }
-}
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<0>)
-{
-    using std::begin;
-    using std::end;
-
-    std::transform(j.begin(), j.end(),
-                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename CompatibleArrayType::value_type>();
-    });
-}
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1>)
--> decltype(
-    arr.reserve(std::declval<typename CompatibleArrayType::size_type>()),
-    void())
-{
-    using std::begin;
-    using std::end;
-
-    arr.reserve(j.size());
-    std::transform(
-        j.begin(), j.end(), std::inserter(arr, end(arr)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename CompatibleArrayType::value_type>();
-    });
-}
-
-template<typename BasicJsonType, typename CompatibleArrayType,
-         enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value and
-                     not std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value, int> = 0>
-void from_json(const BasicJsonType& j, CompatibleArrayType& arr)
-{
-    if (j.is_null())
-    {
-        JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-    }
-
-    // when T == BasicJsonType, do not check if value_t is correct
-    if (not std::is_same<typename CompatibleArrayType::value_type, BasicJsonType>::value)
-    {
-        if (not j.is_array())
-        {
-            JSON_THROW(std::domain_error("type must be array, but is " + j.type_name()));
-        }
-    }
-    from_json_array_impl(j, arr, priority_tag<1> {});
+    external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
 template<typename BasicJsonType, typename CompatibleObjectType,
-         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, CompatibleObjectType& obj)
+         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
 {
-    if (not j.is_object())
-    {
-        JSON_THROW(std::domain_error("type must be object, but is " + j.type_name()));
-    }
-
-    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
-    using std::begin;
-    using std::end;
-    // we could avoid the assignment, but this might require a for loop, which
-    // might be less efficient than the container constructor for some
-    // containers (would it?)
-    obj = CompatibleObjectType(begin(*inner_object), end(*inner_object));
+    external_constructor<value_t::object>::construct(j, obj);
 }
 
-// overload for arithmetic types, not chosen for basic_json template arguments
-// (BooleanType, etc..); note: Is it really necessary to provide explicit
-// overloads for boolean_t etc. in case of a custom BooleanType which is not
-// an arithmetic type?
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t <
-             std::is_arithmetic<ArithmeticType>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-             int> = 0>
-void from_json(const BasicJsonType& j, ArithmeticType& val)
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
 {
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        case value_t::boolean:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
-            break;
-        }
-        default:
-        {
-            JSON_THROW(std::domain_error("type must be number, but is " + j.type_name()));
-        }
-    }
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t<not std::is_constructible<typename BasicJsonType::string_t,
+                const T(&)[N]>::value,
+                int> = 0 >
+void to_json(BasicJsonType& j, const T(&arr)[N])
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType, typename... Args>
+void to_json(BasicJsonType& j, const std::pair<Args...>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template < typename BasicJsonType, typename T,
+           enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename... Args>
+void to_json(BasicJsonType& j, const std::tuple<Args...>& t)
+{
+    to_json_tuple_impl(j, t, index_sequence_for<Args...> {});
 }
 
 struct to_json_fn
 {
-  private:
     template<typename BasicJsonType, typename T>
-    auto call(BasicJsonType& j, T&& val, priority_tag<1>) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
     -> decltype(to_json(j, std::forward<T>(val)), void())
     {
         return to_json(j, std::forward<T>(val));
     }
-
-    template<typename BasicJsonType, typename T>
-    void call(BasicJsonType&, T&&, priority_tag<0>) const noexcept
-    {
-        static_assert(sizeof(BasicJsonType) == 0,
-                      "could not find to_json() method in T's namespace");
-    }
-
-  public:
-    template<typename BasicJsonType, typename T>
-    void operator()(BasicJsonType& j, T&& val) const
-    noexcept(noexcept(std::declval<to_json_fn>().call(j, std::forward<T>(val), priority_tag<1> {})))
-    {
-        return call(j, std::forward<T>(val), priority_tag<1> {});
-    }
 };
+}  // namespace detail
 
-struct from_json_fn
-{
-  private:
-    template<typename BasicJsonType, typename T>
-    auto call(const BasicJsonType& j, T& val, priority_tag<1>) const
-    noexcept(noexcept(from_json(j, val)))
-    -> decltype(from_json(j, val), void())
-    {
-        return from_json(j, val);
-    }
-
-    template<typename BasicJsonType, typename T>
-    void call(const BasicJsonType&, T&, priority_tag<0>) const noexcept
-    {
-        static_assert(sizeof(BasicJsonType) == 0,
-                      "could not find from_json() method in T's namespace");
-    }
-
-  public:
-    template<typename BasicJsonType, typename T>
-    void operator()(const BasicJsonType& j, T& val) const
-    noexcept(noexcept(std::declval<from_json_fn>().call(j, val, priority_tag<1> {})))
-    {
-        return call(j, val, priority_tag<1> {});
-    }
-};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static constexpr T value{};
-};
-
-template<typename T>
-constexpr T static_const<T>::value;
-} // namespace detail
-
-
-/// namespace to hold default `to_json` / `from_json` functions
+/// namespace to hold default `to_json` function
 namespace
 {
 constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
-}
+} // namespace
+}  // namespace nlohmann
 
 
-/*!
-@brief default JSONSerializer template argument
+namespace nlohmann
+{
 
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename = void, typename = void>
+template<typename, typename>
 struct adl_serializer
 {
     /*!
@@ -916,12 +2175,13 @@ struct adl_serializer
     This function is usually called by the `get()` function of the
     @ref basic_json class (either explicit or via conversion operators).
 
-    @param[in] j         JSON value to read from
+    @param[in] j        JSON value to read from
     @param[in,out] val  value to write to
     */
     template<typename BasicJsonType, typename ValueType>
-    static void from_json(BasicJsonType&& j, ValueType& val) noexcept(
+    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
         noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
     {
         ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
     }
@@ -933,16 +2193,10657 @@ struct adl_serializer
     class.
 
     @param[in,out] j  JSON value to write to
-    @param[in] val     value to read from
+    @param[in] val    value to read from
     */
-    template<typename BasicJsonType, typename ValueType>
-    static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
+    template <typename BasicJsonType, typename ValueType>
+    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
         noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
     {
         ::nlohmann::to_json(j, std::forward<ValueType>(val));
     }
 };
 
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cassert> // assert
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+#include <array> // array
+#include <cassert> // assert
+#include <cstddef> // size_t
+#include <cstdio> //FILE *
+#include <cstring> // strlen
+#include <istream> // istream
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+
+////////////////////
+// input adapters //
+////////////////////
+
+/*!
+@brief abstract input adapter interface
+
+Produces a stream of std::char_traits<char>::int_type characters from a
+std::istream, a buffer, or some other input type. Accepts the return of
+exactly one non-EOF character for future input. The int_type characters
+returned consist of all valid char values as positive values (typically
+unsigned char), plus an EOF value outside that range, specified by the value
+of the function std::char_traits<char>::eof(). This value is typically -1, but
+could be any arbitrary value which is not a valid char value.
+*/
+struct input_adapter_protocol
+{
+    /// get a character [0,255] or std::char_traits<char>::eof().
+    virtual std::char_traits<char>::int_type get_character() = 0;
+    virtual ~input_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
+
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter : public input_adapter_protocol
+{
+  public:
+    explicit file_input_adapter(std::FILE* f)  noexcept
+        : m_file(f)
+    {}
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = default;
+    ~file_input_adapter() override = default;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter : public input_adapter_protocol
+{
+  public:
+    ~input_stream_adapter() override
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        is.clear(is.rdstate() & std::ios::eofbit);
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(i), sb(*i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter(input_stream_adapter&&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, eg. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character() override
+    {
+        auto res = sb.sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (res == EOF)
+        {
+            is.clear(is.rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream& is;
+    std::streambuf& sb;
+};
+
+/// input adapter for buffer input
+class input_buffer_adapter : public input_adapter_protocol
+{
+  public:
+    input_buffer_adapter(const char* b, const std::size_t l) noexcept
+        : cursor(b), limit(b + l)
+    {}
+
+    // delete because of pointer members
+    input_buffer_adapter(const input_buffer_adapter&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
+    input_buffer_adapter(input_buffer_adapter&&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&&) = delete;
+    ~input_buffer_adapter() override = default;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        if (JSON_LIKELY(cursor < limit))
+        {
+            return std::char_traits<char>::to_int_type(*(cursor++));
+        }
+
+        return std::char_traits<char>::eof();
+    }
+
+  private:
+    /// pointer to the current character
+    const char* cursor;
+    /// pointer past the last character
+    const char* const limit;
+};
+
+template<typename WideStringType, size_t T>
+struct wide_string_input_helper
+{
+    // UTF-32
+    static void fill_buffer(const WideStringType& str,
+                            size_t& current_wchar,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (current_wchar == str.size())
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((wc >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename WideStringType>
+struct wide_string_input_helper<WideStringType, 2>
+{
+    // UTF-16
+    static void fill_buffer(const WideStringType& str,
+                            size_t& current_wchar,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (current_wchar == str.size())
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc or wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (current_wchar < str.size())
+                {
+                    const auto wc2 = static_cast<unsigned int>(str[current_wchar++]);
+                    const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    // unknown character
+                    ++current_wchar;
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+template<typename WideStringType>
+class wide_string_input_adapter : public input_adapter_protocol
+{
+  public:
+    explicit wide_string_input_adapter(const WideStringType& w) noexcept
+        : str(w)
+    {}
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(typename WideStringType::value_type)>();
+
+            assert(utf8_bytes_filled > 0);
+            assert(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        assert(utf8_bytes_filled > 0);
+        assert(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<WideStringType, T>::fill_buffer(str, current_wchar, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// the wstring to process
+    const WideStringType& str;
+
+    /// index of the current wchar in str
+    std::size_t current_wchar = 0;
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+class input_adapter
+{
+  public:
+    // native support
+    input_adapter(std::FILE* file)
+        : ia(std::make_shared<file_input_adapter>(file)) {}
+    /// input adapter for input stream
+    input_adapter(std::istream& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    /// input adapter for input stream
+    input_adapter(std::istream&& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    input_adapter(const std::wstring& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::wstring>>(ws)) {}
+
+    input_adapter(const std::u16string& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::u16string>>(ws)) {}
+
+    input_adapter(const std::u32string& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::u32string>>(ws)) {}
+
+    /// input adapter for buffer
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b, std::size_t l)
+        : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
+
+    // derived support
+
+    /// input adapter for string literal
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b)
+        : input_adapter(reinterpret_cast<const char*>(b),
+                        std::strlen(reinterpret_cast<const char*>(b))) {}
+
+    /// input adapter for iterator range with contiguous storage
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    input_adapter(IteratorType first, IteratorType last)
+    {
+#ifndef NDEBUG
+        // assertion to check that the iterator range is indeed contiguous,
+        // see http://stackoverflow.com/a/35008842/266378 for more discussion
+        const auto is_contiguous = std::accumulate(
+                                       first, last, std::pair<bool, int>(true, 0),
+                                       [&first](std::pair<bool, int> res, decltype(*first) val)
+        {
+            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
+            return res;
+        }).first;
+        assert(is_contiguous);
+#endif
+
+        // assertion to check that each element is 1 byte long
+        static_assert(
+            sizeof(typename iterator_traits<IteratorType>::value_type) == 1,
+            "each element in the iterator range must have the size of 1 byte");
+
+        const auto len = static_cast<size_t>(std::distance(first, last));
+        if (JSON_LIKELY(len > 0))
+        {
+            // there is at least one element: use the address of first
+            ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
+        }
+        else
+        {
+            // the address of first cannot be used: use nullptr
+            ia = std::make_shared<input_buffer_adapter>(nullptr, len);
+        }
+    }
+
+    /// input adapter for array
+    template<class T, std::size_t N>
+    input_adapter(T (&array)[N])
+        : input_adapter(std::begin(array), std::end(array)) {}
+
+    /// input adapter for contiguous container
+    template<class ContiguousContainer, typename
+             std::enable_if<not std::is_pointer<ContiguousContainer>::value and
+                            std::is_base_of<std::random_access_iterator_tag, typename iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
+                            int>::type = 0>
+    input_adapter(const ContiguousContainer& c)
+        : input_adapter(std::begin(c), std::end(c)) {}
+
+    operator input_adapter_t()
+    {
+        return ia;
+    }
+
+  private:
+    /// the actual adapter
+    input_adapter_t ia = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+
+#include <cassert> // assert
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    /// type for (signed) integers
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    /// type for unsigned integers
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    /// type for floating-point numbers
+    using number_float_t = typename BasicJsonType::number_float_t;
+    /// type for strings
+    using string_t = typename BasicJsonType::string_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief an floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    virtual ~json_sax() = default;
+};
+
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+    /*!
+    @param[in, out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const detail::exception& ex)
+    {
+        errored = true;
+        if (allow_exceptions)
+        {
+            // determine the proper exception type from the id
+            switch ((ex.id / 100) % 100)
+            {
+                case 1:
+                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
+                case 4:
+                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
+                // LCOV_EXCL_START
+                case 2:
+                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
+                case 3:
+                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
+                case 5:
+                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
+                default:
+                    assert(false);
+                    // LCOV_EXCL_STOP
+            }
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_value.array->back());
+        }
+
+        assert(ref_stack.back()->is_object());
+        assert(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() and JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep and ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back() and not callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+        {
+            // discard object
+            *ref_stack.back() = discarded;
+        }
+
+        assert(not ref_stack.empty());
+        assert(not keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (not ref_stack.empty() and ref_stack.back() and ref_stack.back()->is_object())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() and JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (not keep)
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        assert(not ref_stack.empty());
+        assert(not keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (not keep and not ref_stack.empty() and ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const detail::exception& ex)
+    {
+        errored = true;
+        if (allow_exceptions)
+        {
+            // determine the proper exception type from the id
+            switch ((ex.id / 100) % 100)
+            {
+                case 1:
+                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
+                case 4:
+                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
+                // LCOV_EXCL_START
+                case 2:
+                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
+                case 3:
+                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
+                case 5:
+                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
+                default:
+                    assert(false);
+                    // LCOV_EXCL_STOP
+            }
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        assert(not keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (not keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback or callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (not keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, &root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (not ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->push_back(std::move(value));
+            return {true, &(ref_stack.back()->m_value.array->back())};
+        }
+
+        // object
+        assert(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        assert(not key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (not store_element)
+        {
+            return {false, nullptr};
+        }
+
+        assert(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t  /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t  /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+}  // namespace detail
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template <typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template <typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template <typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template <typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template <typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template <typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template <typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template <typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template <typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template <typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template <typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template <typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t,
+        string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template <typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using json_sax_t = SAX;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        assert(ia);
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default;
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default;
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+
+    @return
+    */
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal();
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+                result = parse_ubjson_internal();
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result and strict)
+        {
+            if (format == input_format_t::ubjson)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_UNLIKELY(current != std::char_traits<char>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(),
+                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief determine system byte order
+
+    @return true if and only if system's byte order is little endian
+
+    @note from http://stackoverflow.com/a/1001328/266378
+    */
+    static constexpr bool little_endianess(int num = 1) noexcept
+    {
+        return *reinterpret_cast<char*>(&num) == 1;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size;
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_UNLIKELY(not unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<char>(current);
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) and get() != std::char_traits<char>::eof();
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const int element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number;
+                return get_number<double, true>(input_format_t::bson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len;
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, value) and sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value;
+                return get_number<std::int64_t, true>(input_format_t::bson, value) and sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
+                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+        while (int element_type = get())
+        {
+            if (JSON_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_UNLIKELY(not get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (not is_array and not sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size;
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char = true)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) and sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(std::size_t(-1));
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(std::size_t(-1));
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const int byte1_raw = get();
+                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const int byte2_raw = get();
+                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    assert(0 <= exp and exp <= 32);
+                    assert(0 <= mant and mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number;
+                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number;
+                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (not get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or std::size_t(-1) for an
+                    array of indefinite size
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len)
+    {
+        if (JSON_UNLIKELY(not sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_UNLIKELY(not parse_cbor_internal(false)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or std::size_t(-1) for an
+                    object of indefinite size
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len)
+    {
+        if (JSON_UNLIKELY(not sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                get();
+                if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                string_t s;
+                return get_msgpack_string(s) and sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xCA: // float 32
+            {
+                float number;
+                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number;
+                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) and sax->string(s);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_UNLIKELY(not sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_UNLIKELY(not parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_UNLIKELY(not sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_UNLIKELY(not get_msgpack_string(key) or not sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_UNLIKELY(not parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            default:
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
+        }
+    }
+
+    /*!
+    @param[out] result  determined size
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result)
+    {
+        switch (get_ignore_noop())
+        {
+            case 'U':
+            {
+                std::uint8_t number;
+                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number;
+                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number;
+                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number;
+                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number;
+                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
+            }
+        }
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, int>& result)
+    {
+        result.first = string_t::npos; // size
+        result.second = 0; // type
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_UNLIKELY(current != '#'))
+            {
+                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
+            }
+
+            return get_ubjson_size_value(result.first);
+        }
+
+        if (current == '#')
+        {
+            return get_ubjson_size_value(result.first);
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const int prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char>::eof():  // EOF
+                return unexpect_eof(input_format_t::ubjson, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'd':
+            {
+                float number;
+                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number;
+                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char")))
+                {
+                    return false;
+                }
+                if (JSON_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
+                }
+                string_t s(1, static_cast<char>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) and sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, int> size_and_type;
+        if (JSON_UNLIKELY(not get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_UNLIKELY(not sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_UNLIKELY(not get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_UNLIKELY(not parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_UNLIKELY(not parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, int> size_and_type;
+        if (JSON_UNLIKELY(not get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_UNLIKELY(not sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_UNLIKELY(not get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_UNLIKELY(not parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_UNLIKELY(not get_ubjson_string(key, false) or not sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_UNLIKELY(not parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char>::eof()` in that case.
+
+    @return character read from the input
+    */
+    int get()
+    {
+        ++chars_read;
+        return current = ia->get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    int get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianess, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_UNLIKELY(not unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != InputIsLittleEndian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        std::generate_n(std::back_inserter(result), len, [this, &success, &format]()
+        {
+            get();
+            if (JSON_UNLIKELY(not unexpect_eof(format, "string")))
+            {
+                success = false;
+            }
+            return static_cast<char>(current);
+        });
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_UNLIKELY(current == std::char_traits<char>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further contect information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+        return error_msg + " " + context + ": " + detail;
+    }
+
+  private:
+    /// input adapter
+    input_adapter_t ia = nullptr;
+
+    /// the current character
+    int current = std::char_traits<char>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////
+// lexer //
+///////////
+
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType>
+class lexer
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case lexer::token_type::value_unsigned:
+            case lexer::token_type::value_integer:
+            case lexer::token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    explicit lexer(detail::input_adapter_t&& adapter)
+        : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = delete;
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = delete;
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    static char get_decimal_point() noexcept
+    {
+        const auto loc = localeconv();
+        assert(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        assert(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' and current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' and current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' and current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<int> ranges)
+    {
+        assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_LIKELY(*range <= current and current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 7159. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        assert(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_LIKELY(get() == '\\' and get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(codepoint);
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<int>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<int>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<int>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 7159.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 7159. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | [error]  | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr;
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        assert(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    token_type scan_literal(const char* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        assert(current == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_UNLIKELY(get() != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    std::char_traits<char>::int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia->get_character();
+        }
+
+        if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            token_string.push_back(std::char_traits<char>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            assert(not token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(int c)
+    {
+        token_buffer.push_back(std::char_traits<char>::to_char_type(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if ('\x00' <= c and c <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(c);
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB and get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 and not skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        do
+        {
+            get();
+        }
+        while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+                return scan_literal("true", 4, token_type::literal_true);
+            case 'f':
+                return scan_literal("false", 5, token_type::literal_false);
+            case 'n':
+                return scan_literal("null", 4, token_type::literal_null);
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    detail::input_adapter_t ia = nullptr;
+
+    /// the current character
+    std::char_traits<char>::int_type current = std::char_traits<char>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char decimal_point_char = '.';
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/parser.hpp>
+
+
+#include <cassert> // assert
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive decent parser.
+*/
+template<typename BasicJsonType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    enum class parse_event_t : uint8_t
+    {
+        /// the parser read `{` and started to process a JSON object
+        object_start,
+        /// the parser read `}` and finished processing a JSON object
+        object_end,
+        /// the parser read `[` and started to process a JSON array
+        array_start,
+        /// the parser read `]` and finished processing a JSON array
+        array_end,
+        /// the parser read a key of a value in an object
+        key,
+        /// the parser finished reading a JSON value
+        value
+    };
+
+    using parser_callback_t =
+        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
+    /// a parser reading from an input adapter
+    explicit parser(detail::input_adapter_t&& adapter,
+                    const parser_callback_t cb = nullptr,
+                    const bool allow_exceptions_ = true)
+        : callback(cb), m_lexer(std::move(adapter)), allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict and (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict and (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template <typename SAX>
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result and strict and (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(),
+                                            exception_message(token_type::end_of_input, "value")));
+        }
+
+        return result;
+    }
+
+  private:
+    template <typename SAX>
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (not skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_UNLIKELY(not sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::value_string, "object key")));
+                        }
+                        if (JSON_UNLIKELY(not sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::name_separator, "object separator")));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_UNLIKELY(not sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_UNLIKELY(not std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
+                        }
+
+                        if (JSON_UNLIKELY(not sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_UNLIKELY(not sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_UNLIKELY(not sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_UNLIKELY(not sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_UNLIKELY(not sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::uninitialized, "value")));
+                    }
+
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::literal_or_value, "value")));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_UNLIKELY(not sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    assert(not states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_array, "array")));
+            }
+            else  // object
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse key
+                    if (JSON_UNLIKELY(get_token() != token_type::value_string))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::value_string, "object key")));
+                    }
+
+                    if (JSON_UNLIKELY(not sax->key(m_lexer.get_string())))
+                    {
+                        return false;
+                    }
+
+                    // parse separator (:)
+                    if (JSON_UNLIKELY(get_token() != token_type::name_separator))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::name_separator, "object separator")));
+                    }
+
+                    // parse values
+                    get_token();
+                    continue;
+                }
+
+                // closing }
+                if (JSON_LIKELY(last_token == token_type::end_object))
+                {
+                    if (JSON_UNLIKELY(not sax->end_object()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this object. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    assert(not states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_object, "object")));
+            }
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (not context.empty())
+        {
+            error_msg += "while parsing " + context + " ";
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+                         m_lexer.get_token_string() + "'";
+        }
+        else
+        {
+            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+namespace nlohmann
+{
+namespace detail
+{
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator++(int) noexcept
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator--(int) noexcept
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+
+
+#include <ciso646> // not
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl
+{
+    /// allow basic_json to access private members
+    friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+
+  public:
+
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    /// default constructor
+    iter_impl() = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it) {}
+
+    /*!
+    @brief converting assignment
+    @param[in,out] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  private:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator++(int)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator--(int)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator==(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator!=(const iter_impl& other) const
+    {
+        return not operator==(other);
+    }
+
+    /*!
+    @brief  comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return not other.operator < (*this);
+    }
+
+    /*!
+    @brief  comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return not operator<=(other);
+    }
+
+    /*!
+    @brief  comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return not operator<(other);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief  return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief  access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief  return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        assert(m_object != nullptr);
+
+        if (JSON_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+    }
+
+    /*!
+    @brief  return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  private:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+}  // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator const operator++(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator const operator--(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_pointer.hpp>
+
+
+#include <algorithm> // all_of
+#include <cassert> // assert
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+template<typename BasicJsonType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+  public:
+    /*!
+    @brief create JSON pointer
+
+    Create a JSON pointer according to the syntax described in
+    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+    @param[in] s  string representing the JSON pointer; if omitted, the empty
+                  string is assumed which references the whole JSON value
+
+    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
+                           not begin with a slash (`/`); see example below
+
+    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
+    not followed by `0` (representing `~`) or `1` (representing `/`); see
+    example below
+
+    @liveexample{The example shows the construction several valid JSON pointers
+    as well as the exceptional behavior.,json_pointer}
+
+    @since version 2.0.0
+    */
+    explicit json_pointer(const std::string& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /*!
+    @brief return a string representation of the JSON pointer
+
+    @invariant For each JSON pointer `ptr`, it holds:
+    @code {.cpp}
+    ptr == json_pointer(ptr.to_string());
+    @endcode
+
+    @return a string representation of the JSON pointer
+
+    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
+
+    @since version 2.0.0
+    */
+    std::string to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               std::string{},
+                               [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + escape(b);
+        });
+    }
+
+    /// @copydoc to_string()
+    operator std::string() const
+    {
+        return to_string();
+    }
+
+    /*!
+    @brief append another JSON pointer at the end of this JSON pointer
+
+    @param[in] ptr  JSON pointer to append
+    @return JSON pointer with @a ptr appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /*!
+    @brief append an unescaped reference token at the end of this JSON pointer
+
+    @param[in] token  reference token to append
+    @return JSON pointer with @a token appended without escaping @a token
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::string token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /*!
+    @brief append an array index at the end of this JSON pointer
+
+    @param[in] array_index  array index ot append
+    @return JSON pointer with @a array_index appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::size_t array_index)
+    {
+        return *this /= std::to_string(array_index);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+
+    @param[in] lhs  JSON pointer
+    @param[in] rhs  JSON pointer
+    @return a new JSON pointer with @a rhs appended to @a lhs
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a lhs and @a rhs.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] token  reference token
+    @return a new JSON pointer with unescaped @a token appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::string token)
+    {
+        return json_pointer(ptr) /= std::move(token);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] array_index  array index
+    @return a new JSON pointer with @a array_index appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::size_t) to append an array index
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index)
+    {
+        return json_pointer(ptr) /= array_index;
+    }
+
+    /*!
+    @brief returns the parent of this JSON pointer
+
+    @return parent of this JSON pointer; in case this JSON pointer is the root,
+            the root itself is returned
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @liveexample{The example shows the result of `parent_pointer` for different
+    JSON Pointers.,json_pointer__parent_pointer}
+
+    @since version 3.6.0
+    */
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /*!
+    @brief remove last reference token
+
+    @pre not `empty()`
+
+    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    void pop_back()
+    {
+        if (JSON_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /*!
+    @brief return last reference token
+
+    @pre not `empty()`
+    @return last reference token
+
+    @liveexample{The example shows the usage of `back`.,json_pointer__back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    const std::string& back()
+    {
+        if (JSON_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /*!
+    @brief append an unescaped token at the end of the reference pointer
+
+    @param[in] token  token to add
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows the result of `push_back` for different
+    JSON Pointers.,json_pointer__push_back}
+
+    @since version 3.6.0
+    */
+    void push_back(const std::string& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @copydoc push_back(const std::string&)
+    void push_back(std::string&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /*!
+    @brief return whether pointer points to the root document
+
+    @return true iff the JSON pointer points to the root document
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example shows the result of `empty` for different JSON
+    Pointers.,json_pointer__empty}
+
+    @since version 3.6.0
+    */
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    */
+    static int array_index(const std::string& s)
+    {
+        std::size_t processed_chars = 0;
+        const int res = std::stoi(s, &processed_chars);
+
+        // check if the string was completely read
+        if (JSON_UNLIKELY(processed_chars != s.size()))
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+        }
+
+        return res;
+    }
+
+    json_pointer top() const
+    {
+        if (JSON_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        auto result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->m_type)
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    JSON_TRY
+                    {
+                        result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->m_type == detail::value_t::null)
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const char x)
+                {
+                    return x >= '0' and x <= '9';
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums or reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->m_type)
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        JSON_TRY
+                        {
+                            ptr = &ptr->operator[](
+                                static_cast<size_type>(array_index(reference_token)));
+                        }
+                        JSON_CATCH(std::invalid_argument&)
+                        {
+                            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                        }
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->m_type)
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // note: at performs range check
+                    JSON_TRY
+                    {
+                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->m_type)
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // use unchecked array access
+                    JSON_TRY
+                    {
+                        ptr = &ptr->operator[](
+                            static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->m_type)
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // note: at performs range check
+                    JSON_TRY
+                    {
+                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<std::string> split(const std::string& reference_string)
+    {
+        std::vector<std::string> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1,
+                                                   "JSON pointer must be empty or begin with '/' - was: '" +
+                                                   reference_string + "'"));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == std::string::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == std::string::npos)
+            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != std::string::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                assert(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_UNLIKELY(pos == reference_token.size() - 1 or
+                                  (reference_token[pos + 1] != '0' and
+                                   reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
+                }
+            }
+
+            // finally, store the reference token
+            unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief replace all occurrences of a substring by another string
+
+    @param[in,out] s  the string to manipulate; changed so that all
+                   occurrences of @a f are replaced with @a t
+    @param[in]     f  the substring to replace with @a t
+    @param[in]     t  the string to replace @a f
+
+    @pre The search string @a f must not be empty. **This precondition is
+    enforced with an assertion.**
+
+    @since version 2.0.0
+    */
+    static void replace_substring(std::string& s, const std::string& f,
+                                  const std::string& t)
+    {
+        assert(not f.empty());
+        for (auto pos = s.find(f);                // find first occurrence of f
+                pos != std::string::npos;         // make sure f was found
+                s.replace(pos, f.size(), t),      // replace with t, and
+                pos = s.find(f, pos + t.size()))  // find next occurrence of f
+        {}
+    }
+
+    /// escape "~" to "~0" and "/" to "~1"
+    static std::string escape(std::string s)
+    {
+        replace_substring(s, "~", "~0");
+        replace_substring(s, "/", "~1");
+        return s;
+    }
+
+    /// unescape "~1" to tilde and "~0" to slash (order is important!)
+    static void unescape(std::string& s)
+    {
+        replace_substring(s, "~1", "/");
+        replace_substring(s, "~0", "~");
+    }
+
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    static void flatten(const std::string& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.m_type)
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    {
+                        flatten(reference_string + "/" + std::to_string(i),
+                                value.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_value.object)
+                    {
+                        flatten(reference_string + "/" + escape(element.first), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_UNLIKELY(not value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_value.object)
+        {
+            if (JSON_UNLIKELY(not element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief compares two JSON pointers for equality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is equal to @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator==(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return lhs.reference_tokens == rhs.reference_tokens;
+    }
+
+    /*!
+    @brief compares two JSON pointers for inequality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is not equal @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator!=(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return not (lhs == rhs);
+    }
+
+    /// the reference tokens
+    std::vector<std::string> reference_tokens;
+};
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/json_ref.hpp>
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value)), value_ref(&owned_value), is_rvalue(true)
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(const_cast<value_type*>(&value)), is_rvalue(false)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init), value_ref(&owned_value), is_rvalue(true)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...), value_ref(&owned_value),
+          is_rvalue(true) {}
+
+    // class should be movable only
+    json_ref(json_ref&&) = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (is_rvalue)
+        {
+            return std::move(*value_ref);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return *static_cast<value_type const*>(value_ref);
+    }
+
+    value_type const* operator->() const
+    {
+        return static_cast<value_type const*>(value_ref);
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type* value_ref = nullptr;
+    const bool is_rvalue;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <ios> // streamsize
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <ostream> // basic_ostream
+#include <string> // basic_string
+#include <vector> // vector
+
+namespace nlohmann
+{
+namespace detail
+{
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        std::copy(s, s + length, std::back_inserter(v));
+    }
+
+  private:
+    std::vector<CharType>& v;
+};
+
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    output_adapter(std::vector<CharType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    {
+        assert(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_value.object);
+                break;
+            }
+
+            default:
+            {
+                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name())));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                oa->write_character(get_cbor_float_prefix(j.m_value.number_float));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                oa->write_character(get_msgpack_float_prefix(j.m_value.number_float));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type and not j.m_value.array->empty())
+                {
+                    assert(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required);
+                }
+
+                if (not use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type and not j.m_value.object->empty())
+                {
+                    assert(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                }
+
+                if (not use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409,
+                                            "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double, true>(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const std::uint64_t value)
+    {
+        if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64"));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t embedded_document_size = 0ul;
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            embedded_document_size += calc_bson_element_size(std::to_string(array_index++), el);
+        }
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_value.array);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            default:
+                assert(false);
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    @return The size of the BSON entry
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_value.array);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j.m_value.number_unsigned);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            default:
+                assert(false);
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul,
+                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_signed<NumberType>::value and
+                 not std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n and n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n));
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n and n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n and n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n and n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n and n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+
+    @note This function does not need to be 100% accurate when it comes to
+          integer limits. In case a number exceeds the limits of int64_t,
+          this will be detected by a later call to function
+          write_number_with_ubjson_prefix. Therefore, we return 'L' for any
+          value that does not fit the previous limits.
+    */
+    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                // no check and assume int64_t (see note above)
+                return 'L';
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if (j.m_value.number_unsigned <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if (j.m_value.number_unsigned <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                // no check and assume int64_t (see note above)
+                return 'L';
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @tparam NumberType the type of the number
+    @tparam OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+
+    @note This function needs to respect the system's endianess, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool OutputIsLittleEndian = false>
+    void write_number(const NumberType n)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec;
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value and std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value and std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_pod<CharType>::value, "CharType must be POD");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value and
+                   std::is_signed<char>::value and
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianess
+    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // and, or
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+
+
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // or, and, not
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template <typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        assert(x.e == y.e);
+        assert(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        assert(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        assert(delta >= 0);
+        assert(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template <typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    assert(std::isfinite(value));
+    assert(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 and E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exakt power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    assert(e >= -1500);
+    assert(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    assert(index >= 0);
+    assert(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    assert(kAlpha <= cached.e + e + 64);
+    assert(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    else if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    else if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    else if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    else if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    else if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    else if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    else if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    else if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+    else
+    {
+        pow10 = 1;
+        return 1;
+    }
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    assert(len >= 1);
+    assert(dist <= delta);
+    assert(rest <= delta);
+    assert(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            and delta - rest >= ten_k
+            and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
+    {
+        assert(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    assert(M_plus.e >= kAlpha);
+    assert(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    assert(p1 > 0);
+
+    std::uint32_t pow10;
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        assert(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    assert(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        assert(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        assert(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    assert(m_plus.e == m_minus.e);
+    assert(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template <typename FloatType>
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    assert(std::isfinite(value));
+    assert(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+inline char* append_exponent(char* buf, int e)
+{
+    assert(e > -1000);
+    assert(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    assert(min_exp < 0);
+    assert(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n and n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n - k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (n + 2);
+    }
+
+    if (0 < n and n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        assert(k > n);
+
+        std::memmove(buf + (n + 1), buf + n, static_cast<size_t>(k - n));
+        buf[n] = '.';
+        return buf + (k + 1);
+    }
+
+    if (min_exp < n and n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + -n), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2 + (-n) + k);
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k - 1));
+        buf[1] = '.';
+        buf += 1 + k;
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+} // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template <typename FloatType>
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    assert(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+
+    assert(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    assert(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    assert(last - first >= kMaxExp + 2);
+    assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+
+    @param[in] val             value to serialize
+    @param[in] pretty_print    whether the output shall be pretty-printed
+    @param[in] indent_step     the indent level
+    @param[in] current_indent  the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val, const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+    }
+
+  private:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint;
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) or (ensure_ascii and (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                    static_cast<std::uint16_t>(codepoint));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            std::string sn(3, '\0');
+                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
+                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            assert(false);  // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (not ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    std::string sn(3, '\0');
+                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
+                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    assert(false);  // LCOV_EXCL_LINE
+            }
+        }
+    }
+
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template<typename NumberType, detail::enable_if_t<
+                 std::is_same<NumberType, number_unsigned_t>::value or
+                 std::is_same<NumberType, number_integer_t>::value,
+                 int> = 0>
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin();
+
+        const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars;
+
+        if (is_negative)
+        {
+            *buffer_ptr = '-';
+            abs_value = static_cast<number_unsigned_t>(std::abs(static_cast<std::intmax_t>(x)));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        assert(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (not std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 24 and std::numeric_limits<number_float_t>::max_exponent == 128) or
+              (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 53 and std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        char* begin = number_buffer.data();
+        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        assert(len > 0);
+        // check if buffer was large enough
+        assert(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            const auto end = std::remove(number_buffer.begin(),
+                                         number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            assert((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' and decimal_point != '.')
+        {
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' or c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        state = utf8d[256u + state * 16u + type];
+        return state;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
 
 /*!
 @brief a class to store JSON values
@@ -968,42 +12869,42 @@ and `from_json()` (@ref adl_serializer by default)
 
 @requirement The class satisfies the following concept requirements:
 - Basic
- - [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible):
+ - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
    JSON values can be default constructed. The result will be a JSON null
    value.
- - [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible):
+ - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
    A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible):
+ - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
    A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](http://en.cppreference.com/w/cpp/concept/MoveAssignable):
+ - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
    A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](http://en.cppreference.com/w/cpp/concept/CopyAssignable):
+ - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
    A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](http://en.cppreference.com/w/cpp/concept/Destructible):
+ - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
    JSON values can be destructed.
 - Layout
- - [StandardLayoutType](http://en.cppreference.com/w/cpp/concept/StandardLayoutType):
+ - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
    JSON values have
-   [standard layout](http://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
    All non-static data members are private and standard layout types, the
    class has no virtual functions or (virtual) base classes.
 - Library-wide
- - [EqualityComparable](http://en.cppreference.com/w/cpp/concept/EqualityComparable):
+ - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
    JSON values can be compared with `==`, see @ref
    operator==(const_reference,const_reference).
- - [LessThanComparable](http://en.cppreference.com/w/cpp/concept/LessThanComparable):
+ - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
    JSON values can be compared with `<`, see @ref
    operator<(const_reference,const_reference).
- - [Swappable](http://en.cppreference.com/w/cpp/concept/Swappable):
+ - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
    Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
    other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](http://en.cppreference.com/w/cpp/concept/NullablePointer):
+ - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
    JSON values can be compared against `std::nullptr_t` objects which are used
    to model the `null` value.
 - Container
- - [Container](http://en.cppreference.com/w/cpp/concept/Container):
+ - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
    JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer);
+ - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
    JSON values can be used like STL containers and provide reverse iterator
    access.
 
@@ -1025,34 +12926,87 @@ Format](http://rfc7159.net/rfc7159)
 
 @nosubgrouping
 */
-template <
-    template<typename U, typename V, typename... Args> class ObjectType = std::map,
-    template<typename U, typename... Args> class ArrayType = std::vector,
-    class StringType = std::string,
-    class BooleanType = bool,
-    class NumberIntegerType = std::int64_t,
-    class NumberUnsignedType = std::uint64_t,
-    class NumberFloatType = double,
-    template<typename U> class AllocatorType = std::allocator,
-    template<typename T, typename SFINAE = void> class JSONSerializer = adl_serializer
-    >
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
 class basic_json
 {
   private:
     template<detail::value_t> friend struct detail::external_constructor;
+    friend ::nlohmann::json_pointer<basic_json>;
+    friend ::nlohmann::detail::parser<basic_json>;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+
     /// workaround type for MSVC
-    using basic_json_t = basic_json<ObjectType, ArrayType, StringType,
-          BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType,
-          AllocatorType, JSONSerializer>;
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer<basic_json>;
+    using parser = ::nlohmann::detail::parser<basic_json>;
+
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
 
   public:
     using value_t = detail::value_t;
-    // forward declarations
-    template<typename U> class iter_impl;
-    template<typename Base> class json_reverse_iterator;
-    class json_pointer;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<basic_json>;
     template<typename T, typename SFINAE>
     using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    /// @copydoc detail::exception
+    using exception = detail::exception;
+    /// @copydoc detail::parse_error
+    using parse_error = detail::parse_error;
+    /// @copydoc detail::invalid_iterator
+    using invalid_iterator = detail::invalid_iterator;
+    /// @copydoc detail::type_error
+    using type_error = detail::type_error;
+    /// @copydoc detail::out_of_range
+    using out_of_range = detail::out_of_range;
+    /// @copydoc detail::other_error
+    using other_error = detail::other_error;
+
+    /// @}
+
 
     /////////////////////
     // container types //
@@ -1123,10 +13077,14 @@ class basic_json
     @liveexample{The following code shows an example output of the `meta()`
     function.,meta}
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @complexity Constant.
 
     @since 2.1.0
     */
+    JSON_NODISCARD
     static basic_json meta()
     {
         basic_json result;
@@ -1134,13 +13092,13 @@ class basic_json
         result["copyright"] = "(C) 2013-2017 Niels Lohmann";
         result["name"] = "JSON for Modern C++";
         result["url"] = "https://github.com/nlohmann/json";
-        result["version"] =
-        {
-            {"string", "2.1.1"},
-            {"major", 2},
-            {"minor", 1},
-            {"patch", 1}
-        };
+        result["version"]["string"] =
+            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
 
 #ifdef _WIN32
         result["platform"] = "win32";
@@ -1154,10 +13112,10 @@ class basic_json
         result["platform"] = "unknown";
 #endif
 
-#if defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__ICC) || defined(__INTEL_COMPILER)
+#if defined(__ICC) || defined(__INTEL_COMPILER)
         result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
 #elif defined(__GNUC__) || defined(__GNUG__)
         result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
 #elif defined(__HP_cc) || defined(__HP_aCC)
@@ -1192,6 +13150,14 @@ class basic_json
     /// the template arguments passed to class @ref basic_json.
     /// @{
 
+#if defined(JSON_HAS_CPP_14)
+    // Use transparent comparator if possible, combined with perfect forwarding
+    // on find() and count() calls prevents unnecessary string construction.
+    using object_comparator_t = std::less<>;
+#else
+    using object_comparator_t = std::less<StringType>;
+#endif
+
     /*!
     @brief a type for an object
 
@@ -1234,10 +13200,10 @@ class basic_json
     - When all names are unique, objects will be interoperable in the sense
       that all software implementations receiving that object will agree on
       the name-value mappings.
-    - When the names within an object are not unique, later stored name/value
-      pairs overwrite previously stored name/value pairs, leaving the used
-      names unique. For instance, `{"key": 1}` and `{"key": 2, "key": 1}` will
-      be treated as equal and both stored as `{"key": 1}`.
+    - When the names within an object are not unique, it is unspecified which
+      one of the values for a given key will be chosen. For instance,
+      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
+      `{"key": 2}`.
     - Internally, name/value pairs are stored in lexicographical order of the
       names. Objects will also be serialized (see @ref dump) in this order.
       For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
@@ -1252,7 +13218,7 @@ class basic_json
     [RFC 7159](http://rfc7159.net/rfc7159) specifies:
     > An implementation may set limits on the maximum depth of nesting.
 
-    In this class, the object's limit of nesting is not constraint explicitly.
+    In this class, the object's limit of nesting is not explicitly constrained.
     However, a maximum depth of nesting may be introduced by the compiler or
     runtime environment. A theoretical limit can be queried by calling the
     @ref max_size function of a JSON object.
@@ -1277,7 +13243,7 @@ class basic_json
     */
     using object_t = ObjectType<StringType,
           basic_json,
-          std::less<StringType>,
+          object_comparator_t,
           AllocatorType<std::pair<const StringType,
           basic_json>>>;
 
@@ -1311,7 +13277,7 @@ class basic_json
     [RFC 7159](http://rfc7159.net/rfc7159) specifies:
     > An implementation may set limits on the maximum depth of nesting.
 
-    In this class, the array's limit of nesting is not constraint explicitly.
+    In this class, the array's limit of nesting is not explicitly constrained.
     However, a maximum depth of nesting may be introduced by the compiler or
     runtime environment. A theoretical limit can be queried by calling the
     @ref max_size function of a JSON array.
@@ -1626,12 +13592,14 @@ class basic_json
     static T* create(Args&& ... args)
     {
         AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
         auto deleter = [&](T * object)
         {
-            alloc.deallocate(object, 1);
+            AllocatorTraits::deallocate(alloc, object, 1);
         };
-        std::unique_ptr<T, decltype(deleter)> object(alloc.allocate(1), deleter);
-        alloc.construct(object.get(), std::forward<Args>(args)...);
+        std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
         assert(object != nullptr);
         return object.release();
     }
@@ -1740,14 +13708,16 @@ class basic_json
 
                 case value_t::null:
                 {
+                    object = nullptr;  // silence warning, see #821
                     break;
                 }
 
                 default:
                 {
-                    if (t == value_t::null)
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(std::domain_error("961c151d2e87f2686a955a9be24d316f1362bf21 2.1.1")); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.6.1")); // LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -1760,17 +13730,70 @@ class basic_json
             string = create<string_t>(value);
         }
 
+        /// constructor for rvalue strings
+        json_value(string_t&& value)
+        {
+            string = create<string_t>(std::move(value));
+        }
+
         /// constructor for objects
         json_value(const object_t& value)
         {
             object = create<object_t>(value);
         }
 
+        /// constructor for rvalue objects
+        json_value(object_t&& value)
+        {
+            object = create<object_t>(std::move(value));
+        }
+
         /// constructor for arrays
         json_value(const array_t& value)
         {
             array = create<array_t>(value);
         }
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value)
+        {
+            array = create<array_t>(std::move(value));
+        }
+
+        void destroy(value_t t) noexcept
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                default:
+                {
+                    break;
+                }
+            }
+        }
     };
 
     /*!
@@ -1782,7 +13805,7 @@ class basic_json
     value is changed, because the invariant expresses a relationship between
     @a m_type and @a m_value.
     */
-    void assert_invariant() const
+    void assert_invariant() const noexcept
     {
         assert(m_type != value_t::object or m_value.object != nullptr);
         assert(m_type != value_t::array or m_value.array != nullptr);
@@ -1795,42 +13818,31 @@ class basic_json
     //////////////////////////
 
     /*!
-    @brief JSON callback events
+    @brief parser event types
 
-    This enumeration lists the parser events that can trigger calling a
-    callback function of type @ref parser_callback_t during parsing.
+    The parser callback distinguishes the following events:
+    - `object_start`: the parser read `{` and started to process a JSON object
+    - `key`: the parser read a key of a value in an object
+    - `object_end`: the parser read `}` and finished processing a JSON object
+    - `array_start`: the parser read `[` and started to process a JSON array
+    - `array_end`: the parser read `]` and finished processing a JSON array
+    - `value`: the parser finished reading a JSON value
 
     @image html callback_events.png "Example when certain parse events are triggered"
 
-    @since version 1.0.0
+    @sa @ref parser_callback_t for more information and examples
     */
-    enum class parse_event_t : uint8_t
-    {
-        /// the parser read `{` and started to process a JSON object
-        object_start,
-        /// the parser read `}` and finished processing a JSON object
-        object_end,
-        /// the parser read `[` and started to process a JSON array
-        array_start,
-        /// the parser read `]` and finished processing a JSON array
-        array_end,
-        /// the parser read a key of a value in an object
-        key,
-        /// the parser finished reading a JSON value
-        value
-    };
+    using parse_event_t = typename parser::parse_event_t;
 
     /*!
     @brief per-element parser callback type
 
     With a parser callback function, the result of parsing a JSON text can be
-    influenced. When passed to @ref parse(std::istream&, const
-    parser_callback_t) or @ref parse(const CharT, const parser_callback_t),
-    it is called on certain events (passed as @ref parse_event_t via parameter
-    @a event) with a set recursion depth @a depth and context JSON value
-    @a parsed. The return value of the callback function is a boolean
-    indicating whether the element that emitted the callback shall be kept or
-    not.
+    influenced. When passed to @ref parse, it is called on certain events
+    (passed as @ref parse_event_t via parameter @a event) with a set recursion
+    depth @a depth and context JSON value @a parsed. The return value of the
+    callback function is a boolean indicating whether the element that emitted
+    the callback shall be kept or not.
 
     We distinguish six scenarios (determined by the event type) in which the
     callback function can be called. The following table describes the values
@@ -1867,15 +13879,11 @@ class basic_json
     should be kept (`true`) or not (`false`). In the latter case, it is either
     skipped completely or replaced by an empty discarded object.
 
-    @sa @ref parse(std::istream&, parser_callback_t) or
-    @ref parse(const CharT, const parser_callback_t) for examples
+    @sa @ref parse for examples
 
     @since version 1.0.0
     */
-    using parser_callback_t = std::function<bool(int depth,
-                              parse_event_t event,
-                              basic_json& parsed)>;
-
+    using parser_callback_t = typename parser::parser_callback_t;
 
     //////////////////
     // constructors //
@@ -1901,20 +13909,22 @@ class basic_json
     object      | `{}`
     array       | `[]`
 
-    @param[in] value_type  the type of the value to create
+    @param[in] v  the type of the value to create
 
     @complexity Constant.
 
-    @throw std::bad_alloc if allocation for object, array, or string value
-    fails
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
 
     @liveexample{The following code shows the constructor for different @ref
     value_t values,basic_json__value_t}
 
+    @sa @ref clear() -- restores the postcondition of this constructor
+
     @since version 1.0.0
     */
-    basic_json(const value_t value_type)
-        : m_type(value_type), m_value(value_type)
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
     {
         assert_invariant();
     }
@@ -1947,7 +13957,7 @@ class basic_json
     @brief create a JSON value
 
     This is a "catch all" constructor for all compatible JSON types; that is,
-    types for which a `to_json()` method exsits. The constructor forwards the
+    types for which a `to_json()` method exists. The constructor forwards the
     parameter @a val to that method (to `json_serializer<U>::to_json` method
     with `U = uncvref_t<CompatibleType>`, to be exact).
 
@@ -1955,9 +13965,9 @@ class basic_json
     following types:
     - **arrays**: @ref array_t and all kinds of compatible containers such as
       `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
-      `std::array`, `std::set`, `std::unordered_set`, `std::multiset`, and
-      `unordered_multiset` with a `value_type` from which a @ref basic_json
-      value can be constructed.
+      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
+      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
+      which a @ref basic_json value can be constructed.
     - **objects**: @ref object_t and all kinds of compatible associative
       containers such as `std::map`, `std::unordered_map`, `std::multimap`,
       and `std::unordered_multimap` with a `key_type` compatible to
@@ -1976,6 +13986,7 @@ class basic_json
     - @a CompatibleType is not derived from `std::istream`,
     - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
          constructors),
+    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
     - @a CompatibleType is not a @ref basic_json nested type (e.g.,
          @ref json_pointer, @ref iterator, etc ...)
     - @ref @ref json_serializer<U> has a
@@ -1983,33 +13994,108 @@ class basic_json
 
     @tparam U = `uncvref_t<CompatibleType>`
 
-    @param[in] val the value to be forwarded
+    @param[in] val the value to be forwarded to the respective constructor
 
     @complexity Usually linear in the size of the passed @a val, also
                 depending on the implementation of the called `to_json()`
                 method.
 
-    @throw what `json_serializer<U>::to_json()` throws
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
 
     @liveexample{The following code shows the constructor with several
     compatible types.,basic_json__CompatibleType}
 
     @since version 2.1.0
     */
-    template<typename CompatibleType, typename U = detail::uncvref_t<CompatibleType>,
-             detail::enable_if_t<not std::is_base_of<std::istream, U>::value and
-                                 not std::is_same<U, basic_json_t>::value and
-                                 not detail::is_basic_json_nested_type<
-                                     basic_json_t, U>::value and
-                                 detail::has_to_json<basic_json, U>::value,
-                                 int> = 0>
-    basic_json(CompatibleType && val) noexcept(noexcept(JSONSerializer<U>::to_json(
-                std::declval<basic_json_t&>(), std::forward<CompatibleType>(val))))
+    template <typename CompatibleType,
+              typename U = detail::uncvref_t<CompatibleType>,
+              detail::enable_if_t<
+                  not detail::is_basic_json<U>::value and detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
+    basic_json(CompatibleType && val) noexcept(noexcept(
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
     {
         JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
         assert_invariant();
     }
 
+    /*!
+    @brief create a JSON value from an existing one
+
+    This is a constructor for existing @ref basic_json types.
+    It does not hijack copy/move constructors, since the parameter has different
+    template arguments than the current ones.
+
+    The constructor tries to convert the internal @ref m_value of the parameter.
+
+    @tparam BasicJsonType a type such that:
+    - @a BasicJsonType is a @ref basic_json type.
+    - @a BasicJsonType has different template arguments than @ref basic_json_t.
+
+    @param[in] val the @ref basic_json value to be converted.
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @since version 3.2.0
+    */
+    template <typename BasicJsonType,
+              detail::enable_if_t<
+                  detail::is_basic_json<BasicJsonType>::value and not std::is_same<basic_json, BasicJsonType>::value, int> = 0>
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+        assert_invariant();
+    }
+
     /*!
     @brief create a container (array or object) from an initializer list
 
@@ -2029,7 +14115,7 @@ class basic_json
 
     1. The empty initializer list is written as `{}` which is exactly an empty
        JSON object.
-    2. C++ has now way of describing mapped types other than to list a list of
+    2. C++ has no way of describing mapped types other than to list a list of
        pairs. As JSON requires that keys must be of type string, rule 2 is the
        weakest constraint one can pose on initializer lists to interpret them
        as an object.
@@ -2039,10 +14125,10 @@ class basic_json
     With the rules described above, the following JSON values cannot be
     expressed by an initializer list:
 
-    - the empty array (`[]`): use @ref array(std::initializer_list<basic_json>)
+    - the empty array (`[]`): use @ref array(initializer_list_t)
       with an empty initializer list in this case
     - arrays whose elements satisfy rule 2: use @ref
-      array(std::initializer_list<basic_json>) with the same initializer list
+      array(initializer_list_t) with the same initializer list
       in this case
 
     @note When used without parentheses around an empty initializer list, @ref
@@ -2054,41 +14140,46 @@ class basic_json
     @param[in] type_deduction internal parameter; when set to `true`, the type
     of the JSON value is deducted from the initializer list @a init; when set
     to `false`, the type provided via @a manual_type is forced. This mode is
-    used by the functions @ref array(std::initializer_list<basic_json>) and
-    @ref object(std::initializer_list<basic_json>).
+    used by the functions @ref array(initializer_list_t) and
+    @ref object(initializer_list_t).
 
     @param[in] manual_type internal parameter; when @a type_deduction is set
     to `false`, the created JSON value will use the provided type (only @ref
     value_t::array and @ref value_t::object are valid); when @a type_deduction
     is set to `true`, this parameter has no effect
 
-    @throw std::domain_error if @a type_deduction is `false`, @a manual_type
-    is `value_t::object`, but @a init contains an element which is not a pair
-    whose first element is a string; example: `"cannot create object from
-    initializer list"`
+    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
+    `value_t::object`, but @a init contains an element which is not a pair
+    whose first element is a string. In this case, the constructor could not
+    create an object. If @a type_deduction would have be `true`, an array
+    would have been created. See @ref object(initializer_list_t)
+    for an example.
 
     @complexity Linear in the size of the initializer list @a init.
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @liveexample{The example below shows how JSON values are created from
     initializer lists.,basic_json__list_init_t}
 
-    @sa @ref array(std::initializer_list<basic_json>) -- create a JSON array
+    @sa @ref array(initializer_list_t) -- create a JSON array
     value from an initializer list
-    @sa @ref object(std::initializer_list<basic_json>) -- create a JSON object
+    @sa @ref object(initializer_list_t) -- create a JSON object
     value from an initializer list
 
     @since version 1.0.0
     */
-    basic_json(std::initializer_list<basic_json> init,
+    basic_json(initializer_list_t init,
                bool type_deduction = true,
                value_t manual_type = value_t::array)
     {
         // check if each element is an array with two elements whose first
         // element is a string
         bool is_an_object = std::all_of(init.begin(), init.end(),
-                                        [](const basic_json & element)
+                                        [](const detail::json_ref<basic_json>& element_ref)
         {
-            return element.is_array() and element.size() == 2 and element[0].is_string();
+            return element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string();
         });
 
         // adjust type if type deduction is not wanted
@@ -2101,9 +14192,9 @@ class basic_json
             }
 
             // if object is wanted but impossible, throw an exception
-            if (manual_type == value_t::object and not is_an_object)
+            if (JSON_UNLIKELY(manual_type == value_t::object and not is_an_object))
             {
-                JSON_THROW(std::domain_error("cannot create object from initializer list"));
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
             }
         }
 
@@ -2113,16 +14204,19 @@ class basic_json
             m_type = value_t::object;
             m_value = value_t::object;
 
-            std::for_each(init.begin(), init.end(), [this](const basic_json & element)
+            std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
             {
-                m_value.object->emplace(*(element[0].m_value.string), element[1]);
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
             });
         }
         else
         {
             // the initializer list describes an array -> create array
             m_type = value_t::array;
-            m_value.array = create<array_t>(init);
+            m_value.array = create<array_t>(init.begin(), init.end());
         }
 
         assert_invariant();
@@ -2137,7 +14231,7 @@ class basic_json
 
     @note This function is only needed to express two edge cases that cannot
     be realized with the initializer list constructor (@ref
-    basic_json(std::initializer_list<basic_json>, bool, value_t)). These cases
+    basic_json(initializer_list_t, bool, value_t)). These cases
     are:
     1. creating an array whose elements are all pairs whose first element is a
     string -- in this case, the initializer list constructor would create an
@@ -2152,18 +14246,21 @@ class basic_json
 
     @complexity Linear in the size of @a init.
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @liveexample{The following code shows an example for the `array`
     function.,array}
 
-    @sa @ref basic_json(std::initializer_list<basic_json>, bool, value_t) --
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
     create a JSON value from an initializer list
-    @sa @ref object(std::initializer_list<basic_json>) -- create a JSON object
+    @sa @ref object(initializer_list_t) -- create a JSON object
     value from an initializer list
 
     @since version 1.0.0
     */
-    static basic_json array(std::initializer_list<basic_json> init =
-                                std::initializer_list<basic_json>())
+    JSON_NODISCARD
+    static basic_json array(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::array);
     }
@@ -2176,34 +14273,38 @@ class basic_json
     the initializer list is empty, the empty object `{}` is created.
 
     @note This function is only added for symmetry reasons. In contrast to the
-    related function @ref array(std::initializer_list<basic_json>), there are
+    related function @ref array(initializer_list_t), there are
     no cases which can only be expressed by this function. That is, any
     initializer list @a init can also be passed to the initializer list
-    constructor @ref basic_json(std::initializer_list<basic_json>, bool,
-    value_t).
+    constructor @ref basic_json(initializer_list_t, bool, value_t).
 
     @param[in] init  initializer list to create an object from (optional)
 
     @return JSON object value
 
-    @throw std::domain_error if @a init is not a pair whose first elements are
-    strings; thrown by
-    @ref basic_json(std::initializer_list<basic_json>, bool, value_t)
+    @throw type_error.301 if @a init is not a list of pairs whose first
+    elements are strings. In this case, no object can be created. When such a
+    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
+    an array would have been created from the passed initializer list @a init.
+    See example below.
 
     @complexity Linear in the size of @a init.
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @liveexample{The following code shows an example for the `object`
     function.,object}
 
-    @sa @ref basic_json(std::initializer_list<basic_json>, bool, value_t) --
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
     create a JSON value from an initializer list
-    @sa @ref array(std::initializer_list<basic_json>) -- create a JSON array
+    @sa @ref array(initializer_list_t) -- create a JSON array
     value from an initializer list
 
     @since version 1.0.0
     */
-    static basic_json object(std::initializer_list<basic_json> init =
-                                 std::initializer_list<basic_json>())
+    JSON_NODISCARD
+    static basic_json object(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::object);
     }
@@ -2212,14 +14313,18 @@ class basic_json
     @brief construct an array with count copies of given value
 
     Constructs a JSON array value by creating @a cnt copies of a passed value.
-    In case @a cnt is `0`, an empty array is created. As postcondition,
-    `std::distance(begin(),end()) == cnt` holds.
+    In case @a cnt is `0`, an empty array is created.
 
     @param[in] cnt  the number of JSON copies of @a val to create
     @param[in] val  the JSON value to copy
 
+    @post `std::distance(begin(),end()) == cnt` holds.
+
     @complexity Linear in @a cnt.
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @liveexample{The following code shows examples for the @ref
     basic_json(size_type\, const basic_json&)
     constructor.,basic_json__size_type_basic_json}
@@ -2238,12 +14343,13 @@ class basic_json
 
     Constructs the JSON value with the contents of the range `[first, last)`.
     The semantics depends on the different types a JSON value can have:
-    - In case of primitive types (number, boolean, or string), @a first must
-      be `begin()` and @a last must be `end()`. In this case, the value is
-      copied. Otherwise, std::out_of_range is thrown.
+    - In case of a null type, invalid_iterator.206 is thrown.
+    - In case of other primitive types (number, boolean, or string), @a first
+      must be `begin()` and @a last must be `end()`. In this case, the value is
+      copied. Otherwise, invalid_iterator.204 is thrown.
     - In case of structured types (array, object), the constructor behaves as
-      similar versions for `std::vector`.
-    - In case of a null type, std::domain_error is thrown.
+      similar versions for `std::vector` or `std::map`; that is, a JSON array
+      or object is constructed from the values in the range.
 
     @tparam InputIT an input iterator type (@ref iterator or @ref
     const_iterator)
@@ -2252,19 +14358,36 @@ class basic_json
     @param[in] last end of the range to copy from (excluded)
 
     @pre Iterators @a first and @a last must be initialized. **This
-         precondition is enforced with an assertion.**
+         precondition is enforced with an assertion (see warning).** If
+         assertions are switched off, a violation of this precondition yields
+         undefined behavior.
 
-    @throw std::domain_error if iterators are not compatible; that is, do not
-    belong to the same JSON value; example: `"iterators are not compatible"`
-    @throw std::out_of_range if iterators are for a primitive type (number,
-    boolean, or string) where an out of range error can be detected easily;
-    example: `"iterators out of range"`
-    @throw std::bad_alloc if allocation for object, array, or string fails
-    @throw std::domain_error if called with a null value; example: `"cannot
-    use construct with iterators from null"`
+    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
+         checked efficiently. Only certain edge cases are detected; see the
+         description of the exceptions below. A violation of this precondition
+         yields undefined behavior.
+
+    @warning A precondition is enforced with a runtime assertion that will
+             result in calling `std::abort` if this precondition is not met.
+             Assertions can be disabled by defining `NDEBUG` at compile time.
+             See https://en.cppreference.com/w/cpp/error/assert for more
+             information.
+
+    @throw invalid_iterator.201 if iterators @a first and @a last are not
+    compatible (i.e., do not belong to the same JSON value). In this case,
+    the range `[first, last)` is undefined.
+    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
+    primitive type (number, boolean, or string), but @a first does not point
+    to the first element any more. In this case, the range `[first, last)` is
+    undefined. See example code below.
+    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
+    null value. In this case, the range `[first, last)` is undefined.
 
     @complexity Linear in distance between @a first and @a last.
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @liveexample{The example below shows several ways to create JSON values by
     specifying a subrange with iterators.,basic_json__InputIt_InputIt}
 
@@ -2279,9 +14402,9 @@ class basic_json
         assert(last.m_object != nullptr);
 
         // make sure iterator fits the current value
-        if (first.m_object != last.m_object)
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(std::domain_error("iterators are not compatible"));
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
         }
 
         // copy type from first iterator
@@ -2296,17 +14419,16 @@ class basic_json
             case value_t::number_unsigned:
             case value_t::string:
             {
-                if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
+                if (JSON_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
+                                  or not last.m_it.primitive_iterator.is_end()))
                 {
-                    JSON_THROW(std::out_of_range("iterators out of range"));
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
                 }
                 break;
             }
 
             default:
-            {
                 break;
-            }
         }
 
         switch (m_type)
@@ -2356,53 +14478,23 @@ class basic_json
             }
 
             default:
-            {
-                JSON_THROW(std::domain_error("cannot use construct with iterators from " + first.m_object->type_name()));
-            }
+                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
+                                                    std::string(first.m_object->type_name())));
         }
 
         assert_invariant();
     }
 
-    /*!
-    @brief construct a JSON value given an input stream
-
-    @param[in,out] i  stream to read a serialized JSON value from
-    @param[in] cb a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @deprecated This constructor is deprecated and will be removed in version
-      3.0.0 to unify the interface of the library. Deserialization will be
-      done by stream operators or by calling one of the `parse` functions,
-      e.g. @ref parse(std::istream&, const parser_callback_t). That is, calls
-      like `json j(i);` for an input stream @a i need to be replaced by
-      `json j = json::parse(i);`. See the example below.
-
-    @liveexample{The example below demonstrates constructing a JSON value from
-    a `std::stringstream` with and without callback
-    function.,basic_json__istream}
-
-    @since version 2.0.0, deprecated in version 2.0.3, to be removed in
-           version 3.0.0
-    */
-    JSON_DEPRECATED
-    explicit basic_json(std::istream& i, const parser_callback_t cb = nullptr)
-    {
-        *this = parser(i, cb).parse();
-        assert_invariant();
-    }
 
     ///////////////////////////////////////
     // other constructors and destructor //
     ///////////////////////////////////////
 
+    /// @private
+    basic_json(const detail::json_ref<basic_json>& ref)
+        : basic_json(ref.moved_or_copied())
+    {}
+
     /*!
     @brief copy constructor
 
@@ -2410,16 +14502,19 @@ class basic_json
 
     @param[in] other  the JSON value to copy
 
+    @post `*this == other`
+
     @complexity Linear in the size of @a other.
 
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is linear.
     - As postcondition, it holds: `other == basic_json(other)`.
 
-    @throw std::bad_alloc if allocation for object, array, or string fails.
-
     @liveexample{The following code shows an example for the copy
     constructor.,basic_json__basic_json}
 
@@ -2476,9 +14571,7 @@ class basic_json
             }
 
             default:
-            {
                 break;
-            }
         }
 
         assert_invariant();
@@ -2493,10 +14586,18 @@ class basic_json
 
     @param[in,out] other  value to move to this object
 
-    @post @a other is a JSON null value
+    @post `*this` has the same value as @a other before the call.
+    @post @a other is a JSON null value.
 
     @complexity Constant.
 
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
+    requirements.
+
     @liveexample{The code below shows the move constructor explicitly called
     via std::move.,basic_json__moveconstructor}
 
@@ -2521,14 +14622,14 @@ class basic_json
 
     Copy assignment operator. Copies a JSON value via the "copy and swap"
     strategy: It is expressed in terms of the copy constructor, destructor,
-    and the swap() member function.
+    and the `swap()` member function.
 
     @param[in] other  value to copy from
 
     @complexity Linear.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is linear.
 
@@ -2539,7 +14640,7 @@ class basic_json
 
     @since version 1.0.0
     */
-    reference& operator=(basic_json other) noexcept (
+    basic_json& operator=(basic_json other) noexcept (
         std::is_nothrow_move_constructible<value_t>::value and
         std::is_nothrow_move_assignable<value_t>::value and
         std::is_nothrow_move_constructible<json_value>::value and
@@ -2565,49 +14666,17 @@ class basic_json
     @complexity Linear.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is linear.
     - All stored elements are destroyed and all memory is freed.
 
     @since version 1.0.0
     */
-    ~basic_json()
+    ~basic_json() noexcept
     {
         assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                AllocatorType<object_t> alloc;
-                alloc.destroy(m_value.object);
-                alloc.deallocate(m_value.object, 1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                AllocatorType<array_t> alloc;
-                alloc.destroy(m_value.array);
-                alloc.deallocate(m_value.array, 1);
-                break;
-            }
-
-            case value_t::string:
-            {
-                AllocatorType<string_t> alloc;
-                alloc.destroy(m_value.string);
-                alloc.deallocate(m_value.string, 1);
-                break;
-            }
-
-            default:
-            {
-                // all other types need no specific destructor
-                break;
-            }
-        }
+        m_value.destroy(m_type);
     }
 
     /// @}
@@ -2626,38 +14695,60 @@ class basic_json
 
     Serialization function for JSON values. The function tries to mimic
     Python's `json.dumps()` function, and currently supports its @a indent
-    parameter.
+    and @a ensure_ascii parameters.
 
     @param[in] indent If indent is nonnegative, then array elements and object
     members will be pretty-printed with that indent level. An indent level of
     `0` will only insert newlines. `-1` (the default) selects the most compact
     representation.
+    @param[in] indent_char The character to use for indentation if @a indent is
+    greater than `0`. The default is ` ` (space).
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] error_handler  how to react on decoding errors; there are three
+    possible values: `strict` (throws and exception in case a decoding error
+    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
+    and `ignore` (ignore invalid UTF-8 sequences during serialization).
 
     @return string containing the serialization of the JSON value
 
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
     @complexity Linear.
 
-    @liveexample{The following example shows the effect of different @a indent
-    parameters to the result of the serialization.,dump}
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @liveexample{The following example shows the effect of different @a indent\,
+    @a indent_char\, and @a ensure_ascii parameters to the result of the
+    serialization.,dump}
 
     @see https://docs.python.org/2/library/json.html#json.dump
 
-    @since version 1.0.0
+    @since version 1.0.0; indentation character @a indent_char, option
+           @a ensure_ascii and exceptions added in version 3.0.0; error
+           handlers added in version 3.4.0.
     */
-    string_t dump(const int indent = -1) const
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
     {
-        std::stringstream ss;
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
 
         if (indent >= 0)
         {
-            dump(ss, true, static_cast<unsigned int>(indent));
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
         }
         else
         {
-            dump(ss, false, 0);
+            s.dump(*this, false, ensure_ascii, 0);
         }
 
-        return ss.str();
+        return result;
     }
 
     /*!
@@ -2667,6 +14758,17 @@ class basic_json
     enumeration.
 
     @return the type of the JSON value
+            Value type                | return value
+            ------------------------- | -------------------------
+            null                      | value_t::null
+            boolean                   | value_t::boolean
+            string                    | value_t::string
+            number (integer)          | value_t::number_integer
+            number (unsigned integer) | value_t::number_unsigned
+            number (floating-point)   | value_t::number_float
+            object                    | value_t::object
+            array                     | value_t::array
+            discarded                 | value_t::discarded
 
     @complexity Constant.
 
@@ -2676,6 +14778,9 @@ class basic_json
     @liveexample{The following code exemplifies `type()` for all JSON
     types.,type}
 
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+    @sa @ref type_name() -- return the type as string
+
     @since version 1.0.0
     */
     constexpr value_t type() const noexcept
@@ -2686,8 +14791,8 @@ class basic_json
     /*!
     @brief return whether type is primitive
 
-    This function returns true iff the JSON type is primitive (string, number,
-    boolean, or null).
+    This function returns true if and only if the JSON type is primitive
+    (string, number, boolean, or null).
 
     @return `true` if type is primitive (string, number, boolean, or null),
     `false` otherwise.
@@ -2716,8 +14821,8 @@ class basic_json
     /*!
     @brief return whether type is structured
 
-    This function returns true iff the JSON type is structured (array or
-    object).
+    This function returns true if and only if the JSON type is structured
+    (array or object).
 
     @return `true` if type is structured (array or object), `false` otherwise.
 
@@ -2743,7 +14848,7 @@ class basic_json
     /*!
     @brief return whether value is null
 
-    This function returns true iff the JSON value is null.
+    This function returns true if and only if the JSON value is null.
 
     @return `true` if type is null, `false` otherwise.
 
@@ -2765,7 +14870,7 @@ class basic_json
     /*!
     @brief return whether value is a boolean
 
-    This function returns true iff the JSON value is a boolean.
+    This function returns true if and only if the JSON value is a boolean.
 
     @return `true` if type is boolean, `false` otherwise.
 
@@ -2787,8 +14892,8 @@ class basic_json
     /*!
     @brief return whether value is a number
 
-    This function returns true iff the JSON value is a number. This includes
-    both integer and floating-point values.
+    This function returns true if and only if the JSON value is a number. This
+    includes both integer (signed and unsigned) and floating-point values.
 
     @return `true` if type is number (regardless whether integer, unsigned
     integer or floating-type), `false` otherwise.
@@ -2817,8 +14922,8 @@ class basic_json
     /*!
     @brief return whether value is an integer number
 
-    This function returns true iff the JSON value is an integer or unsigned
-    integer number. This excludes floating-point values.
+    This function returns true if and only if the JSON value is a signed or
+    unsigned integer number. This excludes floating-point values.
 
     @return `true` if type is an integer or unsigned integer number, `false`
     otherwise.
@@ -2846,8 +14951,8 @@ class basic_json
     /*!
     @brief return whether value is an unsigned integer number
 
-    This function returns true iff the JSON value is an unsigned integer
-    number. This excludes floating-point and (signed) integer values.
+    This function returns true if and only if the JSON value is an unsigned
+    integer number. This excludes floating-point and signed integer values.
 
     @return `true` if type is an unsigned integer number, `false` otherwise.
 
@@ -2874,8 +14979,8 @@ class basic_json
     /*!
     @brief return whether value is a floating-point number
 
-    This function returns true iff the JSON value is a floating-point number.
-    This excludes integer and unsigned integer values.
+    This function returns true if and only if the JSON value is a
+    floating-point number. This excludes signed and unsigned integer values.
 
     @return `true` if type is a floating-point number, `false` otherwise.
 
@@ -2902,7 +15007,7 @@ class basic_json
     /*!
     @brief return whether value is an object
 
-    This function returns true iff the JSON value is an object.
+    This function returns true if and only if the JSON value is an object.
 
     @return `true` if type is object, `false` otherwise.
 
@@ -2924,7 +15029,7 @@ class basic_json
     /*!
     @brief return whether value is an array
 
-    This function returns true iff the JSON value is an array.
+    This function returns true if and only if the JSON value is an array.
 
     @return `true` if type is array, `false` otherwise.
 
@@ -2946,7 +15051,7 @@ class basic_json
     /*!
     @brief return whether value is a string
 
-    This function returns true iff the JSON value is a string.
+    This function returns true if and only if the JSON value is a string.
 
     @return `true` if type is string, `false` otherwise.
 
@@ -2968,8 +15073,8 @@ class basic_json
     /*!
     @brief return whether value is discarded
 
-    This function returns true iff the JSON value was discarded during parsing
-    with a callback function (see @ref parser_callback_t).
+    This function returns true if and only if the JSON value was discarded
+    during parsing with a callback function (see @ref parser_callback_t).
 
     @note This function will always be `false` for JSON values after parsing.
     That is, discarded values can only occur during parsing, but will be
@@ -3008,6 +15113,9 @@ class basic_json
     @liveexample{The following code exemplifies the @ref value_t operator for
     all JSON types.,operator__value_t}
 
+    @sa @ref type() -- return the type of the JSON value (explicit)
+    @sa @ref type_name() -- return the type as string
+
     @since version 1.0.0
     */
     constexpr operator value_t() const noexcept
@@ -3025,12 +15133,12 @@ class basic_json
     /// get a boolean (explicit)
     boolean_t get_impl(boolean_t* /*unused*/) const
     {
-        if (is_boolean())
+        if (JSON_LIKELY(is_boolean()))
         {
             return m_value.boolean;
         }
 
-        JSON_THROW(std::domain_error("type must be boolean, but is " + type_name()));
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
     }
 
     /// get a pointer to the value (object)
@@ -3120,30 +15228,26 @@ class basic_json
     /*!
     @brief helper function to implement get_ref()
 
-    This funcion helps to implement get_ref() without code duplication for
+    This function helps to implement get_ref() without code duplication for
     const and non-const overloads
 
     @tparam ThisType will be deduced as `basic_json` or `const basic_json`
 
-    @throw std::domain_error if ReferenceType does not match underlying value
+    @throw type_error.303 if ReferenceType does not match underlying value
     type of the current JSON
     */
     template<typename ReferenceType, typename ThisType>
     static ReferenceType get_ref_impl(ThisType& obj)
     {
-        // helper type
-        using PointerType = typename std::add_pointer<ReferenceType>::type;
-
         // delegate the call to get_ptr<>()
-        auto ptr = obj.template get_ptr<PointerType>();
+        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
 
-        if (ptr != nullptr)
+        if (JSON_LIKELY(ptr != nullptr))
         {
             return *ptr;
         }
 
-        JSON_THROW(std::domain_error("incompatible ReferenceType for get_ref, actual type is " +
-                                     obj.type_name()));
+        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
     }
 
   public:
@@ -3165,22 +15269,43 @@ class basic_json
 
     @since version 2.1.0
     */
-    template <
-        typename BasicJsonType,
-        detail::enable_if_t<std::is_same<typename std::remove_const<BasicJsonType>::type,
-                                         basic_json_t>::value,
-                            int> = 0 >
+    template<typename BasicJsonType, detail::enable_if_t<
+                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
+                 int> = 0>
     basic_json get() const
     {
         return *this;
     }
 
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @tparam BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template<typename BasicJsonType, detail::enable_if_t<
+                 not std::is_same<BasicJsonType, basic_json>::value and
+                 detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    BasicJsonType get() const
+    {
+        return *this;
+    }
+
     /*!
     @brief get a value (explicit)
 
     Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
-    and [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
     The value is converted by calling the @ref json_serializer<ValueType>
     `from_json()` method.
 
@@ -3194,9 +15319,9 @@ class basic_json
     This overloads is chosen if:
     - @a ValueType is not @ref basic_json,
     - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const @ref basic_json&, ValueType&)`, and
+      `void from_json(const basic_json&, ValueType&)`, and
     - @ref json_serializer<ValueType> does not have a `from_json()` method of
-      the form `ValueType from_json(const @ref basic_json&)`
+      the form `ValueType from_json(const basic_json&)`
 
     @tparam ValueTypeCV the provided value type
     @tparam ValueType the returned value type
@@ -3214,14 +15339,12 @@ class basic_json
 
     @since version 2.1.0
     */
-    template <
-        typename ValueTypeCV,
-        typename ValueType = detail::uncvref_t<ValueTypeCV>,
-        detail::enable_if_t <
-            not std::is_same<basic_json_t, ValueType>::value and
-            detail::has_from_json<basic_json_t, ValueType>::value and
-            not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-            int > = 0 >
+    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+             detail::enable_if_t <
+                 not detail::is_basic_json<ValueType>::value and
+                 detail::has_from_json<basic_json_t, ValueType>::value and
+                 not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                 int> = 0>
     ValueType get() const noexcept(noexcept(
                                        JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
     {
@@ -3242,8 +15365,8 @@ class basic_json
     @brief get a value (explicit); special case
 
     Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
-    and **not** [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
     The value is converted by calling the @ref json_serializer<ValueType>
     `from_json()` method.
 
@@ -3255,7 +15378,7 @@ class basic_json
     This overloads is chosen if:
     - @a ValueType is not @ref basic_json and
     - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `ValueType from_json(const @ref basic_json&)`
+      `ValueType from_json(const basic_json&)`
 
     @note If @ref json_serializer<ValueType> has both overloads of
     `from_json()`, this one is chosen.
@@ -3269,12 +15392,10 @@ class basic_json
 
     @since version 2.1.0
     */
-    template <
-        typename ValueTypeCV,
-        typename ValueType = detail::uncvref_t<ValueTypeCV>,
-        detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
-                            detail::has_non_default_from_json<basic_json_t,
-                                    ValueType>::value, int> = 0 >
+    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+             detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
+                                 detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                                 int> = 0>
     ValueType get() const noexcept(noexcept(
                                        JSONSerializer<ValueTypeCV>::from_json(std::declval<const basic_json_t&>())))
     {
@@ -3283,6 +15404,99 @@ class basic_json
         return JSONSerializer<ValueTypeCV>::from_json(*this);
     }
 
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value.
+    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType v;
+    JSONSerializer<ValueType>::from_json(*this, v);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+
+    @tparam ValueType the input parameter type.
+
+    @return the input parameter, allowing chaining calls.
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get_to}
+
+    @since version 3.3.0
+    */
+    template<typename ValueType,
+             detail::enable_if_t <
+                 not detail::is_basic_json<ValueType>::value and
+                 detail::has_from_json<basic_json_t, ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+
+    /*!
+    @brief get a pointer value (implicit)
+
+    Implicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning Writing data to the pointee of the result yields an undefined
+    state.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+    assertion.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get_ptr}
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (implicit)
+    @copydoc get_ptr()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value and
+                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
     /*!
     @brief get a pointer value (explicit)
 
@@ -3312,7 +15526,7 @@ class basic_json
     */
     template<typename PointerType, typename std::enable_if<
                  std::is_pointer<PointerType>::value, int>::type = 0>
-    PointerType get() noexcept
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
     {
         // delegate the call to get_ptr
         return get_ptr<PointerType>();
@@ -3324,89 +15538,12 @@ class basic_json
     */
     template<typename PointerType, typename std::enable_if<
                  std::is_pointer<PointerType>::value, int>::type = 0>
-    constexpr const PointerType get() const noexcept
+    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
     {
         // delegate the call to get_ptr
         return get_ptr<PointerType>();
     }
 
-    /*!
-    @brief get a pointer value (implicit)
-
-    Implicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    PointerType get_ptr() noexcept
-    {
-        // get the type of the PointerType (remove pointer and const)
-        using pointee_t = typename std::remove_const<typename
-                          std::remove_pointer<typename
-                          std::remove_const<PointerType>::type>::type>::type;
-        // make sure the type matches the allowed types
-        static_assert(
-            std::is_same<object_t, pointee_t>::value
-            or std::is_same<array_t, pointee_t>::value
-            or std::is_same<string_t, pointee_t>::value
-            or std::is_same<boolean_t, pointee_t>::value
-            or std::is_same<number_integer_t, pointee_t>::value
-            or std::is_same<number_unsigned_t, pointee_t>::value
-            or std::is_same<number_float_t, pointee_t>::value
-            , "incompatible pointer type");
-
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value and
-                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
-    constexpr const PointerType get_ptr() const noexcept
-    {
-        // get the type of the PointerType (remove pointer and const)
-        using pointee_t = typename std::remove_const<typename
-                          std::remove_pointer<typename
-                          std::remove_const<PointerType>::type>::type>::type;
-        // make sure the type matches the allowed types
-        static_assert(
-            std::is_same<object_t, pointee_t>::value
-            or std::is_same<array_t, pointee_t>::value
-            or std::is_same<string_t, pointee_t>::value
-            or std::is_same<boolean_t, pointee_t>::value
-            or std::is_same<number_integer_t, pointee_t>::value
-            or std::is_same<number_unsigned_t, pointee_t>::value
-            or std::is_same<number_float_t, pointee_t>::value
-            , "incompatible pointer type");
-
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<const PointerType>(nullptr));
-    }
-
     /*!
     @brief get a reference value (implicit)
 
@@ -3422,10 +15559,10 @@ class basic_json
 
     @return reference to the internally stored JSON value if the requested
     reference type @a ReferenceType fits to the JSON value; throws
-    std::domain_error otherwise
+    type_error.303 otherwise
 
-    @throw std::domain_error in case passed type @a ReferenceType is
-    incompatible with the stored JSON value
+    @throw type_error.303 in case passed type @a ReferenceType is incompatible
+    with the stored JSON value; see example below
 
     @complexity Constant.
 
@@ -3468,8 +15605,9 @@ class basic_json
 
     @return copy of the JSON value, converted to type @a ValueType
 
-    @throw std::domain_error in case passed type @a ValueType is incompatible
-    to JSON, thrown by @ref get() const
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
 
     @complexity Linear in the size of the JSON value.
 
@@ -3484,10 +15622,17 @@ class basic_json
     */
     template < typename ValueType, typename std::enable_if <
                    not std::is_pointer<ValueType>::value and
-                   not std::is_same<ValueType, typename string_t::value_type>::value
+                   not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
+                   not std::is_same<ValueType, typename string_t::value_type>::value and
+                   not detail::is_basic_json<ValueType>::value
+
 #ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
                    and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
+                   and not std::is_same<ValueType, typename std::string_view>::value
 #endif
+#endif
+                   and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
                    , int >::type = 0 >
     operator ValueType() const
     {
@@ -3516,22 +15661,26 @@ class basic_json
 
     @return reference to the element at index @a idx
 
-    @throw std::domain_error if the JSON value is not an array; example:
-    `"cannot use at() with string"`
-    @throw std::out_of_range if the index @a idx is out of range of the array;
-    that is, `idx >= size()`; example: `"array index 7 is out of range"`
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
 
     @complexity Constant.
 
-    @liveexample{The example below shows how array elements can be read and
-    written using `at()`.,at__size_type}
-
     @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__size_type}
     */
     reference at(size_type idx)
     {
         // at only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             JSON_TRY
             {
@@ -3540,12 +15689,12 @@ class basic_json
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
             }
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
         }
     }
 
@@ -3559,22 +15708,26 @@ class basic_json
 
     @return const reference to the element at index @a idx
 
-    @throw std::domain_error if the JSON value is not an array; example:
-    `"cannot use at() with string"`
-    @throw std::out_of_range if the index @a idx is out of range of the array;
-    that is, `idx >= size()`; example: `"array index 7 is out of range"`
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
 
     @complexity Constant.
 
-    @liveexample{The example below shows how array elements can be read using
-    `at()`.,at__size_type_const}
-
     @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__size_type_const}
     */
     const_reference at(size_type idx) const
     {
         // at only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             JSON_TRY
             {
@@ -3583,12 +15736,12 @@ class basic_json
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
             }
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
         }
     }
 
@@ -3602,26 +15755,30 @@ class basic_json
 
     @return reference to the element at key @a key
 
-    @throw std::domain_error if the JSON value is not an object; example:
-    `"cannot use at() with boolean"`
-    @throw std::out_of_range if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`; example: `"key "the fast" not found"`
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
 
     @complexity Logarithmic in the size of the container.
 
-    @liveexample{The example below shows how object elements can be read and
-    written using `at()`.,at__object_t_key_type}
-
     @sa @ref operator[](const typename object_t::key_type&) for unchecked
     access by reference
     @sa @ref value() for access by value with a default value
 
     @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__object_t_key_type}
     */
     reference at(const typename object_t::key_type& key)
     {
         // at only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             JSON_TRY
             {
@@ -3630,12 +15787,12 @@ class basic_json
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(std::out_of_range("key '" + key + "' not found"));
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
             }
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
         }
     }
 
@@ -3649,26 +15806,30 @@ class basic_json
 
     @return const reference to the element at key @a key
 
-    @throw std::domain_error if the JSON value is not an object; example:
-    `"cannot use at() with boolean"`
-    @throw std::out_of_range if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`; example: `"key "the fast" not found"`
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
 
     @complexity Logarithmic in the size of the container.
 
-    @liveexample{The example below shows how object elements can be read using
-    `at()`.,at__object_t_key_type_const}
-
     @sa @ref operator[](const typename object_t::key_type&) for unchecked
     access by reference
     @sa @ref value() for access by value with a default value
 
     @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__object_t_key_type_const}
     */
     const_reference at(const typename object_t::key_type& key) const
     {
         // at only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             JSON_TRY
             {
@@ -3677,12 +15838,12 @@ class basic_json
             JSON_CATCH (std::out_of_range&)
             {
                 // create better exception explanation
-                JSON_THROW(std::out_of_range("key '" + key + "' not found"));
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
             }
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use at() with " + type_name()));
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
         }
     }
 
@@ -3699,8 +15860,8 @@ class basic_json
 
     @return reference to the element at index @a idx
 
-    @throw std::domain_error if JSON is not an array or null; example:
-    `"cannot use operator[] with string"`
+    @throw type_error.305 if the JSON value is not an array or null; in that
+    cases, using the [] operator with an index makes no sense.
 
     @complexity Constant if @a idx is in the range of the array. Otherwise
     linear in `idx - size()`.
@@ -3722,7 +15883,7 @@ class basic_json
         }
 
         // operator[] only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             // fill up array with null values if given idx is outside range
             if (idx >= m_value.array->size())
@@ -3735,7 +15896,7 @@ class basic_json
             return m_value.array->operator[](idx);
         }
 
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
     }
 
     /*!
@@ -3747,8 +15908,8 @@ class basic_json
 
     @return const reference to the element at index @a idx
 
-    @throw std::domain_error if JSON is not an array; example: `"cannot use
-    operator[] with null"`
+    @throw type_error.305 if the JSON value is not an array; in that case,
+    using the [] operator with an index makes no sense.
 
     @complexity Constant.
 
@@ -3760,12 +15921,12 @@ class basic_json
     const_reference operator[](size_type idx) const
     {
         // const operator[] only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             return m_value.array->operator[](idx);
         }
 
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
     }
 
     /*!
@@ -3781,8 +15942,8 @@ class basic_json
 
     @return reference to the element at key @a key
 
-    @throw std::domain_error if JSON is not an object or null; example:
-    `"cannot use operator[] with string"`
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
 
@@ -3806,12 +15967,12 @@ class basic_json
         }
 
         // operator[] only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             return m_value.object->operator[](key);
         }
 
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
     }
 
     /*!
@@ -3830,8 +15991,8 @@ class basic_json
     @pre The element with key @a key must exist. **This precondition is
          enforced with an assertion.**
 
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    operator[] with null"`
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
 
@@ -3847,13 +16008,13 @@ class basic_json
     const_reference operator[](const typename object_t::key_type& key) const
     {
         // const operator[] only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             assert(m_value.object->find(key) != m_value.object->end());
             return m_value.object->find(key)->second;
         }
 
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
     }
 
     /*!
@@ -3869,76 +16030,8 @@ class basic_json
 
     @return reference to the element at key @a key
 
-    @throw std::domain_error if JSON is not an object or null; example:
-    `"cannot use operator[] with string"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    template<typename T, std::size_t n>
-    reference operator[](T * (&key)[n])
-    {
-        return operator[](static_cast<const T>(key));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @note This function is required for compatibility reasons with Clang.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    operator[] with null"`
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    template<typename T, std::size_t n>
-    const_reference operator[](T * (&key)[n]) const
-    {
-        return operator[](static_cast<const T>(key));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw std::domain_error if JSON is not an object or null; example:
-    `"cannot use operator[] with string"`
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
 
@@ -3963,12 +16056,12 @@ class basic_json
         }
 
         // at only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             return m_value.object->operator[](key);
         }
 
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
     }
 
     /*!
@@ -3987,8 +16080,8 @@ class basic_json
     @pre The element with key @a key must exist. **This precondition is
          enforced with an assertion.**
 
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    operator[] with null"`
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
 
@@ -4005,13 +16098,13 @@ class basic_json
     const_reference operator[](T* key) const
     {
         // at only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             assert(m_value.object->find(key) != m_value.object->end());
             return m_value.object->find(key)->second;
         }
 
-        JSON_THROW(std::domain_error("cannot use operator[] with " + type_name()));
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
     }
 
     /*!
@@ -4024,7 +16117,7 @@ class basic_json
     @code {.cpp}
     try {
         return at(key);
-    } catch(std::out_of_range) {
+    } catch(out_of_range) {
         return default_value;
     }
     @endcode
@@ -4047,8 +16140,8 @@ class basic_json
     @return copy of the element at key @a key or @a default_value if @a key
     is not found
 
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    value() with null"`
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
 
@@ -4064,10 +16157,10 @@ class basic_json
     */
     template<class ValueType, typename std::enable_if<
                  std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const typename object_t::key_type& key, ValueType default_value) const
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
     {
         // at only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             // if key is found, return value and given default value otherwise
             const auto it = find(key);
@@ -4078,15 +16171,13 @@ class basic_json
 
             return default_value;
         }
-        else
-        {
-            JSON_THROW(std::domain_error("cannot use value() with " + type_name()));
-        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
     }
 
     /*!
     @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const typename object_t::key_type&, ValueType) const
+    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
     */
     string_t value(const typename object_t::key_type& key, const char* default_value) const
     {
@@ -4103,7 +16194,7 @@ class basic_json
     @code {.cpp}
     try {
         return at(ptr);
-    } catch(std::out_of_range) {
+    } catch(out_of_range) {
         return default_value;
     }
     @endcode
@@ -4122,8 +16213,8 @@ class basic_json
     @return copy of the element at key @a key or @a default_value if @a key
     is not found
 
-    @throw std::domain_error if JSON is not an object; example: `"cannot use
-    value() with null"`
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
 
     @complexity Logarithmic in the size of the container.
 
@@ -4136,23 +16227,23 @@ class basic_json
     */
     template<class ValueType, typename std::enable_if<
                  std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const json_pointer& ptr, ValueType default_value) const
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
     {
         // at only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             // if pointer resolves a value, return it or use default value
             JSON_TRY
             {
                 return ptr.get_checked(this);
             }
-            JSON_CATCH (std::out_of_range&)
+            JSON_INTERNAL_CATCH (out_of_range&)
             {
                 return default_value;
             }
         }
 
-        JSON_THROW(std::domain_error("cannot use value() with " + type_name()));
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
     }
 
     /*!
@@ -4181,7 +16272,7 @@ class basic_json
     assertions**).
     @post The JSON value remains unchanged.
 
-    @throw std::out_of_range when called on `null` value
+    @throw invalid_iterator.214 when called on `null` value
 
     @liveexample{The following code shows an example for `front()`.,front}
 
@@ -4224,7 +16315,8 @@ class basic_json
     assertions**).
     @post The JSON value remains unchanged.
 
-    @throw std::out_of_range when called on `null` value.
+    @throw invalid_iterator.214 when called on a `null` value. See example
+    below.
 
     @liveexample{The following code shows an example for `back()`.,back}
 
@@ -4268,11 +16360,12 @@ class basic_json
     @post Invalidates iterators and references at or after the point of the
     erase, including the `end()` iterator.
 
-    @throw std::domain_error if called on a `null` value; example: `"cannot
-    use erase() with null"`
-    @throw std::domain_error if called on an iterator which does not belong to
-    the current JSON value; example: `"iterator does not fit current value"`
-    @throw std::out_of_range if called on a primitive type with invalid
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.202 if called on an iterator which does not belong
+    to the current JSON value; example: `"iterator does not fit current
+    value"`
+    @throw invalid_iterator.205 if called on a primitive type with invalid
     iterator (i.e., any iterator which is not `begin()`); example: `"iterator
     out of range"`
 
@@ -4301,9 +16394,9 @@ class basic_json
     IteratorType erase(IteratorType pos)
     {
         // make sure iterator fits the current value
-        if (this != pos.m_object)
+        if (JSON_UNLIKELY(this != pos.m_object))
         {
-            JSON_THROW(std::domain_error("iterator does not fit current value"));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
         }
 
         IteratorType result = end();
@@ -4316,16 +16409,16 @@ class basic_json
             case value_t::number_unsigned:
             case value_t::string:
             {
-                if (not pos.m_it.primitive_iterator.is_begin())
+                if (JSON_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
                 {
-                    JSON_THROW(std::out_of_range("iterator out of range"));
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
                 }
 
                 if (is_string())
                 {
                     AllocatorType<string_t> alloc;
-                    alloc.destroy(m_value.string);
-                    alloc.deallocate(m_value.string, 1);
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
                     m_value.string = nullptr;
                 }
 
@@ -4347,9 +16440,7 @@ class basic_json
             }
 
             default:
-            {
-                JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
-            }
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
         }
 
         return result;
@@ -4375,11 +16466,11 @@ class basic_json
     @post Invalidates iterators and references at or after the point of the
     erase, including the `end()` iterator.
 
-    @throw std::domain_error if called on a `null` value; example: `"cannot
-    use erase() with null"`
-    @throw std::domain_error if called on iterators which does not belong to
-    the current JSON value; example: `"iterators do not fit current value"`
-    @throw std::out_of_range if called on a primitive type with invalid
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.203 if called on iterators which does not belong
+    to the current JSON value; example: `"iterators do not fit current value"`
+    @throw invalid_iterator.204 if called on a primitive type with invalid
     iterators (i.e., if `first != begin()` and `last != end()`); example:
     `"iterators out of range"`
 
@@ -4408,9 +16499,9 @@ class basic_json
     IteratorType erase(IteratorType first, IteratorType last)
     {
         // make sure iterator fits the current value
-        if (this != first.m_object or this != last.m_object)
+        if (JSON_UNLIKELY(this != first.m_object or this != last.m_object))
         {
-            JSON_THROW(std::domain_error("iterators do not fit current value"));
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
         }
 
         IteratorType result = end();
@@ -4423,16 +16514,17 @@ class basic_json
             case value_t::number_unsigned:
             case value_t::string:
             {
-                if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
+                if (JSON_LIKELY(not first.m_it.primitive_iterator.is_begin()
+                                or not last.m_it.primitive_iterator.is_end()))
                 {
-                    JSON_THROW(std::out_of_range("iterators out of range"));
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
                 }
 
                 if (is_string())
                 {
                     AllocatorType<string_t> alloc;
-                    alloc.destroy(m_value.string);
-                    alloc.deallocate(m_value.string, 1);
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
                     m_value.string = nullptr;
                 }
 
@@ -4456,9 +16548,7 @@ class basic_json
             }
 
             default:
-            {
-                JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
-            }
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
         }
 
         return result;
@@ -4478,7 +16568,7 @@ class basic_json
     @post References and iterators to the erased elements are invalidated.
     Other references and iterators are not affected.
 
-    @throw std::domain_error when called on a type other than JSON object;
+    @throw type_error.307 when called on a type other than JSON object;
     example: `"cannot use erase() with null"`
 
     @complexity `log(size()) + count(key)`
@@ -4496,12 +16586,12 @@ class basic_json
     size_type erase(const typename object_t::key_type& key)
     {
         // this erase only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             return m_value.object->erase(key);
         }
 
-        JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
+        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
     }
 
     /*!
@@ -4511,9 +16601,9 @@ class basic_json
 
     @param[in] idx index of the element to remove
 
-    @throw std::domain_error when called on a type other than JSON array;
+    @throw type_error.307 when called on a type other than JSON object;
     example: `"cannot use erase() with null"`
-    @throw std::out_of_range when `idx >= size()`; example: `"array index 17
+    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
     is out of range"`
 
     @complexity Linear in distance between @a idx and the end of the container.
@@ -4531,18 +16621,18 @@ class basic_json
     void erase(const size_type idx)
     {
         // this erase only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
-            if (idx >= size())
+            if (JSON_UNLIKELY(idx >= size()))
             {
-                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
             }
 
             m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use erase() with " + type_name()));
+            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
         }
     }
 
@@ -4566,7 +16656,7 @@ class basic_json
     @note This method always returns @ref end() when executed on a JSON type
           that is not an object.
 
-    @param[in] key key value of the element to search for
+    @param[in] key key value of the element to search for.
 
     @return Iterator to an element with key equivalent to @a key. If no such
     element is found or the JSON value is not an object, past-the-end (see
@@ -4576,15 +16666,18 @@ class basic_json
 
     @liveexample{The example shows how `find()` is used.,find__key_type}
 
+    @sa @ref contains(KeyT&&) const -- checks whether a key exists
+
     @since version 1.0.0
     */
-    iterator find(typename object_t::key_type key)
+    template<typename KeyT>
+    iterator find(KeyT&& key)
     {
         auto result = end();
 
         if (is_object())
         {
-            result.m_it.object_iterator = m_value.object->find(key);
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
         }
 
         return result;
@@ -4592,15 +16685,16 @@ class basic_json
 
     /*!
     @brief find an element in a JSON object
-    @copydoc find(typename object_t::key_type)
+    @copydoc find(KeyT&&)
     */
-    const_iterator find(typename object_t::key_type key) const
+    template<typename KeyT>
+    const_iterator find(KeyT&& key) const
     {
         auto result = cend();
 
         if (is_object())
         {
-            result.m_it.object_iterator = m_value.object->find(key);
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
         }
 
         return result;
@@ -4627,10 +16721,41 @@ class basic_json
 
     @since version 1.0.0
     */
-    size_type count(typename object_t::key_type key) const
+    template<typename KeyT>
+    size_type count(KeyT&& key) const
     {
         // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(key) : 0;
+        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object
+
+    Check whether an element exists in a JSON object with key equivalent to
+    @a key. If the element is not found or the JSON value is not an object,
+    false is returned.
+
+    @note This method always returns false when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value to check its existence.
+
+    @return true if an element with specified @a key exists. If no such
+    element with such key is found or the JSON value is not an object,
+    false is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains}
+
+    @sa @ref find(KeyT&&) -- returns an iterator to an object element
+
+    @since version 3.6.0
+    */
+    template<typename KeyT>
+    bool contains(KeyT&& key) const
+    {
+        return is_object() and m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
     }
 
     /// @}
@@ -4655,7 +16780,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
 
@@ -4694,7 +16819,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
@@ -4726,7 +16851,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
 
@@ -4765,7 +16890,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
@@ -4795,7 +16920,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `reverse_iterator(end())`.
@@ -4832,7 +16957,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `reverse_iterator(begin())`.
@@ -4869,7 +16994,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
@@ -4898,7 +17023,7 @@ class basic_json
     @complexity Constant.
 
     @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
     requirements:
     - The complexity is constant.
     - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
@@ -4916,10 +17041,6 @@ class basic_json
         return const_reverse_iterator(cbegin());
     }
 
-  private:
-    // forward declaration
-    template<typename IteratorType> class iteration_proxy;
-
   public:
     /*!
     @brief wrapper to access iterator member functions in range-based for
@@ -4929,20 +17050,144 @@ class basic_json
     reference to the JSON values is returned, so there is no access to the
     underlying iterator.
 
+    For loop without iterator_wrapper:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without iterator proxy:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with iterator proxy:
+
+    @code{cpp}
+    for (auto it : json::iterator_wrapper(j_object))
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example).
+
+    @param[in] ref  reference to a JSON value
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
     @note The name of this function is not yet final and may change in the
     future.
+
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use @ref items() instead;
+                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
     */
-    static iteration_proxy<iterator> iterator_wrapper(reference cont)
+    JSON_DEPRECATED
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
     {
-        return iteration_proxy<iterator>(cont);
+        return ref.items();
     }
 
     /*!
     @copydoc iterator_wrapper(reference)
     */
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference cont)
+    JSON_DEPRECATED
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
     {
-        return iteration_proxy<const_iterator>(cont);
+        return ref.items();
+    }
+
+    /*!
+    @brief helper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without `items()` function:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without `items()` function:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with `items()` function:
+
+    @code{cpp}
+    for (auto& el : j_object.items())
+    {
+        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
+    }
+    @endcode
+
+    The `items()` function also allows to use
+    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
+    (C++17):
+
+    @code{cpp}
+    for (auto& [key, val] : j_object.items())
+    {
+        std::cout << "key: " << key << ", value:" << val << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example). For primitive types (e.g., numbers),
+          `key()` returns an empty string.
+
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the function is used.,items}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 3.1.0, structured bindings support since 3.5.0.
+    */
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /*!
+    @copydoc items()
+    */
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
     }
 
     /// @}
@@ -4956,9 +17201,9 @@ class basic_json
     /// @{
 
     /*!
-    @brief checks whether the container is empty
+    @brief checks whether the container is empty.
 
-    Checks if a JSON value has no elements.
+    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
 
     @return The return value depends on the different types and is
             defined as follows:
@@ -4971,23 +17216,27 @@ class basic_json
             object      | result of function `object_t::empty()`
             array       | result of function `array_t::empty()`
 
-    @note This function does not return whether a string stored as JSON value
-    is empty - it returns whether the JSON container itself is empty which is
-    false in the case of a string.
+    @liveexample{The following code uses `empty()` to check if a JSON
+    object contains any elements.,empty}
 
     @complexity Constant, as long as @ref array_t and @ref object_t satisfy
     the Container concept; that is, their `empty()` functions have constant
     complexity.
 
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return whether a string stored as JSON value
+    is empty - it returns whether the JSON container itself is empty which is
+    false in the case of a string.
+
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `begin() == end()`.
 
-    @liveexample{The following code uses `empty()` to check if a JSON
-    object contains any elements.,empty}
-
     @sa @ref size() -- returns the number of elements
 
     @since version 1.0.0
@@ -5038,23 +17287,27 @@ class basic_json
             object      | result of function object_t::size()
             array       | result of function array_t::size()
 
-    @note This function does not return the length of a string stored as JSON
-    value - it returns the number of elements in the JSON value which is 1 in
-    the case of a string.
+    @liveexample{The following code calls `size()` on the different value
+    types.,size}
 
     @complexity Constant, as long as @ref array_t and @ref object_t satisfy
     the Container concept; that is, their size() functions have constant
     complexity.
 
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return the length of a string stored as JSON
+    value - it returns the number of elements in the JSON value which is 1 in
+    the case of a string.
+
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of `std::distance(begin(), end())`.
 
-    @liveexample{The following code calls `size()` on the different value
-    types.,size}
-
     @sa @ref empty() -- checks whether the container is empty
     @sa @ref max_size() -- returns the maximal number of elements
 
@@ -5108,20 +17361,24 @@ class basic_json
             object      | result of function `object_t::max_size()`
             array       | result of function `array_t::max_size()`
 
+    @liveexample{The following code calls `max_size()` on the different value
+    types. Note the output is implementation specific.,max_size}
+
     @complexity Constant, as long as @ref array_t and @ref object_t satisfy
     the Container concept; that is, their `max_size()` functions have constant
     complexity.
 
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @requirement This function helps `basic_json` satisfying the
-    [Container](http://en.cppreference.com/w/cpp/concept/Container)
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
     requirements:
     - The complexity is constant.
     - Has the semantics of returning `b.size()` where `b` is the largest
       possible JSON value.
 
-    @liveexample{The following code calls `max_size()` on the different value
-    types. Note the output is implementation specific.,max_size}
-
     @sa @ref size() -- returns the number of elements
 
     @since version 1.0.0
@@ -5164,7 +17421,8 @@ class basic_json
     @brief clears the contents
 
     Clears the content of a JSON value and resets it to the default value as
-    if @ref basic_json(value_t) would have been called:
+    if @ref basic_json(value_t) would have been called with the current value
+    type from @ref type():
 
     Value type  | initial value
     ----------- | -------------
@@ -5175,11 +17433,24 @@ class basic_json
     object      | `{}`
     array       | `[]`
 
-    @complexity Linear in the size of the JSON value.
+    @post Has the same effect as calling
+    @code {.cpp}
+    *this = basic_json(type());
+    @endcode
 
     @liveexample{The example below shows the effect of `clear()` to different
     JSON types.,clear}
 
+    @complexity Linear in the size of the JSON value.
+
+    @iterators All iterators, pointers and references related to this container
+               are invalidated.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @sa @ref basic_json(value_t) -- constructor that creates an object with the
+        same value than calling `clear()`
+
     @since version 1.0.0
     */
     void clear() noexcept
@@ -5229,9 +17500,7 @@ class basic_json
             }
 
             default:
-            {
                 break;
-            }
         }
     }
 
@@ -5244,7 +17513,7 @@ class basic_json
 
     @param[in] val the value to add to the JSON array
 
-    @throw std::domain_error when called on a type other than JSON array or
+    @throw type_error.308 when called on a type other than JSON array or
     null; example: `"cannot use push_back() with number"`
 
     @complexity Amortized constant.
@@ -5258,9 +17527,9 @@ class basic_json
     void push_back(basic_json&& val)
     {
         // push_back only works for null objects or arrays
-        if (not(is_null() or is_array()))
+        if (JSON_UNLIKELY(not(is_null() or is_array())))
         {
-            JSON_THROW(std::domain_error("cannot use push_back() with " + type_name()));
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
         }
 
         // transform null object into an array
@@ -5273,7 +17542,8 @@ class basic_json
 
         // add element to array (move semantics)
         m_value.array->push_back(std::move(val));
-        // invalidate object
+        // invalidate object: mark it null so we do not call the destructor
+        // cppcheck-suppress accessMoved
         val.m_type = value_t::null;
     }
 
@@ -5294,9 +17564,9 @@ class basic_json
     void push_back(const basic_json& val)
     {
         // push_back only works for null objects or arrays
-        if (not(is_null() or is_array()))
+        if (JSON_UNLIKELY(not(is_null() or is_array())))
         {
-            JSON_THROW(std::domain_error("cannot use push_back() with " + type_name()));
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
         }
 
         // transform null object into an array
@@ -5330,7 +17600,7 @@ class basic_json
 
     @param[in] val the value to add to the JSON object
 
-    @throw std::domain_error when called on a type other than JSON object or
+    @throw type_error.308 when called on a type other than JSON object or
     null; example: `"cannot use push_back() with number"`
 
     @complexity Logarithmic in the size of the container, O(log(`size()`)).
@@ -5344,9 +17614,9 @@ class basic_json
     void push_back(const typename object_t::value_type& val)
     {
         // push_back only works for null objects or objects
-        if (not(is_null() or is_object()))
+        if (JSON_UNLIKELY(not(is_null() or is_object())))
         {
-            JSON_THROW(std::domain_error("cannot use push_back() with " + type_name()));
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
         }
 
         // transform null object into an object
@@ -5384,7 +17654,7 @@ class basic_json
     @ref push_back(const typename object_t::value_type&). Otherwise, @a init
     is converted to a JSON value and added using @ref push_back(basic_json&&).
 
-    @param init  an initializer list
+    @param[in] init  an initializer list
 
     @complexity Linear in the size of the initializer list @a init.
 
@@ -5396,12 +17666,13 @@ class basic_json
     @liveexample{The example shows how initializer lists are treated as
     objects when possible.,push_back__initializer_list}
     */
-    void push_back(std::initializer_list<basic_json> init)
+    void push_back(initializer_list_t init)
     {
-        if (is_object() and init.size() == 2 and init.begin()->is_string())
+        if (is_object() and init.size() == 2 and (*init.begin())->is_string())
         {
-            const string_t key = *init.begin();
-            push_back(typename object_t::value_type(key, *(init.begin() + 1)));
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
         }
         else
         {
@@ -5411,9 +17682,9 @@ class basic_json
 
     /*!
     @brief add an object to an object
-    @copydoc push_back(std::initializer_list<basic_json>)
+    @copydoc push_back(initializer_list_t)
     */
-    reference operator+=(std::initializer_list<basic_json> init)
+    reference operator+=(initializer_list_t init)
     {
         push_back(init);
         return *this;
@@ -5429,7 +17700,7 @@ class basic_json
     @param[in] args arguments to forward to a constructor of @ref basic_json
     @tparam Args compatible types to create a @ref basic_json object
 
-    @throw std::domain_error when called on a type other than JSON array or
+    @throw type_error.311 when called on a type other than JSON array or
     null; example: `"cannot use emplace_back() with number"`
 
     @complexity Amortized constant.
@@ -5444,9 +17715,9 @@ class basic_json
     void emplace_back(Args&& ... args)
     {
         // emplace_back only works for null objects or arrays
-        if (not(is_null() or is_array()))
+        if (JSON_UNLIKELY(not(is_null() or is_array())))
         {
-            JSON_THROW(std::domain_error("cannot use emplace_back() with " + type_name()));
+            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
         }
 
         // transform null object into an array
@@ -5476,7 +17747,7 @@ class basic_json
             already-existing element if no insertion happened, and a bool
             denoting whether the insertion took place.
 
-    @throw std::domain_error when called on a type other than JSON object or
+    @throw type_error.311 when called on a type other than JSON object or
     null; example: `"cannot use emplace() with number"`
 
     @complexity Logarithmic in the size of the container, O(log(`size()`)).
@@ -5492,9 +17763,9 @@ class basic_json
     std::pair<iterator, bool> emplace(Args&& ... args)
     {
         // emplace only works for null objects or arrays
-        if (not(is_null() or is_object()))
+        if (JSON_UNLIKELY(not(is_null() or is_object())))
         {
-            JSON_THROW(std::domain_error("cannot use emplace() with " + type_name()));
+            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
         }
 
         // transform null object into an object
@@ -5515,6 +17786,26 @@ class basic_json
         return {it, res.second};
     }
 
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        assert(m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
+        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        return result;
+    }
+
     /*!
     @brief inserts element
 
@@ -5525,10 +17816,10 @@ class basic_json
     @param[in] val element to insert
     @return iterator pointing to the inserted @a val.
 
-    @throw std::domain_error if called on JSON values other than arrays;
+    @throw type_error.309 if called on JSON values other than arrays;
     example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
 
     @complexity Constant plus linear in the distance between @a pos and end of
     the container.
@@ -5540,21 +17831,19 @@ class basic_json
     iterator insert(const_iterator pos, const basic_json& val)
     {
         // insert only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             // check if iterator pos fits to this JSON value
-            if (pos.m_object != this)
+            if (JSON_UNLIKELY(pos.m_object != this))
             {
-                JSON_THROW(std::domain_error("iterator does not fit current value"));
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
             }
 
             // insert to array and return iterator
-            iterator result(this);
-            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
-            return result;
+            return insert_iterator(pos, val);
         }
 
-        JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
     }
 
     /*!
@@ -5578,10 +17867,10 @@ class basic_json
     @return iterator pointing to the first element inserted, or @a pos if
     `cnt==0`
 
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
 
     @complexity Linear in @a cnt plus linear in the distance between @a pos
     and end of the container.
@@ -5593,21 +17882,19 @@ class basic_json
     iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
     {
         // insert only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             // check if iterator pos fits to this JSON value
-            if (pos.m_object != this)
+            if (JSON_UNLIKELY(pos.m_object != this))
             {
-                JSON_THROW(std::domain_error("iterator does not fit current value"));
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
             }
 
             // insert to array and return iterator
-            iterator result(this);
-            result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-            return result;
+            return insert_iterator(pos, cnt, val);
         }
 
-        JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
     }
 
     /*!
@@ -5620,13 +17907,13 @@ class basic_json
     @param[in] first begin of the range of elements to insert
     @param[in] last end of the range of elements to insert
 
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
-    @throw std::domain_error if @a first and @a last do not belong to the same
-    JSON value; example: `"iterators do not fit"`
-    @throw std::domain_error if @a first or @a last are iterators into
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+    @throw invalid_iterator.211 if @a first or @a last are iterators into
     container for which insert is called; example: `"passed iterators may not
     belong to container"`
 
@@ -5643,35 +17930,30 @@ class basic_json
     iterator insert(const_iterator pos, const_iterator first, const_iterator last)
     {
         // insert only works for arrays
-        if (not is_array())
+        if (JSON_UNLIKELY(not is_array()))
         {
-            JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
         }
 
         // check if iterator pos fits to this JSON value
-        if (pos.m_object != this)
+        if (JSON_UNLIKELY(pos.m_object != this))
         {
-            JSON_THROW(std::domain_error("iterator does not fit current value"));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
         }
 
         // check if range iterators belong to the same JSON object
-        if (first.m_object != last.m_object)
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
         {
-            JSON_THROW(std::domain_error("iterators do not fit"));
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
         }
 
-        if (first.m_object == this or last.m_object == this)
+        if (JSON_UNLIKELY(first.m_object == this))
         {
-            JSON_THROW(std::domain_error("passed iterators may not belong to container"));
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
         }
 
         // insert to array and return iterator
-        iterator result(this);
-        result.m_it.array_iterator = m_value.array->insert(
-                                         pos.m_it.array_iterator,
-                                         first.m_it.array_iterator,
-                                         last.m_it.array_iterator);
-        return result;
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
     }
 
     /*!
@@ -5683,10 +17965,10 @@ class basic_json
     the end() iterator
     @param[in] ilist initializer list to insert the values from
 
-    @throw std::domain_error if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw std::domain_error if @a pos is not an iterator of *this; example:
-    `"iterator does not fit current value"`
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
 
     @return iterator pointing to the first element inserted, or @a pos if
     `ilist` is empty
@@ -5698,24 +17980,172 @@ class basic_json
 
     @since version 1.0.0
     */
-    iterator insert(const_iterator pos, std::initializer_list<basic_json> ilist)
+    iterator insert(const_iterator pos, initializer_list_t ilist)
     {
         // insert only works for arrays
-        if (not is_array())
+        if (JSON_UNLIKELY(not is_array()))
         {
-            JSON_THROW(std::domain_error("cannot use insert() with " + type_name()));
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
         }
 
         // check if iterator pos fits to this JSON value
-        if (pos.m_object != this)
+        if (JSON_UNLIKELY(pos.m_object != this))
         {
-            JSON_THROW(std::domain_error("iterator does not fit current value"));
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
         }
 
         // insert to array and return iterator
-        iterator result(this);
-        result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist);
-        return result;
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)`.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than objects; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
+    of elements to insert.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range_object}
+
+    @since version 3.0.0
+    */
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_UNLIKELY(not first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from JSON object @a j and overwrites existing keys.
+
+    @param[in] j  JSON object to read values from
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_reference j)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+        if (JSON_UNLIKELY(not j.is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
+        }
+
+        for (auto it = j.cbegin(); it != j.cend(); ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from from range `[first, last)` and overwrites existing
+    keys.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used__range.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_iterator first, const_iterator last)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_UNLIKELY(not first.m_object->is_object()
+                          or not last.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
     }
 
     /*!
@@ -5757,8 +18187,8 @@ class basic_json
 
     @param[in,out] other array to exchange the contents with
 
-    @throw std::domain_error when JSON value is not an array; example:
-    `"cannot use swap() with string"`
+    @throw type_error.310 when JSON value is not an array; example: `"cannot
+    use swap() with string"`
 
     @complexity Constant.
 
@@ -5770,13 +18200,13 @@ class basic_json
     void swap(array_t& other)
     {
         // swap only works for arrays
-        if (is_array())
+        if (JSON_LIKELY(is_array()))
         {
             std::swap(*(m_value.array), other);
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use swap() with " + type_name()));
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
         }
     }
 
@@ -5790,7 +18220,7 @@ class basic_json
 
     @param[in,out] other object to exchange the contents with
 
-    @throw std::domain_error when JSON value is not an object; example:
+    @throw type_error.310 when JSON value is not an object; example:
     `"cannot use swap() with string"`
 
     @complexity Constant.
@@ -5803,13 +18233,13 @@ class basic_json
     void swap(object_t& other)
     {
         // swap only works for objects
-        if (is_object())
+        if (JSON_LIKELY(is_object()))
         {
             std::swap(*(m_value.object), other);
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use swap() with " + type_name()));
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
         }
     }
 
@@ -5823,7 +18253,7 @@ class basic_json
 
     @param[in,out] other string to exchange the contents with
 
-    @throw std::domain_error when JSON value is not a string; example: `"cannot
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
     use swap() with boolean"`
 
     @complexity Constant.
@@ -5836,13 +18266,13 @@ class basic_json
     void swap(string_t& other)
     {
         // swap only works for strings
-        if (is_string())
+        if (JSON_LIKELY(is_string()))
         {
             std::swap(*(m_value.string), other);
         }
         else
         {
-            JSON_THROW(std::domain_error("cannot use swap() with " + type_name()));
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
         }
     }
 
@@ -5861,17 +18291,33 @@ class basic_json
 
     Compares two JSON values for equality according to the following rules:
     - Two JSON values are equal if (1) they are from the same type and (2)
-      their stored values are the same.
+      their stored values are the same according to their respective
+      `operator==`.
     - Integer and floating-point numbers are automatically converted before
-      comparison. Floating-point numbers are compared indirectly: two
-      floating-point numbers `f1` and `f2` are considered equal if neither
-      `f1 > f2` nor `f2 > f1` holds.
+      comparison. Note than two NaN values are always treated as unequal.
     - Two JSON null values are equal.
 
+    @note Floating-point inside JSON values numbers are compared with
+    `json::number_float_t::operator==` which is `double::operator==` by
+    default. To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    @code {.cpp}
+    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    @endcode
+
+    @note NaN values never compare equal to themselves or to other NaN values.
+
     @param[in] lhs  first JSON value to consider
     @param[in] rhs  second JSON value to consider
     @return whether the values @a lhs and @a rhs are equal
 
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @complexity Linear.
 
     @liveexample{The example demonstrates comparing several JSON
@@ -5889,41 +18335,31 @@ class basic_json
             switch (lhs_type)
             {
                 case value_t::array:
-                {
                     return *lhs.m_value.array == *rhs.m_value.array;
-                }
+
                 case value_t::object:
-                {
                     return *lhs.m_value.object == *rhs.m_value.object;
-                }
+
                 case value_t::null:
-                {
                     return true;
-                }
+
                 case value_t::string:
-                {
                     return *lhs.m_value.string == *rhs.m_value.string;
-                }
+
                 case value_t::boolean:
-                {
                     return lhs.m_value.boolean == rhs.m_value.boolean;
-                }
+
                 case value_t::number_integer:
-                {
                     return lhs.m_value.number_integer == rhs.m_value.number_integer;
-                }
+
                 case value_t::number_unsigned:
-                {
                     return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
-                }
+
                 case value_t::number_float:
-                {
                     return lhs.m_value.number_float == rhs.m_value.number_float;
-                }
+
                 default:
-                {
                     return false;
-                }
             }
         }
         else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
@@ -5962,7 +18398,7 @@ class basic_json
                  std::is_scalar<ScalarType>::value, int>::type = 0>
     friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
     {
-        return (lhs == basic_json(rhs));
+        return lhs == basic_json(rhs);
     }
 
     /*!
@@ -5973,7 +18409,7 @@ class basic_json
                  std::is_scalar<ScalarType>::value, int>::type = 0>
     friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
     {
-        return (basic_json(lhs) == rhs);
+        return basic_json(lhs) == rhs;
     }
 
     /*!
@@ -5987,6 +18423,8 @@ class basic_json
 
     @complexity Linear.
 
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @liveexample{The example demonstrates comparing several JSON
     types.,operator__notequal}
 
@@ -6005,7 +18443,7 @@ class basic_json
                  std::is_scalar<ScalarType>::value, int>::type = 0>
     friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
     {
-        return (lhs != basic_json(rhs));
+        return lhs != basic_json(rhs);
     }
 
     /*!
@@ -6016,7 +18454,7 @@ class basic_json
                  std::is_scalar<ScalarType>::value, int>::type = 0>
     friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
     {
-        return (basic_json(lhs) != rhs);
+        return basic_json(lhs) != rhs;
     }
 
     /*!
@@ -6038,6 +18476,8 @@ class basic_json
 
     @complexity Linear.
 
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @liveexample{The example demonstrates comparing several JSON
     types.,operator__less}
 
@@ -6053,41 +18493,33 @@ class basic_json
             switch (lhs_type)
             {
                 case value_t::array:
-                {
-                    return *lhs.m_value.array < *rhs.m_value.array;
-                }
+                    // note parentheses are necessary, see
+                    // https://github.com/nlohmann/json/issues/1530
+                    return (*lhs.m_value.array) < (*rhs.m_value.array);
+
                 case value_t::object:
-                {
                     return *lhs.m_value.object < *rhs.m_value.object;
-                }
+
                 case value_t::null:
-                {
                     return false;
-                }
+
                 case value_t::string:
-                {
                     return *lhs.m_value.string < *rhs.m_value.string;
-                }
+
                 case value_t::boolean:
-                {
                     return lhs.m_value.boolean < rhs.m_value.boolean;
-                }
+
                 case value_t::number_integer:
-                {
                     return lhs.m_value.number_integer < rhs.m_value.number_integer;
-                }
+
                 case value_t::number_unsigned:
-                {
                     return lhs.m_value.number_unsigned < rhs.m_value.number_unsigned;
-                }
+
                 case value_t::number_float:
-                {
                     return lhs.m_value.number_float < rhs.m_value.number_float;
-                }
+
                 default:
-                {
                     return false;
-                }
             }
         }
         else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
@@ -6121,6 +18553,28 @@ class basic_json
         return operator<(lhs_type, rhs_type);
     }
 
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
     /*!
     @brief comparison: less than or equal
 
@@ -6133,6 +18587,8 @@ class basic_json
 
     @complexity Linear.
 
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @liveexample{The example demonstrates comparing several JSON
     types.,operator__greater}
 
@@ -6143,6 +18599,28 @@ class basic_json
         return not (rhs < lhs);
     }
 
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
     /*!
     @brief comparison: greater than
 
@@ -6155,6 +18633,8 @@ class basic_json
 
     @complexity Linear.
 
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @liveexample{The example demonstrates comparing several JSON
     types.,operator__lessequal}
 
@@ -6165,6 +18645,28 @@ class basic_json
         return not (lhs <= rhs);
     }
 
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
     /*!
     @brief comparison: greater than or equal
 
@@ -6177,6 +18679,8 @@ class basic_json
 
     @complexity Linear.
 
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
     @liveexample{The example demonstrates comparing several JSON
     types.,operator__greaterequal}
 
@@ -6187,8 +18691,29 @@ class basic_json
         return not (lhs < rhs);
     }
 
-    /// @}
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
 
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+
+    /// @}
 
     ///////////////////
     // serialization //
@@ -6201,43 +18726,57 @@ class basic_json
     @brief serialize to stream
 
     Serialize the given JSON value @a j to the output stream @a o. The JSON
-    value will be serialized using the @ref dump member function. The
-    indentation of the output can be controlled with the member variable
-    `width` of the output stream @a o. For instance, using the manipulator
-    `std::setw(4)` on @a o sets the indentation level to `4` and the
-    serialization result is the same as calling `dump(4)`.
+    value will be serialized using the @ref dump member function.
+
+    - The indentation of the output can be controlled with the member variable
+      `width` of the output stream @a o. For instance, using the manipulator
+      `std::setw(4)` on @a o sets the indentation level to `4` and the
+      serialization result is the same as calling `dump(4)`.
+
+    - The indentation character can be controlled with the member variable
+      `fill` of the output stream @a o. For instance, the manipulator
+      `std::setfill('\\t')` sets indentation to use a tab character rather than
+      the default space character.
 
     @param[in,out] o  stream to serialize to
     @param[in] j  JSON value to serialize
 
     @return the stream @a o
 
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
     @complexity Linear.
 
     @liveexample{The example below shows the serialization with different
     parameters to `width` to adjust the indentation level.,operator_serialize}
 
-    @since version 1.0.0
+    @since version 1.0.0; indentation character added in version 3.0.0
     */
     friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
     {
         // read width member and use it as indentation parameter if nonzero
-        const bool pretty_print = (o.width() > 0);
-        const auto indentation = (pretty_print ? o.width() : 0);
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
 
         // reset width to 0 for subsequent calls to this stream
         o.width(0);
 
         // do the actual serialization
-        j.dump(o, pretty_print, static_cast<unsigned int>(indentation));
-
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
         return o;
     }
 
     /*!
     @brief serialize to stream
-    @copydoc operator<<(std::ostream&, const basic_json&)
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use
+                @ref operator<<(std::ostream&, const basic_json&)
+                instead; that is, replace calls like `j >> o;` with `o << j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
     */
+    JSON_DEPRECATED
     friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
     {
         return o << j;
@@ -6254,20 +18793,47 @@ class basic_json
     /// @{
 
     /*!
-    @brief deserialize from an array
+    @brief deserialize from a compatible input
 
-    This function reads from an array of 1-byte values.
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
 
     @pre Each element of the container has a size of 1 byte. Violating this
     precondition yields undefined behavior. **This precondition is enforced
     with a static assertion.**
 
-    @param[in] array  array to read from
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
     @param[in] cb  a parser callback function of type @ref parser_callback_t
     which is used to control the deserialization by filtering unwanted values
     (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
 
-    @return result of the deserialization
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
 
     @complexity Linear in the length of the input. The parser is a predictive
     LL(1) parser. The complexity can be higher if the parser callback function
@@ -6278,90 +18844,94 @@ class basic_json
     @liveexample{The example below demonstrates the `parse()` function reading
     from an array.,parse__array__parser_callback_t}
 
-    @since version 2.0.3
-    */
-    template<class T, std::size_t N>
-    static basic_json parse(T (&array)[N],
-                            const parser_callback_t cb = nullptr)
-    {
-        // delegate the call to the iterator-range parse overload
-        return parse(std::begin(array), std::end(array), cb);
-    }
-
-    /*!
-    @brief deserialize from string literal
-
-    @tparam CharT character/literal type with size of 1 byte
-    @param[in] s  string literal to read a serialized JSON value from
-    @param[in] cb a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-    @note String containers like `std::string` or @ref string_t can be parsed
-          with @ref parse(const ContiguousContainer&, const parser_callback_t)
-
     @liveexample{The example below demonstrates the `parse()` function with
     and without callback function.,parse__string__parser_callback_t}
 
-    @sa @ref parse(std::istream&, const parser_callback_t) for a version that
-    reads from an input stream
-
-    @since version 1.0.0 (originally for @ref string_t)
-    */
-    template<typename CharT, typename std::enable_if<
-                 std::is_pointer<CharT>::value and
-                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
-                 sizeof(typename std::remove_pointer<CharT>::type) == 1, int>::type = 0>
-    static basic_json parse(const CharT s,
-                            const parser_callback_t cb = nullptr)
-    {
-        return parser(reinterpret_cast<const char*>(s), cb).parse();
-    }
-
-    /*!
-    @brief deserialize from stream
-
-    @param[in,out] i  stream to read a serialized JSON value from
-    @param[in] cb a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
     @liveexample{The example below demonstrates the `parse()` function with
     and without callback function.,parse__istream__parser_callback_t}
 
-    @sa @ref parse(const CharT, const parser_callback_t) for a version
-    that reads from a string
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
 
-    @since version 1.0.0
+    @since version 2.0.3 (contiguous containers)
     */
-    static basic_json parse(std::istream& i,
-                            const parser_callback_t cb = nullptr)
+    JSON_NODISCARD
+    static basic_json parse(detail::input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
     {
-        return parser(i, cb).parse();
+        basic_json result;
+        parser(i, cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    static bool accept(detail::input_adapter&& i)
+    {
+        return parser(i).accept(true);
     }
 
     /*!
-    @copydoc parse(std::istream&, const parser_callback_t)
+    @brief generate SAX events
+
+    The SAX event lister must follow the interface of @ref json_sax.
+
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
+
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
+    @param[in,out] sax  SAX event listener
+    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
+    @param[in] strict  whether the input has to be consumed completely
+
+    @return return value of the last processed SAX event
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
+    a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `sax_parse()` function
+    reading from string and processing the events with a user-defined SAX
+    event consumer.,sax_parse}
+
+    @since version 3.2.0
     */
-    static basic_json parse(std::istream&& i,
-                            const parser_callback_t cb = nullptr)
+    template <typename SAX>
+    static bool sax_parse(detail::input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true)
     {
-        return parser(i, cb).parse();
+        assert(sax);
+        return format == input_format_t::json
+               ? parser(std::move(i)).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, SAX>(std::move(i)).sax_parse(format, sax, strict);
     }
 
     /*!
@@ -6391,8 +18961,16 @@ class basic_json
     @param[in] cb  a parser callback function of type @ref parser_callback_t
     which is used to control the deserialization by filtering unwanted values
     (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
 
-    @return result of the deserialization
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
 
     @complexity Linear in the length of the input. The parser is a predictive
     LL(1) parser. The complexity can be higher if the parser callback function
@@ -6410,82 +18988,44 @@ class basic_json
                      std::random_access_iterator_tag,
                      typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
     static basic_json parse(IteratorType first, IteratorType last,
-                            const parser_callback_t cb = nullptr)
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
     {
-        // assertion to check that the iterator range is indeed contiguous,
-        // see http://stackoverflow.com/a/35008842/266378 for more discussion
-        assert(std::accumulate(first, last, std::pair<bool, int>(true, 0),
-                               [&first](std::pair<bool, int> res, decltype(*first) val)
-        {
-            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
-            return res;
-        }).first);
+        basic_json result;
+        parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
+        return result;
+    }
 
-        // assertion to check that each element is 1 byte long
-        static_assert(sizeof(typename std::iterator_traits<IteratorType>::value_type) == 1,
-                      "each element in the iterator range must have the size of 1 byte");
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static bool accept(IteratorType first, IteratorType last)
+    {
+        return parser(detail::input_adapter(first, last)).accept(true);
+    }
 
-        // if iterator range is empty, create a parser with an empty string
-        // to generate "unexpected EOF" error message
-        if (std::distance(first, last) <= 0)
-        {
-            return parser("").parse();
-        }
-
-        return parser(first, last, cb).parse();
+    template<class IteratorType, class SAX, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax)
+    {
+        return parser(detail::input_adapter(first, last)).sax_parse(sax);
     }
 
     /*!
-    @brief deserialize from a container with contiguous storage
-
-    This function reads from a container with contiguous storage of 1-byte
-    values. Compatible container types include `std::vector`, `std::string`,
-    `std::array`, and `std::initializer_list`. User-defined containers can be
-    used as long as they implement random-access iterators and a contiguous
-    storage.
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @tparam ContiguousContainer container type with contiguous storage
-    @param[in] c  container to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-
-    @return result of the deserialization
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
-
-    @since version 2.0.3
+    @brief deserialize from stream
+    @deprecated This stream operator is deprecated and will be removed in
+                version 4.0.0 of the library. Please use
+                @ref operator>>(std::istream&, basic_json&)
+                instead; that is, replace calls like `j << i;` with `i >> j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
     */
-    template<class ContiguousContainer, typename std::enable_if<
-                 not std::is_pointer<ContiguousContainer>::value and
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value
-                 , int>::type = 0>
-    static basic_json parse(const ContiguousContainer& c,
-                            const parser_callback_t cb = nullptr)
+    JSON_DEPRECATED
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
     {
-        // delegate the call to the iterator-range parse overload
-        return parse(std::begin(c), std::end(c), cb);
+        return operator>>(i, j);
     }
 
     /*!
@@ -6496,7 +19036,9 @@ class basic_json
     @param[in,out] i  input stream to read a serialized JSON value from
     @param[in,out] j  JSON value to write the deserialized input to
 
-    @throw std::invalid_argument in case of parse errors
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
 
     @complexity Linear in the length of the input. The parser is a predictive
     LL(1) parser.
@@ -6511,1538 +19053,14 @@ class basic_json
 
     @since version 1.0.0
     */
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        j = parser(i).parse();
-        return i;
-    }
-
-    /*!
-    @brief deserialize from stream
-    @copydoc operator<<(basic_json&, std::istream&)
-    */
     friend std::istream& operator>>(std::istream& i, basic_json& j)
     {
-        j = parser(i).parse();
+        parser(detail::input_adapter(i)).parse(false, j);
         return i;
     }
 
     /// @}
 
-    //////////////////////////////////////////
-    // binary serialization/deserialization //
-    //////////////////////////////////////////
-
-    /// @name binary serialization/deserialization support
-    /// @{
-
-  private:
-    /*!
-    @note Some code in the switch cases has been copied, because otherwise
-          copilers would complain about implicit fallthrough and there is no
-          portable attribute to mute such warnings.
-    */
-    template<typename T>
-    static void add_to_vector(std::vector<uint8_t>& vec, size_t bytes, const T number)
-    {
-        assert(bytes == 1 or bytes == 2 or bytes == 4 or bytes == 8);
-
-        switch (bytes)
-        {
-            case 8:
-            {
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 070) & 0xff));
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 060) & 0xff));
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 050) & 0xff));
-                vec.push_back(static_cast<uint8_t>((static_cast<uint64_t>(number) >> 040) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 030) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 020) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 010) & 0xff));
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-
-            case 4:
-            {
-                vec.push_back(static_cast<uint8_t>((number >> 030) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 020) & 0xff));
-                vec.push_back(static_cast<uint8_t>((number >> 010) & 0xff));
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-
-            case 2:
-            {
-                vec.push_back(static_cast<uint8_t>((number >> 010) & 0xff));
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-
-            case 1:
-            {
-                vec.push_back(static_cast<uint8_t>(number & 0xff));
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief take sufficient bytes from a vector to fill an integer variable
-
-    In the context of binary serialization formats, we need to read several
-    bytes from a byte vector and combine them to multi-byte integral data
-    types.
-
-    @param[in] vec  byte vector to read from
-    @param[in] current_index  the position in the vector after which to read
-
-    @return the next sizeof(T) bytes from @a vec, in reverse order as T
-
-    @tparam T the integral return type
-
-    @throw std::out_of_range if there are less than sizeof(T)+1 bytes in the
-           vector @a vec to read
-
-    In the for loop, the bytes from the vector are copied in reverse order into
-    the return value. In the figures below, let sizeof(T)=4 and `i` be the loop
-    variable.
-
-    Precondition:
-
-    vec:   |   |   | a | b | c | d |      T: |   |   |   |   |
-                 ^               ^             ^                ^
-           current_index         i            ptr        sizeof(T)
-
-    Postcondition:
-
-    vec:   |   |   | a | b | c | d |      T: | d | c | b | a |
-                 ^   ^                                     ^
-                 |   i                                    ptr
-           current_index
-
-    @sa Code adapted from <http://stackoverflow.com/a/41031865/266378>.
-    */
-    template<typename T>
-    static T get_from_vector(const std::vector<uint8_t>& vec, const size_t current_index)
-    {
-        if (current_index + sizeof(T) + 1 > vec.size())
-        {
-            JSON_THROW(std::out_of_range("cannot read " + std::to_string(sizeof(T)) + " bytes from vector"));
-        }
-
-        T result;
-        auto* ptr = reinterpret_cast<uint8_t*>(&result);
-        for (size_t i = 0; i < sizeof(T); ++i)
-        {
-            *ptr++ = vec[current_index + sizeof(T) - i];
-        }
-        return result;
-    }
-
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    This is a straightforward implementation of the MessagePack specification.
-
-    @param[in] j  JSON value to serialize
-    @param[in,out] v  byte vector to write the serialization to
-
-    @sa https://github.com/msgpack/msgpack/blob/master/spec.md
-    */
-    static void to_msgpack_internal(const basic_json& j, std::vector<uint8_t>& v)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                // nil
-                v.push_back(0xc0);
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                // true and false
-                v.push_back(j.m_value.boolean ? 0xc3 : 0xc2);
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // MessagePack does not differentiate between positive
-                    // signed integers and unsigned integers. Therefore, we
-                    // used the code from the value_t::number_unsigned case
-                    // here.
-                    if (j.m_value.number_unsigned < 128)
-                    {
-                        // positive fixnum
-                        add_to_vector(v, 1, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint8_t>::max())
-                    {
-                        // uint 8
-                        v.push_back(0xcc);
-                        add_to_vector(v, 1, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint16_t>::max())
-                    {
-                        // uint 16
-                        v.push_back(0xcd);
-                        add_to_vector(v, 2, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint32_t>::max())
-                    {
-                        // uint 32
-                        v.push_back(0xce);
-                        add_to_vector(v, 4, j.m_value.number_unsigned);
-                    }
-                    else if (j.m_value.number_unsigned <= std::numeric_limits<uint64_t>::max())
-                    {
-                        // uint 64
-                        v.push_back(0xcf);
-                        add_to_vector(v, 8, j.m_value.number_unsigned);
-                    }
-                }
-                else
-                {
-                    if (j.m_value.number_integer >= -32)
-                    {
-                        // negative fixnum
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int8_t>::min() and j.m_value.number_integer <= std::numeric_limits<int8_t>::max())
-                    {
-                        // int 8
-                        v.push_back(0xd0);
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int16_t>::min() and j.m_value.number_integer <= std::numeric_limits<int16_t>::max())
-                    {
-                        // int 16
-                        v.push_back(0xd1);
-                        add_to_vector(v, 2, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int32_t>::min() and j.m_value.number_integer <= std::numeric_limits<int32_t>::max())
-                    {
-                        // int 32
-                        v.push_back(0xd2);
-                        add_to_vector(v, 4, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer >= std::numeric_limits<int64_t>::min() and j.m_value.number_integer <= std::numeric_limits<int64_t>::max())
-                    {
-                        // int 64
-                        v.push_back(0xd3);
-                        add_to_vector(v, 8, j.m_value.number_integer);
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned < 128)
-                {
-                    // positive fixnum
-                    add_to_vector(v, 1, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint8_t>::max())
-                {
-                    // uint 8
-                    v.push_back(0xcc);
-                    add_to_vector(v, 1, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint16_t>::max())
-                {
-                    // uint 16
-                    v.push_back(0xcd);
-                    add_to_vector(v, 2, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint32_t>::max())
-                {
-                    // uint 32
-                    v.push_back(0xce);
-                    add_to_vector(v, 4, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= std::numeric_limits<uint64_t>::max())
-                {
-                    // uint 64
-                    v.push_back(0xcf);
-                    add_to_vector(v, 8, j.m_value.number_unsigned);
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                // float 64
-                v.push_back(0xcb);
-                const auto* helper = reinterpret_cast<const uint8_t*>(&(j.m_value.number_float));
-                for (size_t i = 0; i < 8; ++i)
-                {
-                    v.push_back(helper[7 - i]);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                const auto N = j.m_value.string->size();
-                if (N <= 31)
-                {
-                    // fixstr
-                    v.push_back(static_cast<uint8_t>(0xa0 | N));
-                }
-                else if (N <= 255)
-                {
-                    // str 8
-                    v.push_back(0xd9);
-                    add_to_vector(v, 1, N);
-                }
-                else if (N <= 65535)
-                {
-                    // str 16
-                    v.push_back(0xda);
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 4294967295)
-                {
-                    // str 32
-                    v.push_back(0xdb);
-                    add_to_vector(v, 4, N);
-                }
-
-                // append string
-                std::copy(j.m_value.string->begin(), j.m_value.string->end(),
-                          std::back_inserter(v));
-                break;
-            }
-
-            case value_t::array:
-            {
-                const auto N = j.m_value.array->size();
-                if (N <= 15)
-                {
-                    // fixarray
-                    v.push_back(static_cast<uint8_t>(0x90 | N));
-                }
-                else if (N <= 0xffff)
-                {
-                    // array 16
-                    v.push_back(0xdc);
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 0xffffffff)
-                {
-                    // array 32
-                    v.push_back(0xdd);
-                    add_to_vector(v, 4, N);
-                }
-
-                // append each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    to_msgpack_internal(el, v);
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                const auto N = j.m_value.object->size();
-                if (N <= 15)
-                {
-                    // fixmap
-                    v.push_back(static_cast<uint8_t>(0x80 | (N & 0xf)));
-                }
-                else if (N <= 65535)
-                {
-                    // map 16
-                    v.push_back(0xde);
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 4294967295)
-                {
-                    // map 32
-                    v.push_back(0xdf);
-                    add_to_vector(v, 4, N);
-                }
-
-                // append each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    to_msgpack_internal(el.first, v);
-                    to_msgpack_internal(el.second, v);
-                }
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief create a CBOR serialization of a given JSON value
-
-    This is a straightforward implementation of the CBOR specification.
-
-    @param[in] j  JSON value to serialize
-    @param[in,out] v  byte vector to write the serialization to
-
-    @sa https://tools.ietf.org/html/rfc7049
-    */
-    static void to_cbor_internal(const basic_json& j, std::vector<uint8_t>& v)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                v.push_back(0xf6);
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                v.push_back(j.m_value.boolean ? 0xf5 : 0xf4);
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // CBOR does not differentiate between positive signed
-                    // integers and unsigned integers. Therefore, we used the
-                    // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
-                    {
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer <= std::numeric_limits<uint8_t>::max())
-                    {
-                        v.push_back(0x18);
-                        // one-byte uint8_t
-                        add_to_vector(v, 1, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer <= std::numeric_limits<uint16_t>::max())
-                    {
-                        v.push_back(0x19);
-                        // two-byte uint16_t
-                        add_to_vector(v, 2, j.m_value.number_integer);
-                    }
-                    else if (j.m_value.number_integer <= std::numeric_limits<uint32_t>::max())
-                    {
-                        v.push_back(0x1a);
-                        // four-byte uint32_t
-                        add_to_vector(v, 4, j.m_value.number_integer);
-                    }
-                    else
-                    {
-                        v.push_back(0x1b);
-                        // eight-byte uint64_t
-                        add_to_vector(v, 8, j.m_value.number_integer);
-                    }
-                }
-                else
-                {
-                    // The conversions below encode the sign in the first
-                    // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
-                    {
-                        v.push_back(static_cast<uint8_t>(0x20 + positive_number));
-                    }
-                    else if (positive_number <= std::numeric_limits<uint8_t>::max())
-                    {
-                        // int 8
-                        v.push_back(0x38);
-                        add_to_vector(v, 1, positive_number);
-                    }
-                    else if (positive_number <= std::numeric_limits<uint16_t>::max())
-                    {
-                        // int 16
-                        v.push_back(0x39);
-                        add_to_vector(v, 2, positive_number);
-                    }
-                    else if (positive_number <= std::numeric_limits<uint32_t>::max())
-                    {
-                        // int 32
-                        v.push_back(0x3a);
-                        add_to_vector(v, 4, positive_number);
-                    }
-                    else
-                    {
-                        // int 64
-                        v.push_back(0x3b);
-                        add_to_vector(v, 8, positive_number);
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= 0x17)
-                {
-                    v.push_back(static_cast<uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= 0xff)
-                {
-                    v.push_back(0x18);
-                    // one-byte uint8_t
-                    add_to_vector(v, 1, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= 0xffff)
-                {
-                    v.push_back(0x19);
-                    // two-byte uint16_t
-                    add_to_vector(v, 2, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= 0xffffffff)
-                {
-                    v.push_back(0x1a);
-                    // four-byte uint32_t
-                    add_to_vector(v, 4, j.m_value.number_unsigned);
-                }
-                else if (j.m_value.number_unsigned <= 0xffffffffffffffff)
-                {
-                    v.push_back(0x1b);
-                    // eight-byte uint64_t
-                    add_to_vector(v, 8, j.m_value.number_unsigned);
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                // Double-Precision Float
-                v.push_back(0xfb);
-                const auto* helper = reinterpret_cast<const uint8_t*>(&(j.m_value.number_float));
-                for (size_t i = 0; i < 8; ++i)
-                {
-                    v.push_back(helper[7 - i]);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                const auto N = j.m_value.string->size();
-                if (N <= 0x17)
-                {
-                    v.push_back(0x60 + static_cast<uint8_t>(N));  // 1 byte for string + size
-                }
-                else if (N <= 0xff)
-                {
-                    v.push_back(0x78);  // one-byte uint8_t for N
-                    add_to_vector(v, 1, N);
-                }
-                else if (N <= 0xffff)
-                {
-                    v.push_back(0x79);  // two-byte uint16_t for N
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 0xffffffff)
-                {
-                    v.push_back(0x7a); // four-byte uint32_t for N
-                    add_to_vector(v, 4, N);
-                }
-                // LCOV_EXCL_START
-                else if (N <= 0xffffffffffffffff)
-                {
-                    v.push_back(0x7b);  // eight-byte uint64_t for N
-                    add_to_vector(v, 8, N);
-                }
-                // LCOV_EXCL_STOP
-
-                // append string
-                std::copy(j.m_value.string->begin(), j.m_value.string->end(),
-                          std::back_inserter(v));
-                break;
-            }
-
-            case value_t::array:
-            {
-                const auto N = j.m_value.array->size();
-                if (N <= 0x17)
-                {
-                    v.push_back(0x80 + static_cast<uint8_t>(N));  // 1 byte for array + size
-                }
-                else if (N <= 0xff)
-                {
-                    v.push_back(0x98);  // one-byte uint8_t for N
-                    add_to_vector(v, 1, N);
-                }
-                else if (N <= 0xffff)
-                {
-                    v.push_back(0x99);  // two-byte uint16_t for N
-                    add_to_vector(v, 2, N);
-                }
-                else if (N <= 0xffffffff)
-                {
-                    v.push_back(0x9a);  // four-byte uint32_t for N
-                    add_to_vector(v, 4, N);
-                }
-                // LCOV_EXCL_START
-                else if (N <= 0xffffffffffffffff)
-                {
-                    v.push_back(0x9b);  // eight-byte uint64_t for N
-                    add_to_vector(v, 8, N);
-                }
-                // LCOV_EXCL_STOP
-
-                // append each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    to_cbor_internal(el, v);
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                const auto N = j.m_value.object->size();
-                if (N <= 0x17)
-                {
-                    v.push_back(0xa0 + static_cast<uint8_t>(N));  // 1 byte for object + size
-                }
-                else if (N <= 0xff)
-                {
-                    v.push_back(0xb8);
-                    add_to_vector(v, 1, N);  // one-byte uint8_t for N
-                }
-                else if (N <= 0xffff)
-                {
-                    v.push_back(0xb9);
-                    add_to_vector(v, 2, N);  // two-byte uint16_t for N
-                }
-                else if (N <= 0xffffffff)
-                {
-                    v.push_back(0xba);
-                    add_to_vector(v, 4, N);  // four-byte uint32_t for N
-                }
-                // LCOV_EXCL_START
-                else if (N <= 0xffffffffffffffff)
-                {
-                    v.push_back(0xbb);
-                    add_to_vector(v, 8, N);  // eight-byte uint64_t for N
-                }
-                // LCOV_EXCL_STOP
-
-                // append each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    to_cbor_internal(el.first, v);
-                    to_cbor_internal(el.second, v);
-                }
-                break;
-            }
-
-            default:
-            {
-                break;
-            }
-        }
-    }
-
-
-    /*
-    @brief checks if given lengths do not exceed the size of a given vector
-
-    To secure the access to the byte vector during CBOR/MessagePack
-    deserialization, bytes are copied from the vector into buffers. This
-    function checks if the number of bytes to copy (@a len) does not exceed
-    the size @s size of the vector. Additionally, an @a offset is given from
-    where to start reading the bytes.
-
-    This function checks whether reading the bytes is safe; that is, offset is
-    a valid index in the vector, offset+len
-
-    @param[in] size    size of the byte vector
-    @param[in] len     number of bytes to read
-    @param[in] offset  offset where to start reading
-
-    vec:  x x x x x X X X X X
-          ^         ^         ^
-          0         offset    len
-
-    @throws out_of_range if `len > v.size()`
-    */
-    static void check_length(const size_t size, const size_t len, const size_t offset)
-    {
-        // simple case: requested length is greater than the vector's length
-        if (len > size or offset > size)
-        {
-            JSON_THROW(std::out_of_range("len out of range"));
-        }
-
-        // second case: adding offset would result in overflow
-        if ((size > (std::numeric_limits<size_t>::max() - offset)))
-        {
-            JSON_THROW(std::out_of_range("len+offset out of range"));
-        }
-
-        // last case: reading past the end of the vector
-        if (len + offset > size)
-        {
-            JSON_THROW(std::out_of_range("len+offset out of range"));
-        }
-    }
-
-    /*!
-    @brief create a JSON value from a given MessagePack vector
-
-    @param[in] v  MessagePack serialization
-    @param[in] idx  byte index to start reading from @a v
-
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from MessagePack were
-    used in the given vector @a v or if the input is not valid MessagePack
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @sa https://github.com/msgpack/msgpack/blob/master/spec.md
-    */
-    static basic_json from_msgpack_internal(const std::vector<uint8_t>& v, size_t& idx)
-    {
-        // make sure reading 1 byte is safe
-        check_length(v.size(), 1, idx);
-
-        // store and increment index
-        const size_t current_idx = idx++;
-
-        if (v[current_idx] <= 0xbf)
-        {
-            if (v[current_idx] <= 0x7f) // positive fixint
-            {
-                return v[current_idx];
-            }
-            if (v[current_idx] <= 0x8f) // fixmap
-            {
-                basic_json result = value_t::object;
-                const size_t len = v[current_idx] & 0x0f;
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_msgpack_internal(v, idx);
-                    result[key] = from_msgpack_internal(v, idx);
-                }
-                return result;
-            }
-            else if (v[current_idx] <= 0x9f) // fixarray
-            {
-                basic_json result = value_t::array;
-                const size_t len = v[current_idx] & 0x0f;
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_msgpack_internal(v, idx));
-                }
-                return result;
-            }
-            else // fixstr
-            {
-                const size_t len = v[current_idx] & 0x1f;
-                const size_t offset = current_idx + 1;
-                idx += len; // skip content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-        }
-        else if (v[current_idx] >= 0xe0) // negative fixint
-        {
-            return static_cast<int8_t>(v[current_idx]);
-        }
-        else
-        {
-            switch (v[current_idx])
-            {
-                case 0xc0: // nil
-                {
-                    return value_t::null;
-                }
-
-                case 0xc2: // false
-                {
-                    return false;
-                }
-
-                case 0xc3: // true
-                {
-                    return true;
-                }
-
-                case 0xca: // float 32
-                {
-                    // copy bytes in reverse order into the double variable
-                    float res;
-                    for (size_t byte = 0; byte < sizeof(float); ++byte)
-                    {
-                        reinterpret_cast<uint8_t*>(&res)[sizeof(float) - byte - 1] = v.at(current_idx + 1 + byte);
-                    }
-                    idx += sizeof(float); // skip content bytes
-                    return res;
-                }
-
-                case 0xcb: // float 64
-                {
-                    // copy bytes in reverse order into the double variable
-                    double res;
-                    for (size_t byte = 0; byte < sizeof(double); ++byte)
-                    {
-                        reinterpret_cast<uint8_t*>(&res)[sizeof(double) - byte - 1] = v.at(current_idx + 1 + byte);
-                    }
-                    idx += sizeof(double); // skip content bytes
-                    return res;
-                }
-
-                case 0xcc: // uint 8
-                {
-                    idx += 1; // skip content byte
-                    return get_from_vector<uint8_t>(v, current_idx);
-                }
-
-                case 0xcd: // uint 16
-                {
-                    idx += 2; // skip 2 content bytes
-                    return get_from_vector<uint16_t>(v, current_idx);
-                }
-
-                case 0xce: // uint 32
-                {
-                    idx += 4; // skip 4 content bytes
-                    return get_from_vector<uint32_t>(v, current_idx);
-                }
-
-                case 0xcf: // uint 64
-                {
-                    idx += 8; // skip 8 content bytes
-                    return get_from_vector<uint64_t>(v, current_idx);
-                }
-
-                case 0xd0: // int 8
-                {
-                    idx += 1; // skip content byte
-                    return get_from_vector<int8_t>(v, current_idx);
-                }
-
-                case 0xd1: // int 16
-                {
-                    idx += 2; // skip 2 content bytes
-                    return get_from_vector<int16_t>(v, current_idx);
-                }
-
-                case 0xd2: // int 32
-                {
-                    idx += 4; // skip 4 content bytes
-                    return get_from_vector<int32_t>(v, current_idx);
-                }
-
-                case 0xd3: // int 64
-                {
-                    idx += 8; // skip 8 content bytes
-                    return get_from_vector<int64_t>(v, current_idx);
-                }
-
-                case 0xd9: // str 8
-                {
-                    const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                    const size_t offset = current_idx + 2;
-                    idx += len + 1; // skip size byte + content bytes
-                    check_length(v.size(), len, offset);
-                    return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-                }
-
-                case 0xda: // str 16
-                {
-                    const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                    const size_t offset = current_idx + 3;
-                    idx += len + 2; // skip 2 size bytes + content bytes
-                    check_length(v.size(), len, offset);
-                    return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-                }
-
-                case 0xdb: // str 32
-                {
-                    const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                    const size_t offset = current_idx + 5;
-                    idx += len + 4; // skip 4 size bytes + content bytes
-                    check_length(v.size(), len, offset);
-                    return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-                }
-
-                case 0xdc: // array 16
-                {
-                    basic_json result = value_t::array;
-                    const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                    idx += 2; // skip 2 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        result.push_back(from_msgpack_internal(v, idx));
-                    }
-                    return result;
-                }
-
-                case 0xdd: // array 32
-                {
-                    basic_json result = value_t::array;
-                    const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                    idx += 4; // skip 4 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        result.push_back(from_msgpack_internal(v, idx));
-                    }
-                    return result;
-                }
-
-                case 0xde: // map 16
-                {
-                    basic_json result = value_t::object;
-                    const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                    idx += 2; // skip 2 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        std::string key = from_msgpack_internal(v, idx);
-                        result[key] = from_msgpack_internal(v, idx);
-                    }
-                    return result;
-                }
-
-                case 0xdf: // map 32
-                {
-                    basic_json result = value_t::object;
-                    const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                    idx += 4; // skip 4 size bytes
-                    for (size_t i = 0; i < len; ++i)
-                    {
-                        std::string key = from_msgpack_internal(v, idx);
-                        result[key] = from_msgpack_internal(v, idx);
-                    }
-                    return result;
-                }
-
-                default:
-                {
-                    JSON_THROW(std::invalid_argument("error parsing a msgpack @ " + std::to_string(current_idx) + ": " + std::to_string(static_cast<int>(v[current_idx]))));
-                }
-            }
-        }
-    }
-
-    /*!
-    @brief create a JSON value from a given CBOR vector
-
-    @param[in] v  CBOR serialization
-    @param[in] idx  byte index to start reading from @a v
-
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from CBOR were used in
-    the given vector @a v or if the input is not valid CBOR
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @sa https://tools.ietf.org/html/rfc7049
-    */
-    static basic_json from_cbor_internal(const std::vector<uint8_t>& v, size_t& idx)
-    {
-        // store and increment index
-        const size_t current_idx = idx++;
-
-        switch (v.at(current_idx))
-        {
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0a:
-            case 0x0b:
-            case 0x0c:
-            case 0x0d:
-            case 0x0e:
-            case 0x0f:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            {
-                return v[current_idx];
-            }
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                idx += 1; // skip content byte
-                return get_from_vector<uint8_t>(v, current_idx);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                idx += 2; // skip 2 content bytes
-                return get_from_vector<uint16_t>(v, current_idx);
-            }
-
-            case 0x1a: // Unsigned integer (four-byte uint32_t follows)
-            {
-                idx += 4; // skip 4 content bytes
-                return get_from_vector<uint32_t>(v, current_idx);
-            }
-
-            case 0x1b: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                idx += 8; // skip 8 content bytes
-                return get_from_vector<uint64_t>(v, current_idx);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2a:
-            case 0x2b:
-            case 0x2c:
-            case 0x2d:
-            case 0x2e:
-            case 0x2f:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            {
-                return static_cast<int8_t>(0x20 - 1 - v[current_idx]);
-            }
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                idx += 1; // skip content byte
-                // must be uint8_t !
-                return static_cast<number_integer_t>(-1) - get_from_vector<uint8_t>(v, current_idx);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                idx += 2; // skip 2 content bytes
-                return static_cast<number_integer_t>(-1) - get_from_vector<uint16_t>(v, current_idx);
-            }
-
-            case 0x3a: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                idx += 4; // skip 4 content bytes
-                return static_cast<number_integer_t>(-1) - get_from_vector<uint32_t>(v, current_idx);
-            }
-
-            case 0x3b: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                idx += 8; // skip 8 content bytes
-                return static_cast<number_integer_t>(-1) - static_cast<number_integer_t>(get_from_vector<uint64_t>(v, current_idx));
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6a:
-            case 0x6b:
-            case 0x6c:
-            case 0x6d:
-            case 0x6e:
-            case 0x6f:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                const auto len = static_cast<size_t>(v[current_idx] - 0x60);
-                const size_t offset = current_idx + 1;
-                idx += len; // skip content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                const size_t offset = current_idx + 2;
-                idx += len + 1; // skip size byte + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                const size_t offset = current_idx + 3;
-                idx += len + 2; // skip 2 size bytes + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x7a: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                const size_t offset = current_idx + 5;
-                idx += len + 4; // skip 4 size bytes + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x7b: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                const auto len = static_cast<size_t>(get_from_vector<uint64_t>(v, current_idx));
-                const size_t offset = current_idx + 9;
-                idx += len + 8; // skip 8 size bytes + content bytes
-                check_length(v.size(), len, offset);
-                return std::string(reinterpret_cast<const char*>(v.data()) + offset, len);
-            }
-
-            case 0x7f: // UTF-8 string (indefinite length)
-            {
-                std::string result;
-                while (v.at(idx) != 0xff)
-                {
-                    string_t s = from_cbor_internal(v, idx);
-                    result += s;
-                }
-                // skip break byte (0xFF)
-                idx += 1;
-                return result;
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8a:
-            case 0x8b:
-            case 0x8c:
-            case 0x8d:
-            case 0x8e:
-            case 0x8f:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(v[current_idx] - 0x80);
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                idx += 1; // skip 1 size byte
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                idx += 2; // skip 4 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x9a: // array (four-byte uint32_t for n follow)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                idx += 4; // skip 4 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x9b: // array (eight-byte uint64_t for n follow)
-            {
-                basic_json result = value_t::array;
-                const auto len = static_cast<size_t>(get_from_vector<uint64_t>(v, current_idx));
-                idx += 8; // skip 8 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                return result;
-            }
-
-            case 0x9f: // array (indefinite length)
-            {
-                basic_json result = value_t::array;
-                while (v.at(idx) != 0xff)
-                {
-                    result.push_back(from_cbor_internal(v, idx));
-                }
-                // skip break byte (0xFF)
-                idx += 1;
-                return result;
-            }
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xa0:
-            case 0xa1:
-            case 0xa2:
-            case 0xa3:
-            case 0xa4:
-            case 0xa5:
-            case 0xa6:
-            case 0xa7:
-            case 0xa8:
-            case 0xa9:
-            case 0xaa:
-            case 0xab:
-            case 0xac:
-            case 0xad:
-            case 0xae:
-            case 0xaf:
-            case 0xb0:
-            case 0xb1:
-            case 0xb2:
-            case 0xb3:
-            case 0xb4:
-            case 0xb5:
-            case 0xb6:
-            case 0xb7:
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(v[current_idx] - 0xa0);
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xb8: // map (one-byte uint8_t for n follows)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint8_t>(v, current_idx));
-                idx += 1; // skip 1 size byte
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xb9: // map (two-byte uint16_t for n follow)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint16_t>(v, current_idx));
-                idx += 2; // skip 2 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xba: // map (four-byte uint32_t for n follow)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint32_t>(v, current_idx));
-                idx += 4; // skip 4 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xbb: // map (eight-byte uint64_t for n follow)
-            {
-                basic_json result = value_t::object;
-                const auto len = static_cast<size_t>(get_from_vector<uint64_t>(v, current_idx));
-                idx += 8; // skip 8 size bytes
-                for (size_t i = 0; i < len; ++i)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                return result;
-            }
-
-            case 0xbf: // map (indefinite length)
-            {
-                basic_json result = value_t::object;
-                while (v.at(idx) != 0xff)
-                {
-                    std::string key = from_cbor_internal(v, idx);
-                    result[key] = from_cbor_internal(v, idx);
-                }
-                // skip break byte (0xFF)
-                idx += 1;
-                return result;
-            }
-
-            case 0xf4: // false
-            {
-                return false;
-            }
-
-            case 0xf5: // true
-            {
-                return true;
-            }
-
-            case 0xf6: // null
-            {
-                return value_t::null;
-            }
-
-            case 0xf9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                idx += 2; // skip two content bytes
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added to
-                // IEEE 754 in 2008, today's programming platforms often still
-                // only have limited support for them. It is very easy to
-                // include at least decoding support for them even without such
-                // support. An example of a small decoder for half-precision
-                // floating-point numbers in the C language is shown in Fig. 3.
-                const int half = (v.at(current_idx + 1) << 8) + v.at(current_idx + 2);
-                const int exp = (half >> 10) & 0x1f;
-                const int mant = half & 0x3ff;
-                double val;
-                if (exp == 0)
-                {
-                    val = std::ldexp(mant, -24);
-                }
-                else if (exp != 31)
-                {
-                    val = std::ldexp(mant + 1024, exp - 25);
-                }
-                else
-                {
-                    val = mant == 0
-                          ? std::numeric_limits<double>::infinity()
-                          : std::numeric_limits<double>::quiet_NaN();
-                }
-                return (half & 0x8000) != 0 ? -val : val;
-            }
-
-            case 0xfa: // Single-Precision Float (four-byte IEEE 754)
-            {
-                // copy bytes in reverse order into the float variable
-                float res;
-                for (size_t byte = 0; byte < sizeof(float); ++byte)
-                {
-                    reinterpret_cast<uint8_t*>(&res)[sizeof(float) - byte - 1] = v.at(current_idx + 1 + byte);
-                }
-                idx += sizeof(float); // skip content bytes
-                return res;
-            }
-
-            case 0xfb: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                // copy bytes in reverse order into the double variable
-                double res;
-                for (size_t byte = 0; byte < sizeof(double); ++byte)
-                {
-                    reinterpret_cast<uint8_t*>(&res)[sizeof(double) - byte - 1] = v.at(current_idx + 1 + byte);
-                }
-                idx += sizeof(double); // skip content bytes
-                return res;
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                JSON_THROW(std::invalid_argument("error parsing a CBOR @ " + std::to_string(current_idx) + ": " + std::to_string(static_cast<int>(v[current_idx]))));
-            }
-        }
-    }
-
-  public:
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the MessagePack
-    serialization format. MessagePack is a binary serialization format which
-    aims to be more compact than JSON itself, yet more efficient to parse.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in MessagePack format.,to_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref from_msgpack(const std::vector<uint8_t>&, const size_t) for the
-        analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_msgpack(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_msgpack_internal(j, result);
-        return result;
-    }
-
-    /*!
-    @brief create a JSON value from a byte vector in MessagePack format
-
-    Deserializes a given byte vector @a v to a JSON value using the MessagePack
-    serialization format.
-
-    @param[in] v  a byte vector in MessagePack format
-    @param[in] start_index the index to start reading from @a v (0 by default)
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from MessagePack were
-    used in the given vector @a v or if the input is not valid MessagePack
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @complexity Linear in the size of the byte vector @a v.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    MessagePack format to a JSON value.,from_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(const std::vector<uint8_t>&, const size_t) for the
-        related CBOR format
-
-    @since version 2.0.9, parameter @a start_index since 2.1.1
-    */
-    static basic_json from_msgpack(const std::vector<uint8_t>& v,
-                                   const size_t start_index = 0)
-    {
-        size_t i = start_index;
-        return from_msgpack_internal(v, i);
-    }
-
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
-    Binary Object Representation) serialization format. CBOR is a binary
-    serialization format which aims to be more compact than JSON itself, yet
-    more efficient to parse.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in CBOR format.,to_cbor}
-
-    @sa http://cbor.io
-    @sa @ref from_cbor(const std::vector<uint8_t>&, const size_t) for the
-        analogous deserialization
-    @sa @ref to_msgpack(const basic_json& for the related MessagePack format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_cbor(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_cbor_internal(j, result);
-        return result;
-    }
-
-    /*!
-    @brief create a JSON value from a byte vector in CBOR format
-
-    Deserializes a given byte vector @a v to a JSON value using the CBOR
-    (Concise Binary Object Representation) serialization format.
-
-    @param[in] v  a byte vector in CBOR format
-    @param[in] start_index the index to start reading from @a v (0 by default)
-    @return deserialized JSON value
-
-    @throw std::invalid_argument if unsupported features from CBOR were used in
-    the given vector @a v or if the input is not valid MessagePack
-    @throw std::out_of_range if the given vector ends prematurely
-
-    @complexity Linear in the size of the byte vector @a v.
-
-    @liveexample{The example shows the deserialization of a byte vector in CBOR
-    format to a JSON value.,from_cbor}
-
-    @sa http://cbor.io
-    @sa @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa @ref from_msgpack(const std::vector<uint8_t>&, const size_t) for the
-        related MessagePack format
-
-    @since version 2.0.9, parameter @a start_index since 2.1.1
-    */
-    static basic_json from_cbor(const std::vector<uint8_t>& v,
-                                const size_t start_index = 0)
-    {
-        size_t i = start_index;
-        return from_cbor_internal(v, i);
-    }
-
-    /// @}
-
     ///////////////////////////
     // convenience functions //
     ///////////////////////////
@@ -8053,16 +19071,31 @@ class basic_json
     Returns the type name as string to be used in error messages - usually to
     indicate that a function was called on a wrong JSON type.
 
-    @return basically a string representation of a the @a m_type member
+    @return a string representation of a the @a m_type member:
+            Value type  | return value
+            ----------- | -------------
+            null        | `"null"`
+            boolean     | `"boolean"`
+            string      | `"string"`
+            number      | `"number"` (for all number types)
+            object      | `"object"`
+            array       | `"array"`
+            discarded   | `"discarded"`
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
 
     @complexity Constant.
 
     @liveexample{The following code exemplifies `type_name()` for all JSON
     types.,type_name}
 
-    @since version 1.0.0, public since 2.1.0
+    @sa @ref type() -- return the type of the JSON value
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+
+    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
+    since 3.0.0
     */
-    std::string type_name() const
+    const char* type_name() const noexcept
     {
         {
             switch (m_type)
@@ -8085,464 +19118,6 @@ class basic_json
         }
     }
 
-  private:
-    /*!
-    @brief calculates the extra space to escape a JSON string
-
-    @param[in] s  the string to escape
-    @return the number of characters required to escape string @a s
-
-    @complexity Linear in the length of string @a s.
-    */
-    static std::size_t extra_space(const string_t& s) noexcept
-    {
-        return std::accumulate(s.begin(), s.end(), size_t{},
-                               [](size_t res, typename string_t::value_type c)
-        {
-            switch (c)
-            {
-                case '"':
-                case '\\':
-                case '\b':
-                case '\f':
-                case '\n':
-                case '\r':
-                case '\t':
-                {
-                    // from c (1 byte) to \x (2 bytes)
-                    return res + 1;
-                }
-
-                default:
-                {
-                    if (c >= 0x00 and c <= 0x1f)
-                    {
-                        // from c (1 byte) to \uxxxx (6 bytes)
-                        return res + 5;
-                    }
-
-                    return res;
-                }
-            }
-        });
-    }
-
-    /*!
-    @brief escape a string
-
-    Escape a string by replacing certain special characters by a sequence of
-    an escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation.
-
-    @param[in] s  the string to escape
-    @return  the escaped string
-
-    @complexity Linear in the length of string @a s.
-    */
-    static string_t escape_string(const string_t& s)
-    {
-        const auto space = extra_space(s);
-        if (space == 0)
-        {
-            return s;
-        }
-
-        // create a result string of necessary size
-        string_t result(s.size() + space, '\\');
-        std::size_t pos = 0;
-
-        for (const auto& c : s)
-        {
-            switch (c)
-            {
-                // quotation mark (0x22)
-                case '"':
-                {
-                    result[pos + 1] = '"';
-                    pos += 2;
-                    break;
-                }
-
-                // reverse solidus (0x5c)
-                case '\\':
-                {
-                    // nothing to change
-                    pos += 2;
-                    break;
-                }
-
-                // backspace (0x08)
-                case '\b':
-                {
-                    result[pos + 1] = 'b';
-                    pos += 2;
-                    break;
-                }
-
-                // formfeed (0x0c)
-                case '\f':
-                {
-                    result[pos + 1] = 'f';
-                    pos += 2;
-                    break;
-                }
-
-                // newline (0x0a)
-                case '\n':
-                {
-                    result[pos + 1] = 'n';
-                    pos += 2;
-                    break;
-                }
-
-                // carriage return (0x0d)
-                case '\r':
-                {
-                    result[pos + 1] = 'r';
-                    pos += 2;
-                    break;
-                }
-
-                // horizontal tab (0x09)
-                case '\t':
-                {
-                    result[pos + 1] = 't';
-                    pos += 2;
-                    break;
-                }
-
-                default:
-                {
-                    if (c >= 0x00 and c <= 0x1f)
-                    {
-                        // convert a number 0..15 to its hex representation
-                        // (0..f)
-                        static const char hexify[16] =
-                        {
-                            '0', '1', '2', '3', '4', '5', '6', '7',
-                            '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-                        };
-
-                        // print character c as \uxxxx
-                        for (const char m :
-                    { 'u', '0', '0', hexify[c >> 4], hexify[c & 0x0f]
-                        })
-                        {
-                            result[++pos] = m;
-                        }
-
-                        ++pos;
-                    }
-                    else
-                    {
-                        // all other characters are added as-is
-                        result[pos++] = c;
-                    }
-                    break;
-                }
-            }
-        }
-
-        return result;
-    }
-
-
-    /*!
-    @brief locale-independent serialization for built-in arithmetic types
-    */
-    struct numtostr
-    {
-      public:
-        template<typename NumberType>
-        numtostr(NumberType value)
-        {
-            x_write(value, std::is_integral<NumberType>());
-        }
-
-        const char* c_str() const
-        {
-            return m_buf.data();
-        }
-
-      private:
-        /// a (hopefully) large enough character buffer
-        std::array < char, 64 > m_buf{{}};
-
-        template<typename NumberType>
-        void x_write(NumberType x, /*is_integral=*/std::true_type)
-        {
-            // special case for "0"
-            if (x == 0)
-            {
-                m_buf[0] = '0';
-                return;
-            }
-
-            const bool is_negative = x < 0;
-            size_t i = 0;
-
-            // spare 1 byte for '\0'
-            while (x != 0 and i < m_buf.size() - 1)
-            {
-                const auto digit = std::labs(static_cast<long>(x % 10));
-                m_buf[i++] = static_cast<char>('0' + digit);
-                x /= 10;
-            }
-
-            // make sure the number has been processed completely
-            assert(x == 0);
-
-            if (is_negative)
-            {
-                // make sure there is capacity for the '-'
-                assert(i < m_buf.size() - 2);
-                m_buf[i++] = '-';
-            }
-
-            std::reverse(m_buf.begin(), m_buf.begin() + i);
-        }
-
-        template<typename NumberType>
-        void x_write(NumberType x, /*is_integral=*/std::false_type)
-        {
-            // special case for 0.0 and -0.0
-            if (x == 0)
-            {
-                size_t i = 0;
-                if (std::signbit(x))
-                {
-                    m_buf[i++] = '-';
-                }
-                m_buf[i++] = '0';
-                m_buf[i++] = '.';
-                m_buf[i] = '0';
-                return;
-            }
-
-            // get number of digits for a text -> float -> text round-trip
-            static constexpr auto d = std::numeric_limits<NumberType>::digits10;
-
-            // the actual conversion
-            const auto written_bytes = snprintf(m_buf.data(), m_buf.size(), "%.*g", d, x);
-
-            // negative value indicates an error
-            assert(written_bytes > 0);
-            // check if buffer was large enough
-            assert(static_cast<size_t>(written_bytes) < m_buf.size());
-
-            // read information from locale
-            const auto loc = localeconv();
-            assert(loc != nullptr);
-            const char thousands_sep = !loc->thousands_sep ? '\0'
-                                       : loc->thousands_sep[0];
-
-            const char decimal_point = !loc->decimal_point ? '\0'
-                                       : loc->decimal_point[0];
-
-            // erase thousands separator
-            if (thousands_sep != '\0')
-            {
-                const auto end = std::remove(m_buf.begin(), m_buf.begin() + written_bytes, thousands_sep);
-                std::fill(end, m_buf.end(), '\0');
-            }
-
-            // convert decimal point to '.'
-            if (decimal_point != '\0' and decimal_point != '.')
-            {
-                for (auto& c : m_buf)
-                {
-                    if (c == decimal_point)
-                    {
-                        c = '.';
-                        break;
-                    }
-                }
-            }
-
-            // determine if need to append ".0"
-            size_t i = 0;
-            bool value_is_int_like = true;
-            for (i = 0; i < m_buf.size(); ++i)
-            {
-                // break when end of number is reached
-                if (m_buf[i] == '\0')
-                {
-                    break;
-                }
-
-                // check if we find non-int character
-                value_is_int_like = value_is_int_like and m_buf[i] != '.' and
-                                    m_buf[i] != 'e' and m_buf[i] != 'E';
-            }
-
-            if (value_is_int_like)
-            {
-                // there must be 2 bytes left for ".0"
-                assert((i + 2) < m_buf.size());
-                // we write to the end of the number
-                assert(m_buf[i] == '\0');
-                assert(m_buf[i - 1] != '\0');
-
-                // add ".0"
-                m_buf[i] = '.';
-                m_buf[i + 1] = '0';
-
-                // the resulting string is properly terminated
-                assert(m_buf[i + 2] == '\0');
-            }
-        }
-    };
-
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serialization internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is
-    called recursively. Note that
-
-    - strings and object keys are escaped using `escape_string()`
-    - integer numbers are converted implicitly via `operator<<`
-    - floating-point numbers are converted to a string using `"%g"` format
-
-    @param[out] o              stream to write to
-    @param[in] pretty_print    whether the output shall be pretty-printed
-    @param[in] indent_step     the indent level
-    @param[in] current_indent  the current indent level (only used internally)
-    */
-    void dump(std::ostream& o,
-              const bool pretty_print,
-              const unsigned int indent_step,
-              const unsigned int current_indent = 0) const
-    {
-        // variable to hold indentation for recursive calls
-        unsigned int new_indent = current_indent;
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                if (m_value.object->empty())
-                {
-                    o << "{}";
-                    return;
-                }
-
-                o << "{";
-
-                // increase indentation
-                if (pretty_print)
-                {
-                    new_indent += indent_step;
-                    o << "\n";
-                }
-
-                for (auto i = m_value.object->cbegin(); i != m_value.object->cend(); ++i)
-                {
-                    if (i != m_value.object->cbegin())
-                    {
-                        o << (pretty_print ? ",\n" : ",");
-                    }
-                    o << string_t(new_indent, ' ') << "\""
-                      << escape_string(i->first) << "\":"
-                      << (pretty_print ? " " : "");
-                    i->second.dump(o, pretty_print, indent_step, new_indent);
-                }
-
-                // decrease indentation
-                if (pretty_print)
-                {
-                    new_indent -= indent_step;
-                    o << "\n";
-                }
-
-                o << string_t(new_indent, ' ') + "}";
-                return;
-            }
-
-            case value_t::array:
-            {
-                if (m_value.array->empty())
-                {
-                    o << "[]";
-                    return;
-                }
-
-                o << "[";
-
-                // increase indentation
-                if (pretty_print)
-                {
-                    new_indent += indent_step;
-                    o << "\n";
-                }
-
-                for (auto i = m_value.array->cbegin(); i != m_value.array->cend(); ++i)
-                {
-                    if (i != m_value.array->cbegin())
-                    {
-                        o << (pretty_print ? ",\n" : ",");
-                    }
-                    o << string_t(new_indent, ' ');
-                    i->dump(o, pretty_print, indent_step, new_indent);
-                }
-
-                // decrease indentation
-                if (pretty_print)
-                {
-                    new_indent -= indent_step;
-                    o << "\n";
-                }
-
-                o << string_t(new_indent, ' ') << "]";
-                return;
-            }
-
-            case value_t::string:
-            {
-                o << string_t("\"") << escape_string(*m_value.string) << "\"";
-                return;
-            }
-
-            case value_t::boolean:
-            {
-                o << (m_value.boolean ? "true" : "false");
-                return;
-            }
-
-            case value_t::number_integer:
-            {
-                o << numtostr(m_value.number_integer).c_str();
-                return;
-            }
-
-            case value_t::number_unsigned:
-            {
-                o << numtostr(m_value.number_unsigned).c_str();
-                return;
-            }
-
-            case value_t::number_float:
-            {
-                o << numtostr(m_value.number_float).c_str();
-                return;
-            }
-
-            case value_t::discarded:
-            {
-                o << "<discarded>";
-                return;
-            }
-
-            case value_t::null:
-            {
-                o << "null";
-                return;
-            }
-        }
-    }
 
   private:
     //////////////////////
@@ -8555,3691 +19130,814 @@ class basic_json
     /// the value of the current element
     json_value m_value = {};
 
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
 
-  private:
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /*!
-    @brief an iterator for primitive JSON types
-
-    This class models an iterator for primitive JSON types (boolean, number,
-    string). It's only purpose is to allow the iterator/const_iterator classes
-    to "iterate" over primitive values. Internally, the iterator is modeled by
-    a `difference_type` variable. Value begin_value (`0`) models the begin,
-    end_value (`1`) models past the end.
-    */
-    class primitive_iterator_t
-    {
-      public:
-
-        difference_type get_value() const noexcept
-        {
-            return m_it;
-        }
-        /// set iterator to a defined beginning
-        void set_begin() noexcept
-        {
-            m_it = begin_value;
-        }
-
-        /// set iterator to a defined past the end
-        void set_end() noexcept
-        {
-            m_it = end_value;
-        }
-
-        /// return whether the iterator can be dereferenced
-        constexpr bool is_begin() const noexcept
-        {
-            return (m_it == begin_value);
-        }
-
-        /// return whether the iterator is at end
-        constexpr bool is_end() const noexcept
-        {
-            return (m_it == end_value);
-        }
-
-        friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it == rhs.m_it;
-        }
-
-        friend constexpr bool operator!=(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return !(lhs == rhs);
-        }
-
-        friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it < rhs.m_it;
-        }
-
-        friend constexpr bool operator<=(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it <= rhs.m_it;
-        }
-
-        friend constexpr bool operator>(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it > rhs.m_it;
-        }
-
-        friend constexpr bool operator>=(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it >= rhs.m_it;
-        }
-
-        primitive_iterator_t operator+(difference_type i)
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-        {
-            return lhs.m_it - rhs.m_it;
-        }
-
-        friend std::ostream& operator<<(std::ostream& os, primitive_iterator_t it)
-        {
-            return os << it.m_it;
-        }
-
-        primitive_iterator_t& operator++()
-        {
-            ++m_it;
-            return *this;
-        }
-
-        primitive_iterator_t operator++(int)
-        {
-            auto result = *this;
-            m_it++;
-            return result;
-        }
-
-        primitive_iterator_t& operator--()
-        {
-            --m_it;
-            return *this;
-        }
-
-        primitive_iterator_t operator--(int)
-        {
-            auto result = *this;
-            m_it--;
-            return result;
-        }
-
-        primitive_iterator_t& operator+=(difference_type n)
-        {
-            m_it += n;
-            return *this;
-        }
-
-        primitive_iterator_t& operator-=(difference_type n)
-        {
-            m_it -= n;
-            return *this;
-        }
-
-      private:
-        static constexpr difference_type begin_value = 0;
-        static constexpr difference_type end_value = begin_value + 1;
-
-        /// iterator as signed integer type
-        difference_type m_it = std::numeric_limits<std::ptrdiff_t>::denorm_min();
-    };
-
-    /*!
-    @brief an iterator value
-
-    @note This structure could easily be a union, but MSVC currently does not
-    allow unions members with complex constructors, see
-    https://github.com/nlohmann/json/pull/105.
-    */
-    struct internal_iterator
-    {
-        /// iterator for JSON objects
-        typename object_t::iterator object_iterator;
-        /// iterator for JSON arrays
-        typename array_t::iterator array_iterator;
-        /// generic iterator for all other types
-        primitive_iterator_t primitive_iterator;
-
-        /// create an uninitialized internal_iterator
-        internal_iterator() noexcept
-            : object_iterator(), array_iterator(), primitive_iterator()
-        {}
-    };
-
-    /// proxy class for the iterator_wrapper functions
-    template<typename IteratorType>
-    class iteration_proxy
-    {
-      private:
-        /// helper class for iteration
-        class iteration_proxy_internal
-        {
-          private:
-            /// the iterator
-            IteratorType anchor;
-            /// an index for arrays (used to create key names)
-            size_t array_index = 0;
-
-          public:
-            explicit iteration_proxy_internal(IteratorType it) noexcept
-                : anchor(it)
-            {}
-
-            /// dereference operator (needed for range-based for)
-            iteration_proxy_internal& operator*()
-            {
-                return *this;
-            }
-
-            /// increment operator (needed for range-based for)
-            iteration_proxy_internal& operator++()
-            {
-                ++anchor;
-                ++array_index;
-
-                return *this;
-            }
-
-            /// inequality operator (needed for range-based for)
-            bool operator!= (const iteration_proxy_internal& o) const
-            {
-                return anchor != o.anchor;
-            }
-
-            /// return key of the iterator
-            typename basic_json::string_t key() const
-            {
-                assert(anchor.m_object != nullptr);
-
-                switch (anchor.m_object->type())
-                {
-                    // use integer array index as key
-                    case value_t::array:
-                    {
-                        return std::to_string(array_index);
-                    }
-
-                    // use key from the object
-                    case value_t::object:
-                    {
-                        return anchor.key();
-                    }
-
-                    // use an empty key for all primitive types
-                    default:
-                    {
-                        return "";
-                    }
-                }
-            }
-
-            /// return value of the iterator
-            typename IteratorType::reference value() const
-            {
-                return anchor.value();
-            }
-        };
-
-        /// the container to iterate
-        typename IteratorType::reference container;
-
-      public:
-        /// construct iteration proxy from a container
-        explicit iteration_proxy(typename IteratorType::reference cont)
-            : container(cont)
-        {}
-
-        /// return iterator begin (needed for range-based for)
-        iteration_proxy_internal begin() noexcept
-        {
-            return iteration_proxy_internal(container.begin());
-        }
-
-        /// return iterator end (needed for range-based for)
-        iteration_proxy_internal end() noexcept
-        {
-            return iteration_proxy_internal(container.end());
-        }
-    };
+    /// @name binary serialization/deserialization support
+    /// @{
 
   public:
     /*!
-    @brief a template for a random access iterator for the @ref basic_json class
+    @brief create a CBOR serialization of a given JSON value
 
-    This class implements a both iterators (iterator and const_iterator) for the
-    @ref basic_json class.
+    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
+    Binary Object Representation) serialization format. CBOR is a binary
+    serialization format which aims to be more compact than JSON itself, yet
+    more efficient to parse.
 
-    @note An iterator is called *initialized* when a pointer to a JSON value
-          has been set (e.g., by a constructor or a copy assignment). If the
-          iterator is default-constructed, it is *uninitialized* and most
-          methods are undefined. **The library uses assertions to detect calls
-          on uninitialized iterators.**
+    The library uses the following mapping from JSON values types to
+    CBOR types according to the CBOR specification (RFC 7049):
 
-    @requirement The class satisfies the following concept requirements:
-    - [RandomAccessIterator](http://en.cppreference.com/w/cpp/concept/RandomAccessIterator):
-      The iterator that can be moved to point (forward and backward) to any
-      element in constant time.
+    JSON value type | value/range                                | CBOR type                          | first byte
+    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
+    null            | `null`                                     | Null                               | 0xF6
+    boolean         | `true`                                     | True                               | 0xF5
+    boolean         | `false`                                    | False                              | 0xF4
+    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
+    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
+    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
+    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
+    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
+    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
+    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
+    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_float    | *any value*                                | Double-Precision Float             | 0xFB
+    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
+    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
+    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
+    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
+    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
+    array           | *size*: 0..23                              | array                              | 0x80..0x97
+    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
+    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
+    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
+    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
+    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
+    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
+    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
+    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
+    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
 
-    @since version 1.0.0, simplified in version 2.0.9
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a CBOR value.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The following CBOR types are not used in the conversion:
+          - byte strings (0x40..0x5F)
+          - UTF-8 strings terminated by "break" (0x7F)
+          - arrays terminated by "break" (0x9F)
+          - maps terminated by "break" (0xBF)
+          - date/time (0xC0..0xC1)
+          - bignum (0xC2..0xC3)
+          - decimal fraction (0xC4)
+          - bigfloat (0xC5)
+          - tagged items (0xC6..0xD4, 0xD8..0xDB)
+          - expected conversions (0xD5..0xD7)
+          - simple values (0xE0..0xF3, 0xF8)
+          - undefined (0xF7)
+          - half and single-precision floats (0xF9-0xFA)
+          - break (0xFF)
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in CBOR format.,to_cbor}
+
+    @sa http://cbor.io
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
     */
-    template<typename U>
-    class iter_impl : public std::iterator<std::random_access_iterator_tag, U>
+    static std::vector<uint8_t> to_cbor(const basic_json& j)
     {
-        /// allow basic_json to access private members
-        friend class basic_json;
-
-        // make sure U is basic_json or const basic_json
-        static_assert(std::is_same<U, basic_json>::value
-                      or std::is_same<U, const basic_json>::value,
-                      "iter_impl only accepts (const) basic_json");
-
-      public:
-        /// the type of the values when the iterator is dereferenced
-        using value_type = typename basic_json::value_type;
-        /// a type to represent differences between iterators
-        using difference_type = typename basic_json::difference_type;
-        /// defines a pointer to the type iterated over (value_type)
-        using pointer = typename std::conditional<std::is_const<U>::value,
-              typename basic_json::const_pointer,
-              typename basic_json::pointer>::type;
-        /// defines a reference to the type iterated over (value_type)
-        using reference = typename std::conditional<std::is_const<U>::value,
-              typename basic_json::const_reference,
-              typename basic_json::reference>::type;
-        /// the category of the iterator
-        using iterator_category = std::bidirectional_iterator_tag;
-
-        /// default constructor
-        iter_impl() = default;
-
-        /*!
-        @brief constructor for a given JSON instance
-        @param[in] object  pointer to a JSON object for this iterator
-        @pre object != nullptr
-        @post The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        explicit iter_impl(pointer object) noexcept
-            : m_object(object)
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    m_it.object_iterator = typename object_t::iterator();
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    m_it.array_iterator = typename array_t::iterator();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator = primitive_iterator_t();
-                    break;
-                }
-            }
-        }
-
-        /*
-        Use operator `const_iterator` instead of `const_iterator(const iterator&
-        other) noexcept` to avoid two class definitions for @ref iterator and
-        @ref const_iterator.
-
-        This function is only called if this class is an @ref iterator. If this
-        class is a @ref const_iterator this function is not called.
-        */
-        operator const_iterator() const
-        {
-            const_iterator ret;
-
-            if (m_object)
-            {
-                ret.m_object = m_object;
-                ret.m_it = m_it;
-            }
-
-            return ret;
-        }
-
-        /*!
-        @brief copy constructor
-        @param[in] other  iterator to copy from
-        @note It is not checked whether @a other is initialized.
-        */
-        iter_impl(const iter_impl& other) noexcept
-            : m_object(other.m_object), m_it(other.m_it)
-        {}
-
-        /*!
-        @brief copy assignment
-        @param[in,out] other  iterator to copy from
-        @note It is not checked whether @a other is initialized.
-        */
-        iter_impl& operator=(iter_impl other) noexcept(
-            std::is_nothrow_move_constructible<pointer>::value and
-            std::is_nothrow_move_assignable<pointer>::value and
-            std::is_nothrow_move_constructible<internal_iterator>::value and
-            std::is_nothrow_move_assignable<internal_iterator>::value
-        )
-        {
-            std::swap(m_object, other.m_object);
-            std::swap(m_it, other.m_it);
-            return *this;
-        }
-
-      private:
-        /*!
-        @brief set the iterator to the first value
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        void set_begin() noexcept
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    m_it.object_iterator = m_object->m_value.object->begin();
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    m_it.array_iterator = m_object->m_value.array->begin();
-                    break;
-                }
-
-                case basic_json::value_t::null:
-                {
-                    // set to end so begin()==end() is true: null is empty
-                    m_it.primitive_iterator.set_end();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator.set_begin();
-                    break;
-                }
-            }
-        }
-
-        /*!
-        @brief set the iterator past the last value
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        void set_end() noexcept
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    m_it.object_iterator = m_object->m_value.object->end();
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    m_it.array_iterator = m_object->m_value.array->end();
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator.set_end();
-                    break;
-                }
-            }
-        }
-
-      public:
-        /*!
-        @brief return a reference to the value pointed to by the iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        reference operator*() const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    assert(m_it.object_iterator != m_object->m_value.object->end());
-                    return m_it.object_iterator->second;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    assert(m_it.array_iterator != m_object->m_value.array->end());
-                    return *m_it.array_iterator;
-                }
-
-                case basic_json::value_t::null:
-                {
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-
-                default:
-                {
-                    if (m_it.primitive_iterator.is_begin())
-                    {
-                        return *m_object;
-                    }
-
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-            }
-        }
-
-        /*!
-        @brief dereference the iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        pointer operator->() const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    assert(m_it.object_iterator != m_object->m_value.object->end());
-                    return &(m_it.object_iterator->second);
-                }
-
-                case basic_json::value_t::array:
-                {
-                    assert(m_it.array_iterator != m_object->m_value.array->end());
-                    return &*m_it.array_iterator;
-                }
-
-                default:
-                {
-                    if (m_it.primitive_iterator.is_begin())
-                    {
-                        return m_object;
-                    }
-
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-            }
-        }
-
-        /*!
-        @brief post-increment (it++)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator++(int)
-        {
-            auto result = *this;
-            ++(*this);
-            return result;
-        }
-
-        /*!
-        @brief pre-increment (++it)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator++()
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    std::advance(m_it.object_iterator, 1);
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    std::advance(m_it.array_iterator, 1);
-                    break;
-                }
-
-                default:
-                {
-                    ++m_it.primitive_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /*!
-        @brief post-decrement (it--)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator--(int)
-        {
-            auto result = *this;
-            --(*this);
-            return result;
-        }
-
-        /*!
-        @brief pre-decrement (--it)
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator--()
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    std::advance(m_it.object_iterator, -1);
-                    break;
-                }
-
-                case basic_json::value_t::array:
-                {
-                    std::advance(m_it.array_iterator, -1);
-                    break;
-                }
-
-                default:
-                {
-                    --m_it.primitive_iterator;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /*!
-        @brief  comparison: equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator==(const iter_impl& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                JSON_THROW(std::domain_error("cannot compare iterators of different containers"));
-            }
-
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    return (m_it.object_iterator == other.m_it.object_iterator);
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return (m_it.array_iterator == other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.primitive_iterator == other.m_it.primitive_iterator);
-                }
-            }
-        }
-
-        /*!
-        @brief  comparison: not equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator!=(const iter_impl& other) const
-        {
-            return not operator==(other);
-        }
-
-        /*!
-        @brief  comparison: smaller
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator<(const iter_impl& other) const
-        {
-            // if objects are not the same, the comparison is undefined
-            if (m_object != other.m_object)
-            {
-                JSON_THROW(std::domain_error("cannot compare iterators of different containers"));
-            }
-
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot compare order of object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return (m_it.array_iterator < other.m_it.array_iterator);
-                }
-
-                default:
-                {
-                    return (m_it.primitive_iterator < other.m_it.primitive_iterator);
-                }
-            }
-        }
-
-        /*!
-        @brief  comparison: less than or equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator<=(const iter_impl& other) const
-        {
-            return not other.operator < (*this);
-        }
-
-        /*!
-        @brief  comparison: greater than
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator>(const iter_impl& other) const
-        {
-            return not operator<=(other);
-        }
-
-        /*!
-        @brief  comparison: greater than or equal
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        bool operator>=(const iter_impl& other) const
-        {
-            return not operator<(other);
-        }
-
-        /*!
-        @brief  add to iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator+=(difference_type i)
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot use offsets with object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    std::advance(m_it.array_iterator, i);
-                    break;
-                }
-
-                default:
-                {
-                    m_it.primitive_iterator += i;
-                    break;
-                }
-            }
-
-            return *this;
-        }
-
-        /*!
-        @brief  subtract from iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl& operator-=(difference_type i)
-        {
-            return operator+=(-i);
-        }
-
-        /*!
-        @brief  add to iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator+(difference_type i)
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        /*!
-        @brief  subtract from iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        iter_impl operator-(difference_type i)
-        {
-            auto result = *this;
-            result -= i;
-            return result;
-        }
-
-        /*!
-        @brief  return difference
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        difference_type operator-(const iter_impl& other) const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot use offsets with object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return m_it.array_iterator - other.m_it.array_iterator;
-                }
-
-                default:
-                {
-                    return m_it.primitive_iterator - other.m_it.primitive_iterator;
-                }
-            }
-        }
-
-        /*!
-        @brief  access to successor
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        reference operator[](difference_type n) const
-        {
-            assert(m_object != nullptr);
-
-            switch (m_object->m_type)
-            {
-                case basic_json::value_t::object:
-                {
-                    JSON_THROW(std::domain_error("cannot use operator[] for object iterators"));
-                }
-
-                case basic_json::value_t::array:
-                {
-                    return *std::next(m_it.array_iterator, n);
-                }
-
-                case basic_json::value_t::null:
-                {
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-
-                default:
-                {
-                    if (m_it.primitive_iterator.get_value() == -n)
-                    {
-                        return *m_object;
-                    }
-
-                    JSON_THROW(std::out_of_range("cannot get value"));
-                }
-            }
-        }
-
-        /*!
-        @brief  return the key of an object iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        typename object_t::key_type key() const
-        {
-            assert(m_object != nullptr);
-
-            if (m_object->is_object())
-            {
-                return m_it.object_iterator->first;
-            }
-
-            JSON_THROW(std::domain_error("cannot use key() for non-object iterators"));
-        }
-
-        /*!
-        @brief  return the value of an iterator
-        @pre The iterator is initialized; i.e. `m_object != nullptr`.
-        */
-        reference value() const
-        {
-            return operator*();
-        }
-
-      private:
-        /// associated JSON instance
-        pointer m_object = nullptr;
-        /// the actual iterator of the associated instance
-        internal_iterator m_it = internal_iterator();
-    };
+        std::vector<uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_cbor(j);
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
 
     /*!
-    @brief a template for a reverse iterator class
+    @brief create a MessagePack serialization of a given JSON value
 
-    @tparam Base the base iterator type to reverse. Valid types are @ref
-    iterator (to create @ref reverse_iterator) and @ref const_iterator (to
-    create @ref const_reverse_iterator).
+    Serializes a given JSON value @a j to a byte vector using the MessagePack
+    serialization format. MessagePack is a binary serialization format which
+    aims to be more compact than JSON itself, yet more efficient to parse.
 
-    @requirement The class satisfies the following concept requirements:
-    - [RandomAccessIterator](http://en.cppreference.com/w/cpp/concept/RandomAccessIterator):
-      The iterator that can be moved to point (forward and backward) to any
-      element in constant time.
-    - [OutputIterator](http://en.cppreference.com/w/cpp/concept/OutputIterator):
-      It is possible to write to the pointed-to element (only if @a Base is
-      @ref iterator).
+    The library uses the following mapping from JSON values types to
+    MessagePack types according to the MessagePack specification:
 
-    @since version 1.0.0
+    JSON value type | value/range                       | MessagePack type | first byte
+    --------------- | --------------------------------- | ---------------- | ----------
+    null            | `null`                            | nil              | 0xC0
+    boolean         | `true`                            | true             | 0xC3
+    boolean         | `false`                           | false            | 0xC2
+    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
+    number_integer  | -2147483648..-32769               | int32            | 0xD2
+    number_integer  | -32768..-129                      | int16            | 0xD1
+    number_integer  | -128..-33                         | int8             | 0xD0
+    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
+    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
+    number_integer  | 128..255                          | uint 8           | 0xCC
+    number_integer  | 256..65535                        | uint 16          | 0xCD
+    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
+    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
+    number_unsigned | 128..255                          | uint 8           | 0xCC
+    number_unsigned | 256..65535                        | uint 16          | 0xCD
+    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
+    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_float    | *any value*                       | float 64         | 0xCB
+    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
+    string          | *length*: 32..255                 | str 8            | 0xD9
+    string          | *length*: 256..65535              | str 16           | 0xDA
+    string          | *length*: 65536..4294967295       | str 32           | 0xDB
+    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
+    array           | *size*: 16..65535                 | array 16         | 0xDC
+    array           | *size*: 65536..4294967295         | array 32         | 0xDD
+    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
+    object          | *size*: 16..65535                 | map 16           | 0xDE
+    object          | *size*: 65536..4294967295         | map 32           | 0xDF
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a MessagePack value.
+
+    @note The following values can **not** be converted to a MessagePack value:
+          - strings with more than 4294967295 bytes
+          - arrays with more than 4294967295 elements
+          - objects with more than 4294967295 elements
+
+    @note The following MessagePack types are not used in the conversion:
+          - bin 8 - bin 32 (0xC4..0xC6)
+          - ext 8 - ext 32 (0xC7..0xC9)
+          - float 32 (0xCA)
+          - fixext 1 - fixext 16 (0xD4..0xD8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in MessagePack format.,to_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref from_msgpack for the analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
     */
-    template<typename Base>
-    class json_reverse_iterator : public std::reverse_iterator<Base>
+    static std::vector<uint8_t> to_msgpack(const basic_json& j)
     {
-      public:
-        /// shortcut to the reverse iterator adaptor
-        using base_iterator = std::reverse_iterator<Base>;
-        /// the reference type for the pointed-to element
-        using reference = typename Base::reference;
+        std::vector<uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
 
-        /// create reverse iterator from iterator
-        json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
-            : base_iterator(it)
-        {}
+    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_msgpack(j);
+    }
 
-        /// create reverse iterator from base class
-        json_reverse_iterator(const base_iterator& it) noexcept
-            : base_iterator(it)
-        {}
-
-        /// post-increment (it++)
-        json_reverse_iterator operator++(int)
-        {
-            return base_iterator::operator++(1);
-        }
-
-        /// pre-increment (++it)
-        json_reverse_iterator& operator++()
-        {
-            base_iterator::operator++();
-            return *this;
-        }
-
-        /// post-decrement (it--)
-        json_reverse_iterator operator--(int)
-        {
-            return base_iterator::operator--(1);
-        }
-
-        /// pre-decrement (--it)
-        json_reverse_iterator& operator--()
-        {
-            base_iterator::operator--();
-            return *this;
-        }
-
-        /// add to iterator
-        json_reverse_iterator& operator+=(difference_type i)
-        {
-            base_iterator::operator+=(i);
-            return *this;
-        }
-
-        /// add to iterator
-        json_reverse_iterator operator+(difference_type i) const
-        {
-            auto result = *this;
-            result += i;
-            return result;
-        }
-
-        /// subtract from iterator
-        json_reverse_iterator operator-(difference_type i) const
-        {
-            auto result = *this;
-            result -= i;
-            return result;
-        }
-
-        /// return difference
-        difference_type operator-(const json_reverse_iterator& other) const
-        {
-            return this->base() - other.base();
-        }
-
-        /// access to successor
-        reference operator[](difference_type n) const
-        {
-            return *(this->operator+(n));
-        }
-
-        /// return the key of an object iterator
-        typename object_t::key_type key() const
-        {
-            auto it = --this->base();
-            return it.key();
-        }
-
-        /// return the value of an iterator
-        reference value() const
-        {
-            auto it = --this->base();
-            return it.operator * ();
-        }
-    };
-
-
-  private:
-    //////////////////////
-    // lexer and parser //
-    //////////////////////
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
 
     /*!
-    @brief lexical analysis
+    @brief create a UBJSON serialization of a given JSON value
 
-    This class organizes the lexical analysis during JSON deserialization. The
-    core of it is a scanner generated by [re2c](http://re2c.org) that
-    processes a buffer and recognizes tokens according to RFC 7159.
+    Serializes a given JSON value @a j to a byte vector using the UBJSON
+    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
+    than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    UBJSON types according to the UBJSON specification:
+
+    JSON value type | value/range                       | UBJSON type | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | `Z`
+    boolean         | `true`                            | true        | `T`
+    boolean         | `false`                           | false       | `F`
+    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
+    number_integer  | -2147483648..-32769               | int32       | `l`
+    number_integer  | -32768..-129                      | int16       | `I`
+    number_integer  | -128..127                         | int8        | `i`
+    number_integer  | 128..255                          | uint8       | `U`
+    number_integer  | 256..32767                        | int16       | `I`
+    number_integer  | 32768..2147483647                 | int32       | `l`
+    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
+    number_unsigned | 0..127                            | int8        | `i`
+    number_unsigned | 128..255                          | uint8       | `U`
+    number_unsigned | 256..32767                        | int16       | `I`
+    number_unsigned | 32768..2147483647                 | int32       | `l`
+    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
+    number_float    | *any value*                       | float64     | `D`
+    string          | *with shortest length indicator*  | string      | `S`
+    array           | *see notes on optimized format*   | array       | `[`
+    object          | *see notes on optimized format*   | map         | `{`
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a UBJSON value.
+
+    @note The following values can **not** be converted to a UBJSON value:
+          - strings with more than 9223372036854775807 bytes (theoretical)
+          - unsigned integer numbers above 9223372036854775807
+
+    @note The following markers are not used in the conversion:
+          - `Z`: no-op values are not created.
+          - `C`: single-byte strings are serialized with `S` markers.
+
+    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
+          by @ref from_ubjson.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The optimized formats for containers are supported: Parameter
+          @a use_size adds size information to the beginning of a container and
+          removes the closing marker. Parameter @a use_type further checks
+          whether all elements of a container have the same type and adds the
+          type marker to the beginning of the container. The @a use_type
+          parameter must only be used together with @a use_size = true. Note
+          that @a use_size = true alone may result in larger representations -
+          the benefit of this parameter is that the receiving side is
+          immediately informed on the number of elements of the container.
+
+    @param[in] j  JSON value to serialize
+    @param[in] use_size  whether to add size annotations to container types
+    @param[in] use_type  whether to add type annotations to container types
+                         (must be combined with @a use_size = true)
+    @return UBJSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in UBJSON format.,to_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+
+    @since version 3.1.0
     */
-    class lexer
+    static std::vector<uint8_t> to_ubjson(const basic_json& j,
+                                          const bool use_size = false,
+                                          const bool use_type = false)
     {
-      public:
-        /// token types for the parser
-        enum class token_type
-        {
-            uninitialized,   ///< indicating the scanner is uninitialized
-            literal_true,    ///< the `true` literal
-            literal_false,   ///< the `false` literal
-            literal_null,    ///< the `null` literal
-            value_string,    ///< a string -- use get_string() for actual value
-            value_unsigned,  ///< an unsigned integer -- use get_number() for actual value
-            value_integer,   ///< a signed integer -- use get_number() for actual value
-            value_float,     ///< an floating point number -- use get_number() for actual value
-            begin_array,     ///< the character for array begin `[`
-            begin_object,    ///< the character for object begin `{`
-            end_array,       ///< the character for array end `]`
-            end_object,      ///< the character for object end `}`
-            name_separator,  ///< the name separator `:`
-            value_separator, ///< the value separator `,`
-            parse_error,     ///< indicating a parse error
-            end_of_input     ///< indicating the end of the input buffer
-        };
+        std::vector<uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
 
-        /// the char type to use in the lexer
-        using lexer_char_t = unsigned char;
-
-        /// a lexer from a buffer with given length
-        lexer(const lexer_char_t* buff, const size_t len) noexcept
-            : m_content(buff)
-        {
-            assert(m_content != nullptr);
-            m_start = m_cursor = m_content;
-            m_limit = m_content + len;
-        }
-
-        /// a lexer from an input stream
-        explicit lexer(std::istream& s)
-            : m_stream(&s), m_line_buffer()
-        {
-            // immediately abort if stream is erroneous
-            if (s.fail())
-            {
-                JSON_THROW(std::invalid_argument("stream error"));
-            }
-
-            // fill buffer
-            fill_line_buffer();
-
-            // skip UTF-8 byte-order mark
-            if (m_line_buffer.size() >= 3 and m_line_buffer.substr(0, 3) == "\xEF\xBB\xBF")
-            {
-                m_line_buffer[0] = ' ';
-                m_line_buffer[1] = ' ';
-                m_line_buffer[2] = ' ';
-            }
-        }
-
-        // switch off unwanted functions (due to pointer members)
-        lexer() = delete;
-        lexer(const lexer&) = delete;
-        lexer operator=(const lexer&) = delete;
-
-        /*!
-        @brief create a string from one or two Unicode code points
-
-        There are two cases: (1) @a codepoint1 is in the Basic Multilingual
-        Plane (U+0000 through U+FFFF) and @a codepoint2 is 0, or (2)
-        @a codepoint1 and @a codepoint2 are a UTF-16 surrogate pair to
-        represent a code point above U+FFFF.
-
-        @param[in] codepoint1  the code point (can be high surrogate)
-        @param[in] codepoint2  the code point (can be low surrogate or 0)
-
-        @return string representation of the code point; the length of the
-        result string is between 1 and 4 characters.
-
-        @throw std::out_of_range if code point is > 0x10ffff; example: `"code
-        points above 0x10FFFF are invalid"`
-        @throw std::invalid_argument if the low surrogate is invalid; example:
-        `""missing or wrong low surrogate""`
-
-        @complexity Constant.
-
-        @see <http://en.wikipedia.org/wiki/UTF-8#Sample_code>
-        */
-        static string_t to_unicode(const std::size_t codepoint1,
-                                   const std::size_t codepoint2 = 0)
-        {
-            // calculate the code point from the given code points
-            std::size_t codepoint = codepoint1;
-
-            // check if codepoint1 is a high surrogate
-            if (codepoint1 >= 0xD800 and codepoint1 <= 0xDBFF)
-            {
-                // check if codepoint2 is a low surrogate
-                if (codepoint2 >= 0xDC00 and codepoint2 <= 0xDFFF)
-                {
-                    codepoint =
-                        // high surrogate occupies the most significant 22 bits
-                        (codepoint1 << 10)
-                        // low surrogate occupies the least significant 15 bits
-                        + codepoint2
-                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                        // in the result so we have to subtract with:
-                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                        - 0x35FDC00;
-                }
-                else
-                {
-                    JSON_THROW(std::invalid_argument("missing or wrong low surrogate"));
-                }
-            }
-
-            string_t result;
-
-            if (codepoint < 0x80)
-            {
-                // 1-byte characters: 0xxxxxxx (ASCII)
-                result.append(1, static_cast<typename string_t::value_type>(codepoint));
-            }
-            else if (codepoint <= 0x7ff)
-            {
-                // 2-byte characters: 110xxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xC0 | ((codepoint >> 6) & 0x1F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else if (codepoint <= 0xffff)
-            {
-                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xE0 | ((codepoint >> 12) & 0x0F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 6) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else if (codepoint <= 0x10ffff)
-            {
-                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                result.append(1, static_cast<typename string_t::value_type>(0xF0 | ((codepoint >> 18) & 0x07)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 12) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | ((codepoint >> 6) & 0x3F)));
-                result.append(1, static_cast<typename string_t::value_type>(0x80 | (codepoint & 0x3F)));
-            }
-            else
-            {
-                JSON_THROW(std::out_of_range("code points above 0x10FFFF are invalid"));
-            }
-
-            return result;
-        }
-
-        /// return name of values of type token_type (only used for errors)
-        static std::string token_type_name(const token_type t)
-        {
-            switch (t)
-            {
-                case token_type::uninitialized:
-                    return "<uninitialized>";
-                case token_type::literal_true:
-                    return "true literal";
-                case token_type::literal_false:
-                    return "false literal";
-                case token_type::literal_null:
-                    return "null literal";
-                case token_type::value_string:
-                    return "string literal";
-                case lexer::token_type::value_unsigned:
-                case lexer::token_type::value_integer:
-                case lexer::token_type::value_float:
-                    return "number literal";
-                case token_type::begin_array:
-                    return "'['";
-                case token_type::begin_object:
-                    return "'{'";
-                case token_type::end_array:
-                    return "']'";
-                case token_type::end_object:
-                    return "'}'";
-                case token_type::name_separator:
-                    return "':'";
-                case token_type::value_separator:
-                    return "','";
-                case token_type::parse_error:
-                    return "<parse error>";
-                case token_type::end_of_input:
-                    return "end of input";
-                default:
-                {
-                    // catch non-enum values
-                    return "unknown token"; // LCOV_EXCL_LINE
-                }
-            }
-        }
-
-        /*!
-        This function implements a scanner for JSON. It is specified using
-        regular expressions that try to follow RFC 7159 as close as possible.
-        These regular expressions are then translated into a minimized
-        deterministic finite automaton (DFA) by the tool
-        [re2c](http://re2c.org). As a result, the translated code for this
-        function consists of a large block of code with `goto` jumps.
-
-        @return the class of the next token read from the buffer
-
-        @complexity Linear in the length of the input.\n
-
-        Proposition: The loop below will always terminate for finite input.\n
-
-        Proof (by contradiction): Assume a finite input. To loop forever, the
-        loop must never hit code with a `break` statement. The only code
-        snippets without a `break` statement are the continue statements for
-        whitespace and byte-order-marks. To loop forever, the input must be an
-        infinite sequence of whitespace or byte-order-marks. This contradicts
-        the assumption of finite input, q.e.d.
-        */
-        token_type scan()
-        {
-            while (true)
-            {
-                // pointer for backtracking information
-                m_marker = nullptr;
-
-                // remember the begin of the token
-                m_start = m_cursor;
-                assert(m_start != nullptr);
-
-
-                {
-                    lexer_char_t yych;
-                    unsigned int yyaccept = 0;
-                    static const unsigned char yybm[] =
-                    {
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,  32,  32,   0,   0,  32,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        160, 128,   0, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        192, 192, 192, 192, 192, 192, 192, 192,
-                        192, 192, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128,   0, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        128, 128, 128, 128, 128, 128, 128, 128,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                        0,   0,   0,   0,   0,   0,   0,   0,
-                    };
-                    if ((m_limit - m_cursor) < 5)
-                    {
-                        fill_line_buffer(5);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yybm[0 + yych] & 32)
-                    {
-                        goto basic_json_parser_6;
-                    }
-                    if (yych <= '[')
-                    {
-                        if (yych <= '-')
-                        {
-                            if (yych <= '"')
-                            {
-                                if (yych <= 0x00)
-                                {
-                                    goto basic_json_parser_2;
-                                }
-                                if (yych <= '!')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                goto basic_json_parser_9;
-                            }
-                            else
-                            {
-                                if (yych <= '+')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                if (yych <= ',')
-                                {
-                                    goto basic_json_parser_10;
-                                }
-                                goto basic_json_parser_12;
-                            }
-                        }
-                        else
-                        {
-                            if (yych <= '9')
-                            {
-                                if (yych <= '/')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                if (yych <= '0')
-                                {
-                                    goto basic_json_parser_13;
-                                }
-                                goto basic_json_parser_15;
-                            }
-                            else
-                            {
-                                if (yych <= ':')
-                                {
-                                    goto basic_json_parser_17;
-                                }
-                                if (yych <= 'Z')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                goto basic_json_parser_19;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'n')
-                        {
-                            if (yych <= 'e')
-                            {
-                                if (yych == ']')
-                                {
-                                    goto basic_json_parser_21;
-                                }
-                                goto basic_json_parser_4;
-                            }
-                            else
-                            {
-                                if (yych <= 'f')
-                                {
-                                    goto basic_json_parser_23;
-                                }
-                                if (yych <= 'm')
-                                {
-                                    goto basic_json_parser_4;
-                                }
-                                goto basic_json_parser_24;
-                            }
-                        }
-                        else
-                        {
-                            if (yych <= 'z')
-                            {
-                                if (yych == 't')
-                                {
-                                    goto basic_json_parser_25;
-                                }
-                                goto basic_json_parser_4;
-                            }
-                            else
-                            {
-                                if (yych <= '{')
-                                {
-                                    goto basic_json_parser_26;
-                                }
-                                if (yych == '}')
-                                {
-                                    goto basic_json_parser_28;
-                                }
-                                goto basic_json_parser_4;
-                            }
-                        }
-                    }
-basic_json_parser_2:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::end_of_input;
-                        break;
-                    }
-basic_json_parser_4:
-                    ++m_cursor;
-basic_json_parser_5:
-                    {
-                        last_token_type = token_type::parse_error;
-                        break;
-                    }
-basic_json_parser_6:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yybm[0 + yych] & 32)
-                    {
-                        goto basic_json_parser_6;
-                    }
-                    {
-                        continue;
-                    }
-basic_json_parser_9:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych <= 0x1F)
-                    {
-                        goto basic_json_parser_5;
-                    }
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_31;
-                    }
-                    if (yych <= 0xC1)
-                    {
-                        goto basic_json_parser_5;
-                    }
-                    if (yych <= 0xF4)
-                    {
-                        goto basic_json_parser_31;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_10:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::value_separator;
-                        break;
-                    }
-basic_json_parser_12:
-                    yych = *++m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_5;
-                    }
-                    if (yych <= '0')
-                    {
-                        goto basic_json_parser_43;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_45;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_13:
-                    yyaccept = 1;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych <= '9')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        if (yych >= '0')
-                        {
-                            goto basic_json_parser_48;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            if (yych >= 'E')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                        else
-                        {
-                            if (yych == 'e')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                    }
-basic_json_parser_14:
-                    {
-                        last_token_type = token_type::value_unsigned;
-                        break;
-                    }
-basic_json_parser_15:
-                    yyaccept = 1;
-                    m_marker = ++m_cursor;
-                    if ((m_limit - m_cursor) < 3)
-                    {
-                        fill_line_buffer(3);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yybm[0 + yych] & 64)
-                    {
-                        goto basic_json_parser_15;
-                    }
-                    if (yych <= 'D')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        goto basic_json_parser_14;
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                        if (yych == 'e')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                        goto basic_json_parser_14;
-                    }
-basic_json_parser_17:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::name_separator;
-                        break;
-                    }
-basic_json_parser_19:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::begin_array;
-                        break;
-                    }
-basic_json_parser_21:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::end_array;
-                        break;
-                    }
-basic_json_parser_23:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych == 'a')
-                    {
-                        goto basic_json_parser_52;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_24:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych == 'u')
-                    {
-                        goto basic_json_parser_53;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_25:
-                    yyaccept = 0;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych == 'r')
-                    {
-                        goto basic_json_parser_54;
-                    }
-                    goto basic_json_parser_5;
-basic_json_parser_26:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::begin_object;
-                        break;
-                    }
-basic_json_parser_28:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::end_object;
-                        break;
-                    }
-basic_json_parser_30:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-basic_json_parser_31:
-                    if (yybm[0 + yych] & 128)
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    if (yych <= 0xE0)
-                    {
-                        if (yych <= '\\')
-                        {
-                            if (yych <= 0x1F)
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            if (yych <= '"')
-                            {
-                                goto basic_json_parser_33;
-                            }
-                            goto basic_json_parser_35;
-                        }
-                        else
-                        {
-                            if (yych <= 0xC1)
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            if (yych <= 0xDF)
-                            {
-                                goto basic_json_parser_36;
-                            }
-                            goto basic_json_parser_37;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 0xEF)
-                        {
-                            if (yych == 0xED)
-                            {
-                                goto basic_json_parser_39;
-                            }
-                            goto basic_json_parser_38;
-                        }
-                        else
-                        {
-                            if (yych <= 0xF0)
-                            {
-                                goto basic_json_parser_40;
-                            }
-                            if (yych <= 0xF3)
-                            {
-                                goto basic_json_parser_41;
-                            }
-                            if (yych <= 0xF4)
-                            {
-                                goto basic_json_parser_42;
-                            }
-                        }
-                    }
-basic_json_parser_32:
-                    m_cursor = m_marker;
-                    if (yyaccept <= 1)
-                    {
-                        if (yyaccept == 0)
-                        {
-                            goto basic_json_parser_5;
-                        }
-                        else
-                        {
-                            goto basic_json_parser_14;
-                        }
-                    }
-                    else
-                    {
-                        if (yyaccept == 2)
-                        {
-                            goto basic_json_parser_44;
-                        }
-                        else
-                        {
-                            goto basic_json_parser_58;
-                        }
-                    }
-basic_json_parser_33:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::value_string;
-                        break;
-                    }
-basic_json_parser_35:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 'e')
-                    {
-                        if (yych <= '/')
-                        {
-                            if (yych == '"')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            if (yych <= '.')
-                            {
-                                goto basic_json_parser_32;
-                            }
-                            goto basic_json_parser_30;
-                        }
-                        else
-                        {
-                            if (yych <= '\\')
-                            {
-                                if (yych <= '[')
-                                {
-                                    goto basic_json_parser_32;
-                                }
-                                goto basic_json_parser_30;
-                            }
-                            else
-                            {
-                                if (yych == 'b')
-                                {
-                                    goto basic_json_parser_30;
-                                }
-                                goto basic_json_parser_32;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'q')
-                        {
-                            if (yych <= 'f')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            if (yych == 'n')
-                            {
-                                goto basic_json_parser_30;
-                            }
-                            goto basic_json_parser_32;
-                        }
-                        else
-                        {
-                            if (yych <= 's')
-                            {
-                                if (yych <= 'r')
-                                {
-                                    goto basic_json_parser_30;
-                                }
-                                goto basic_json_parser_32;
-                            }
-                            else
-                            {
-                                if (yych <= 't')
-                                {
-                                    goto basic_json_parser_30;
-                                }
-                                if (yych <= 'u')
-                                {
-                                    goto basic_json_parser_55;
-                                }
-                                goto basic_json_parser_32;
-                            }
-                        }
-                    }
-basic_json_parser_36:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_30;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_37:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x9F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_36;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_38:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_36;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_39:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0x9F)
-                    {
-                        goto basic_json_parser_36;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_40:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x8F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_41:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0xBF)
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_42:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 0x7F)
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= 0x8F)
-                    {
-                        goto basic_json_parser_38;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_43:
-                    yyaccept = 2;
-                    yych = *(m_marker = ++m_cursor);
-                    if (yych <= '9')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        if (yych >= '0')
-                        {
-                            goto basic_json_parser_48;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            if (yych >= 'E')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                        else
-                        {
-                            if (yych == 'e')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                        }
-                    }
-basic_json_parser_44:
-                    {
-                        last_token_type = token_type::value_integer;
-                        break;
-                    }
-basic_json_parser_45:
-                    yyaccept = 2;
-                    m_marker = ++m_cursor;
-                    if ((m_limit - m_cursor) < 3)
-                    {
-                        fill_line_buffer(3);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '9')
-                    {
-                        if (yych == '.')
-                        {
-                            goto basic_json_parser_47;
-                        }
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_44;
-                        }
-                        goto basic_json_parser_45;
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            if (yych <= 'D')
-                            {
-                                goto basic_json_parser_44;
-                            }
-                            goto basic_json_parser_51;
-                        }
-                        else
-                        {
-                            if (yych == 'e')
-                            {
-                                goto basic_json_parser_51;
-                            }
-                            goto basic_json_parser_44;
-                        }
-                    }
-basic_json_parser_47:
-                    yych = *++m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_56;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_48:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_50;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_48;
-                    }
-basic_json_parser_50:
-                    {
-                        last_token_type = token_type::parse_error;
-                        break;
-                    }
-basic_json_parser_51:
-                    yych = *++m_cursor;
-                    if (yych <= ',')
-                    {
-                        if (yych == '+')
-                        {
-                            goto basic_json_parser_59;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= '-')
-                        {
-                            goto basic_json_parser_59;
-                        }
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_60;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_52:
-                    yych = *++m_cursor;
-                    if (yych == 'l')
-                    {
-                        goto basic_json_parser_62;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_53:
-                    yych = *++m_cursor;
-                    if (yych == 'l')
-                    {
-                        goto basic_json_parser_63;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_54:
-                    yych = *++m_cursor;
-                    if (yych == 'u')
-                    {
-                        goto basic_json_parser_64;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_55:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_65;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_65;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_65;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_56:
-                    yyaccept = 3;
-                    m_marker = ++m_cursor;
-                    if ((m_limit - m_cursor) < 3)
-                    {
-                        fill_line_buffer(3);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= 'D')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_58;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_56;
-                        }
-                    }
-                    else
-                    {
-                        if (yych <= 'E')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                        if (yych == 'e')
-                        {
-                            goto basic_json_parser_51;
-                        }
-                    }
-basic_json_parser_58:
-                    {
-                        last_token_type = token_type::value_float;
-                        break;
-                    }
-basic_json_parser_59:
-                    yych = *++m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_32;
-                    }
-                    if (yych >= ':')
-                    {
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_60:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '/')
-                    {
-                        goto basic_json_parser_58;
-                    }
-                    if (yych <= '9')
-                    {
-                        goto basic_json_parser_60;
-                    }
-                    goto basic_json_parser_58;
-basic_json_parser_62:
-                    yych = *++m_cursor;
-                    if (yych == 's')
-                    {
-                        goto basic_json_parser_66;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_63:
-                    yych = *++m_cursor;
-                    if (yych == 'l')
-                    {
-                        goto basic_json_parser_67;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_64:
-                    yych = *++m_cursor;
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_69;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_65:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_71;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_71;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_71;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_66:
-                    yych = *++m_cursor;
-                    if (yych == 'e')
-                    {
-                        goto basic_json_parser_72;
-                    }
-                    goto basic_json_parser_32;
-basic_json_parser_67:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::literal_null;
-                        break;
-                    }
-basic_json_parser_69:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::literal_true;
-                        break;
-                    }
-basic_json_parser_71:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_74;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_74;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_74;
-                        }
-                        goto basic_json_parser_32;
-                    }
-basic_json_parser_72:
-                    ++m_cursor;
-                    {
-                        last_token_type = token_type::literal_false;
-                        break;
-                    }
-basic_json_parser_74:
-                    ++m_cursor;
-                    if (m_limit <= m_cursor)
-                    {
-                        fill_line_buffer(1);    // LCOV_EXCL_LINE
-                    }
-                    yych = *m_cursor;
-                    if (yych <= '@')
-                    {
-                        if (yych <= '/')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= '9')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                    else
-                    {
-                        if (yych <= 'F')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        if (yych <= '`')
-                        {
-                            goto basic_json_parser_32;
-                        }
-                        if (yych <= 'f')
-                        {
-                            goto basic_json_parser_30;
-                        }
-                        goto basic_json_parser_32;
-                    }
-                }
-
-            }
-
-            return last_token_type;
-        }
-
-        /*!
-        @brief append data from the stream to the line buffer
-
-        This function is called by the scan() function when the end of the
-        buffer (`m_limit`) is reached and the `m_cursor` pointer cannot be
-        incremented without leaving the limits of the line buffer. Note re2c
-        decides when to call this function.
-
-        If the lexer reads from contiguous storage, there is no trailing null
-        byte. Therefore, this function must make sure to add these padding
-        null bytes.
-
-        If the lexer reads from an input stream, this function reads the next
-        line of the input.
-
-        @pre
-            p p p p p p u u u u u x . . . . . .
-            ^           ^       ^   ^
-            m_content   m_start |   m_limit
-                                m_cursor
-
-        @post
-            u u u u u x x x x x x x . . . . . .
-            ^       ^               ^
-            |       m_cursor        m_limit
-            m_start
-            m_content
-        */
-        void fill_line_buffer(size_t n = 0)
-        {
-            // if line buffer is used, m_content points to its data
-            assert(m_line_buffer.empty()
-                   or m_content == reinterpret_cast<const lexer_char_t*>(m_line_buffer.data()));
-
-            // if line buffer is used, m_limit is set past the end of its data
-            assert(m_line_buffer.empty()
-                   or m_limit == m_content + m_line_buffer.size());
-
-            // pointer relationships
-            assert(m_content <= m_start);
-            assert(m_start <= m_cursor);
-            assert(m_cursor <= m_limit);
-            assert(m_marker == nullptr or m_marker  <= m_limit);
-
-            // number of processed characters (p)
-            const auto num_processed_chars = static_cast<size_t>(m_start - m_content);
-            // offset for m_marker wrt. to m_start
-            const auto offset_marker = (m_marker == nullptr) ? 0 : m_marker - m_start;
-            // number of unprocessed characters (u)
-            const auto offset_cursor = m_cursor - m_start;
-
-            // no stream is used or end of file is reached
-            if (m_stream == nullptr or m_stream->eof())
-            {
-                // m_start may or may not be pointing into m_line_buffer at
-                // this point. We trust the standard library to do the right
-                // thing. See http://stackoverflow.com/q/28142011/266378
-                m_line_buffer.assign(m_start, m_limit);
-
-                // append n characters to make sure that there is sufficient
-                // space between m_cursor and m_limit
-                m_line_buffer.append(1, '\x00');
-                if (n > 0)
-                {
-                    m_line_buffer.append(n - 1, '\x01');
-                }
-            }
-            else
-            {
-                // delete processed characters from line buffer
-                m_line_buffer.erase(0, num_processed_chars);
-                // read next line from input stream
-                m_line_buffer_tmp.clear();
-                std::getline(*m_stream, m_line_buffer_tmp, '\n');
-
-                // add line with newline symbol to the line buffer
-                m_line_buffer += m_line_buffer_tmp;
-                m_line_buffer.push_back('\n');
-            }
-
-            // set pointers
-            m_content = reinterpret_cast<const lexer_char_t*>(m_line_buffer.data());
-            assert(m_content != nullptr);
-            m_start  = m_content;
-            m_marker = m_start + offset_marker;
-            m_cursor = m_start + offset_cursor;
-            m_limit  = m_start + m_line_buffer.size();
-        }
-
-        /// return string representation of last read token
-        string_t get_token_string() const
-        {
-            assert(m_start != nullptr);
-            return string_t(reinterpret_cast<typename string_t::const_pointer>(m_start),
-                            static_cast<size_t>(m_cursor - m_start));
-        }
-
-        /*!
-        @brief return string value for string tokens
-
-        The function iterates the characters between the opening and closing
-        quotes of the string value. The complete string is the range
-        [m_start,m_cursor). Consequently, we iterate from m_start+1 to
-        m_cursor-1.
-
-        We differentiate two cases:
-
-        1. Escaped characters. In this case, a new character is constructed
-           according to the nature of the escape. Some escapes create new
-           characters (e.g., `"\\n"` is replaced by `"\n"`), some are copied
-           as is (e.g., `"\\\\"`). Furthermore, Unicode escapes of the shape
-           `"\\uxxxx"` need special care. In this case, to_unicode takes care
-           of the construction of the values.
-        2. Unescaped characters are copied as is.
-
-        @pre `m_cursor - m_start >= 2`, meaning the length of the last token
-        is at least 2 bytes which is trivially true for any string (which
-        consists of at least two quotes).
-
-            " c1 c2 c3 ... "
-            ^                ^
-            m_start          m_cursor
-
-        @complexity Linear in the length of the string.\n
-
-        Lemma: The loop body will always terminate.\n
-
-        Proof (by contradiction): Assume the loop body does not terminate. As
-        the loop body does not contain another loop, one of the called
-        functions must never return. The called functions are `std::strtoul`
-        and to_unicode. Neither function can loop forever, so the loop body
-        will never loop forever which contradicts the assumption that the loop
-        body does not terminate, q.e.d.\n
-
-        Lemma: The loop condition for the for loop is eventually false.\n
-
-        Proof (by contradiction): Assume the loop does not terminate. Due to
-        the above lemma, this can only be due to a tautological loop
-        condition; that is, the loop condition i < m_cursor - 1 must always be
-        true. Let x be the change of i for any loop iteration. Then
-        m_start + 1 + x < m_cursor - 1 must hold to loop indefinitely. This
-        can be rephrased to m_cursor - m_start - 2 > x. With the
-        precondition, we x <= 0, meaning that the loop condition holds
-        indefinitely if i is always decreased. However, observe that the value
-        of i is strictly increasing with each iteration, as it is incremented
-        by 1 in the iteration expression and never decremented inside the loop
-        body. Hence, the loop condition will eventually be false which
-        contradicts the assumption that the loop condition is a tautology,
-        q.e.d.
-
-        @return string value of current token without opening and closing
-        quotes
-        @throw std::out_of_range if to_unicode fails
-        */
-        string_t get_string() const
-        {
-            assert(m_cursor - m_start >= 2);
-
-            string_t result;
-            result.reserve(static_cast<size_t>(m_cursor - m_start - 2));
-
-            // iterate the result between the quotes
-            for (const lexer_char_t* i = m_start + 1; i < m_cursor - 1; ++i)
-            {
-                // find next escape character
-                auto e = std::find(i, m_cursor - 1, '\\');
-                if (e != i)
-                {
-                    // see https://github.com/nlohmann/json/issues/365#issuecomment-262874705
-                    for (auto k = i; k < e; k++)
-                    {
-                        result.push_back(static_cast<typename string_t::value_type>(*k));
-                    }
-                    i = e - 1; // -1 because of ++i
-                }
-                else
-                {
-                    // processing escaped character
-                    // read next character
-                    ++i;
-
-                    switch (*i)
-                    {
-                        // the default escapes
-                        case 't':
-                        {
-                            result += "\t";
-                            break;
-                        }
-                        case 'b':
-                        {
-                            result += "\b";
-                            break;
-                        }
-                        case 'f':
-                        {
-                            result += "\f";
-                            break;
-                        }
-                        case 'n':
-                        {
-                            result += "\n";
-                            break;
-                        }
-                        case 'r':
-                        {
-                            result += "\r";
-                            break;
-                        }
-                        case '\\':
-                        {
-                            result += "\\";
-                            break;
-                        }
-                        case '/':
-                        {
-                            result += "/";
-                            break;
-                        }
-                        case '"':
-                        {
-                            result += "\"";
-                            break;
-                        }
-
-                        // unicode
-                        case 'u':
-                        {
-                            // get code xxxx from uxxxx
-                            auto codepoint = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>(i + 1),
-                                                          4).c_str(), nullptr, 16);
-
-                            // check if codepoint is a high surrogate
-                            if (codepoint >= 0xD800 and codepoint <= 0xDBFF)
-                            {
-                                // make sure there is a subsequent unicode
-                                if ((i + 6 >= m_limit) or * (i + 5) != '\\' or * (i + 6) != 'u')
-                                {
-                                    JSON_THROW(std::invalid_argument("missing low surrogate"));
-                                }
-
-                                // get code yyyy from uxxxx\uyyyy
-                                auto codepoint2 = std::strtoul(std::string(reinterpret_cast<typename string_t::const_pointer>
-                                                               (i + 7), 4).c_str(), nullptr, 16);
-                                result += to_unicode(codepoint, codepoint2);
-                                // skip the next 10 characters (xxxx\uyyyy)
-                                i += 10;
-                            }
-                            else if (codepoint >= 0xDC00 and codepoint <= 0xDFFF)
-                            {
-                                // we found a lone low surrogate
-                                JSON_THROW(std::invalid_argument("missing high surrogate"));
-                            }
-                            else
-                            {
-                                // add unicode character(s)
-                                result += to_unicode(codepoint);
-                                // skip the next four characters (xxxx)
-                                i += 4;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-
-
-        /*!
-        @brief parse string into a built-in arithmetic type as if the current
-               locale is POSIX.
-
-        @note in floating-point case strtod may parse past the token's end -
-              this is not an error
-
-        @note any leading blanks are not handled
-        */
-        struct strtonum
-        {
-          public:
-            strtonum(const char* start, const char* end)
-                : m_start(start), m_end(end)
-            {}
-
-            /*!
-            @return true iff parsed successfully as number of type T
-
-            @param[in,out] val shall contain parsed value, or undefined value
-            if could not parse
-            */
-            template<typename T, typename = typename std::enable_if<std::is_arithmetic<T>::value>::type>
-            bool to(T& val) const
-            {
-                return parse(val, std::is_integral<T>());
-            }
-
-          private:
-            const char* const m_start = nullptr;
-            const char* const m_end = nullptr;
-
-            // floating-point conversion
-
-            // overloaded wrappers for strtod/strtof/strtold
-            // that will be called from parse<floating_point_t>
-            static void strtof(float& f, const char* str, char** endptr)
-            {
-                f = std::strtof(str, endptr);
-            }
-
-            static void strtof(double& f, const char* str, char** endptr)
-            {
-                f = std::strtod(str, endptr);
-            }
-
-            static void strtof(long double& f, const char* str, char** endptr)
-            {
-                f = std::strtold(str, endptr);
-            }
-
-            template<typename T>
-            bool parse(T& value, /*is_integral=*/std::false_type) const
-            {
-                // replace decimal separator with locale-specific version,
-                // when necessary; data will point to either the original
-                // string, or buf, or tempstr containing the fixed string.
-                std::string tempstr;
-                std::array<char, 64> buf;
-                const size_t len = static_cast<size_t>(m_end - m_start);
-
-                // lexer will reject empty numbers
-                assert(len > 0);
-
-                // since dealing with strtod family of functions, we're
-                // getting the decimal point char from the C locale facilities
-                // instead of C++'s numpunct facet of the current std::locale
-                const auto loc = localeconv();
-                assert(loc != nullptr);
-                const char decimal_point_char = (loc->decimal_point == nullptr) ? '.' : loc->decimal_point[0];
-
-                const char* data = m_start;
-
-                if (decimal_point_char != '.')
-                {
-                    const size_t ds_pos = static_cast<size_t>(std::find(m_start, m_end, '.') - m_start);
-
-                    if (ds_pos != len)
-                    {
-                        // copy the data into the local buffer or tempstr, if
-                        // buffer is too small; replace decimal separator, and
-                        // update data to point to the modified bytes
-                        if ((len + 1) < buf.size())
-                        {
-                            std::copy(m_start, m_end, buf.begin());
-                            buf[len] = 0;
-                            buf[ds_pos] = decimal_point_char;
-                            data = buf.data();
-                        }
-                        else
-                        {
-                            tempstr.assign(m_start, m_end);
-                            tempstr[ds_pos] = decimal_point_char;
-                            data = tempstr.c_str();
-                        }
-                    }
-                }
-
-                char* endptr = nullptr;
-                value = 0;
-                // this calls appropriate overload depending on T
-                strtof(value, data, &endptr);
-
-                // parsing was successful iff strtof parsed exactly the number
-                // of characters determined by the lexer (len)
-                const bool ok = (endptr == (data + len));
-
-                if (ok and (value == static_cast<T>(0.0)) and (*data == '-'))
-                {
-                    // some implementations forget to negate the zero
-                    value = -0.0;
-                }
-
-                return ok;
-            }
-
-            // integral conversion
-
-            signed long long parse_integral(char** endptr, /*is_signed*/std::true_type) const
-            {
-                return std::strtoll(m_start, endptr, 10);
-            }
-
-            unsigned long long parse_integral(char** endptr, /*is_signed*/std::false_type) const
-            {
-                return std::strtoull(m_start, endptr, 10);
-            }
-
-            template<typename T>
-            bool parse(T& value, /*is_integral=*/std::true_type) const
-            {
-                char* endptr = nullptr;
-                errno = 0; // these are thread-local
-                const auto x = parse_integral(&endptr, std::is_signed<T>());
-
-                // called right overload?
-                static_assert(std::is_signed<T>() == std::is_signed<decltype(x)>(), "");
-
-                value = static_cast<T>(x);
-
-                return (x == static_cast<decltype(x)>(value)) // x fits into destination T
-                       and (x < 0) == (value < 0)             // preserved sign
-                       //and ((x != 0) or is_integral())        // strto[u]ll did nto fail
-                       and (errno == 0)                       // strto[u]ll did not overflow
-                       and (m_start < m_end)                  // token was not empty
-                       and (endptr == m_end);                 // parsed entire token exactly
-            }
-        };
-
-        /*!
-        @brief return number value for number tokens
-
-        This function translates the last token into the most appropriate
-        number type (either integer, unsigned integer or floating point),
-        which is passed back to the caller via the result parameter.
-
-        integral numbers that don't fit into the the range of the respective
-        type are parsed as number_float_t
-
-        floating-point values do not satisfy std::isfinite predicate
-        are converted to value_t::null
-
-        throws if the entire string [m_start .. m_cursor) cannot be
-        interpreted as a number
-
-        @param[out] result  @ref basic_json object to receive the number.
-        @param[in]  token   the type of the number token
-        */
-        bool get_number(basic_json& result, const token_type token) const
-        {
-            assert(m_start != nullptr);
-            assert(m_start < m_cursor);
-            assert((token == token_type::value_unsigned) or
-                   (token == token_type::value_integer) or
-                   (token == token_type::value_float));
-
-            strtonum num_converter(reinterpret_cast<const char*>(m_start),
-                                   reinterpret_cast<const char*>(m_cursor));
-
-            switch (token)
-            {
-                case lexer::token_type::value_unsigned:
-                {
-                    number_unsigned_t val;
-                    if (num_converter.to(val))
-                    {
-                        // parsing successful
-                        result.m_type = value_t::number_unsigned;
-                        result.m_value = val;
-                        return true;
-                    }
-                    break;
-                }
-
-                case lexer::token_type::value_integer:
-                {
-                    number_integer_t val;
-                    if (num_converter.to(val))
-                    {
-                        // parsing successful
-                        result.m_type = value_t::number_integer;
-                        result.m_value = val;
-                        return true;
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    break;
-                }
-            }
-
-            // parse float (either explicitly or because a previous conversion
-            // failed)
-            number_float_t val;
-            if (num_converter.to(val))
-            {
-                // parsing successful
-                result.m_type = value_t::number_float;
-                result.m_value = val;
-
-                // replace infinity and NAN by null
-                if (not std::isfinite(result.m_value.number_float))
-                {
-                    result.m_type  = value_t::null;
-                    result.m_value = basic_json::json_value();
-                }
-
-                return true;
-            }
-
-            // couldn't parse number in any format
-            return false;
-        }
-
-      private:
-        /// optional input stream
-        std::istream* m_stream = nullptr;
-        /// line buffer buffer for m_stream
-        string_t m_line_buffer {};
-        /// used for filling m_line_buffer
-        string_t m_line_buffer_tmp {};
-        /// the buffer pointer
-        const lexer_char_t* m_content = nullptr;
-        /// pointer to the beginning of the current symbol
-        const lexer_char_t* m_start = nullptr;
-        /// pointer for backtracking information
-        const lexer_char_t* m_marker = nullptr;
-        /// pointer to the current symbol
-        const lexer_char_t* m_cursor = nullptr;
-        /// pointer to the end of the buffer
-        const lexer_char_t* m_limit = nullptr;
-        /// the last token type
-        token_type last_token_type = token_type::end_of_input;
-    };
 
     /*!
-    @brief syntax analysis
+    @brief Serializes the given JSON object `j` to BSON and returns a vector
+           containing the corresponding BSON-representation.
 
-    This class implements a recursive decent parser.
+    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
+    stored as a single entity (a so-called document).
+
+    The library uses the following mapping from JSON values types to BSON types:
+
+    JSON value type | value/range                       | BSON type   | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | 0x0A
+    boolean         | `true`, `false`                   | boolean     | 0x08
+    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
+    number_integer  | -2147483648..2147483647           | int32       | 0x10
+    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 0..2147483647                     | int32       | 0x10
+    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
+    number_float    | *any value*                       | double      | 0x01
+    string          | *any value*                       | string      | 0x02
+    array           | *any value*                       | document    | 0x04
+    object          | *any value*                       | document    | 0x03
+
+    @warning The mapping is **incomplete**, since only JSON-objects (and things
+    contained therein) can be serialized to BSON.
+    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
+    and the keys may not contain U+0000, since they are serialized a
+    zero-terminated c-strings.
+
+    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
+    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
+    @throw type_error.317    if `!j.is_object()`
+
+    @pre The input `j` is required to be an object: `j.is_object() == true`.
+
+    @note Any BSON output created via @ref to_bson can be successfully parsed
+          by @ref from_bson.
+
+    @param[in] j  JSON value to serialize
+    @return BSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in BSON format.,to_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
+        analogous deserialization
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+    @sa @ref to_cbor(const basic_json&) for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
     */
-    class parser
+    static std::vector<uint8_t> to_bson(const basic_json& j)
     {
-      public:
-        /// a parser reading from a string literal
-        parser(const char* buff, const parser_callback_t cb = nullptr)
-            : callback(cb),
-              m_lexer(reinterpret_cast<const typename lexer::lexer_char_t*>(buff), std::strlen(buff))
-        {}
+        std::vector<uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
 
-        /// a parser reading from an input stream
-        parser(std::istream& is, const parser_callback_t cb = nullptr)
-            : callback(cb), m_lexer(is)
-        {}
-
-        /// a parser reading from an iterator range with contiguous storage
-        template<class IteratorType, typename std::enable_if<
-                     std::is_same<typename std::iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value
-                     , int>::type
-                 = 0>
-        parser(IteratorType first, IteratorType last, const parser_callback_t cb = nullptr)
-            : callback(cb),
-              m_lexer(reinterpret_cast<const typename lexer::lexer_char_t*>(&(*first)),
-                      static_cast<size_t>(std::distance(first, last)))
-        {}
-
-        /// public parser interface
-        basic_json parse()
-        {
-            // read first token
-            get_token();
-
-            basic_json result = parse_internal(true);
-            result.assert_invariant();
-
-            expect(lexer::token_type::end_of_input);
-
-            // return parser result and replace it with null in case the
-            // top-level value was discarded by the callback function
-            return result.is_discarded() ? basic_json() : std::move(result);
-        }
-
-      private:
-        /// the actual parser
-        basic_json parse_internal(bool keep)
-        {
-            auto result = basic_json(value_t::discarded);
-
-            switch (last_token)
-            {
-                case lexer::token_type::begin_object:
-                {
-                    if (keep and (not callback
-                                  or ((keep = callback(depth++, parse_event_t::object_start, result)) != 0)))
-                    {
-                        // explicitly set result to object to cope with {}
-                        result.m_type = value_t::object;
-                        result.m_value = value_t::object;
-                    }
-
-                    // read next token
-                    get_token();
-
-                    // closing } -> we are done
-                    if (last_token == lexer::token_type::end_object)
-                    {
-                        get_token();
-                        if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
-                        {
-                            result = basic_json(value_t::discarded);
-                        }
-                        return result;
-                    }
-
-                    // no comma is expected here
-                    unexpect(lexer::token_type::value_separator);
-
-                    // otherwise: parse key-value pairs
-                    do
-                    {
-                        // ugly, but could be fixed with loop reorganization
-                        if (last_token == lexer::token_type::value_separator)
-                        {
-                            get_token();
-                        }
-
-                        // store key
-                        expect(lexer::token_type::value_string);
-                        const auto key = m_lexer.get_string();
-
-                        bool keep_tag = false;
-                        if (keep)
-                        {
-                            if (callback)
-                            {
-                                basic_json k(key);
-                                keep_tag = callback(depth, parse_event_t::key, k);
-                            }
-                            else
-                            {
-                                keep_tag = true;
-                            }
-                        }
-
-                        // parse separator (:)
-                        get_token();
-                        expect(lexer::token_type::name_separator);
-
-                        // parse and add value
-                        get_token();
-                        auto value = parse_internal(keep);
-                        if (keep and keep_tag and not value.is_discarded())
-                        {
-                            result[key] = std::move(value);
-                        }
-                    }
-                    while (last_token == lexer::token_type::value_separator);
-
-                    // closing }
-                    expect(lexer::token_type::end_object);
-                    get_token();
-                    if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
-                    {
-                        result = basic_json(value_t::discarded);
-                    }
-
-                    return result;
-                }
-
-                case lexer::token_type::begin_array:
-                {
-                    if (keep and (not callback
-                                  or ((keep = callback(depth++, parse_event_t::array_start, result)) != 0)))
-                    {
-                        // explicitly set result to object to cope with []
-                        result.m_type = value_t::array;
-                        result.m_value = value_t::array;
-                    }
-
-                    // read next token
-                    get_token();
-
-                    // closing ] -> we are done
-                    if (last_token == lexer::token_type::end_array)
-                    {
-                        get_token();
-                        if (callback and not callback(--depth, parse_event_t::array_end, result))
-                        {
-                            result = basic_json(value_t::discarded);
-                        }
-                        return result;
-                    }
-
-                    // no comma is expected here
-                    unexpect(lexer::token_type::value_separator);
-
-                    // otherwise: parse values
-                    do
-                    {
-                        // ugly, but could be fixed with loop reorganization
-                        if (last_token == lexer::token_type::value_separator)
-                        {
-                            get_token();
-                        }
-
-                        // parse value
-                        auto value = parse_internal(keep);
-                        if (keep and not value.is_discarded())
-                        {
-                            result.push_back(std::move(value));
-                        }
-                    }
-                    while (last_token == lexer::token_type::value_separator);
-
-                    // closing ]
-                    expect(lexer::token_type::end_array);
-                    get_token();
-                    if (keep and callback and not callback(--depth, parse_event_t::array_end, result))
-                    {
-                        result = basic_json(value_t::discarded);
-                    }
-
-                    return result;
-                }
-
-                case lexer::token_type::literal_null:
-                {
-                    get_token();
-                    result.m_type = value_t::null;
-                    break;
-                }
-
-                case lexer::token_type::value_string:
-                {
-                    const auto s = m_lexer.get_string();
-                    get_token();
-                    result = basic_json(s);
-                    break;
-                }
-
-                case lexer::token_type::literal_true:
-                {
-                    get_token();
-                    result.m_type = value_t::boolean;
-                    result.m_value = true;
-                    break;
-                }
-
-                case lexer::token_type::literal_false:
-                {
-                    get_token();
-                    result.m_type = value_t::boolean;
-                    result.m_value = false;
-                    break;
-                }
-
-                case lexer::token_type::value_unsigned:
-                case lexer::token_type::value_integer:
-                case lexer::token_type::value_float:
-                {
-                    m_lexer.get_number(result, last_token);
-                    get_token();
-                    break;
-                }
-
-                default:
-                {
-                    // the last token was unexpected
-                    unexpect(last_token);
-                }
-            }
-
-            if (keep and callback and not callback(depth, parse_event_t::value, result))
-            {
-                result = basic_json(value_t::discarded);
-            }
-            return result;
-        }
-
-        /// get next token from lexer
-        typename lexer::token_type get_token()
-        {
-            last_token = m_lexer.scan();
-            return last_token;
-        }
-
-        void expect(typename lexer::token_type t) const
-        {
-            if (t != last_token)
-            {
-                std::string error_msg = "parse error - unexpected ";
-                error_msg += (last_token == lexer::token_type::parse_error ? ("'" +  m_lexer.get_token_string() +
-                              "'") :
-                              lexer::token_type_name(last_token));
-                error_msg += "; expected " + lexer::token_type_name(t);
-                JSON_THROW(std::invalid_argument(error_msg));
-            }
-        }
-
-        void unexpect(typename lexer::token_type t) const
-        {
-            if (t == last_token)
-            {
-                std::string error_msg = "parse error - unexpected ";
-                error_msg += (last_token == lexer::token_type::parse_error ? ("'" +  m_lexer.get_token_string() +
-                              "'") :
-                              lexer::token_type_name(last_token));
-                JSON_THROW(std::invalid_argument(error_msg));
-            }
-        }
-
-      private:
-        /// current level of recursion
-        int depth = 0;
-        /// callback function
-        const parser_callback_t callback = nullptr;
-        /// the type of the last read token
-        typename lexer::token_type last_token = lexer::token_type::uninitialized;
-        /// the lexer
-        lexer m_lexer;
-    };
-
-  public:
     /*!
-    @brief JSON Pointer
-
-    A JSON pointer defines a string syntax for identifying a specific value
-    within a JSON document. It can be used with functions `at` and
-    `operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-    @sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
+    @brief Serializes the given JSON object `j` to BSON and forwards the
+           corresponding BSON-representation to the given output_adapter `o`.
+    @param j The JSON object to convert to BSON.
+    @param o The output adapter that receives the binary BSON representation.
+    @pre The input `j` shall be an object: `j.is_object() == true`
+    @sa @ref to_bson(const basic_json&)
     */
-    class json_pointer
+    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
     {
-        /// allow basic_json to access private members
-        friend class basic_json;
-
-      public:
-        /*!
-        @brief create JSON pointer
-
-        Create a JSON pointer according to the syntax described in
-        [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
-
-        @param[in] s  string representing the JSON pointer; if omitted, the
-                      empty string is assumed which references the whole JSON
-                      value
-
-        @throw std::domain_error if reference token is nonempty and does not
-        begin with a slash (`/`); example: `"JSON pointer must be empty or
-        begin with /"`
-        @throw std::domain_error if a tilde (`~`) is not followed by `0`
-        (representing `~`) or `1` (representing `/`); example: `"escape error:
-        ~ must be followed with 0 or 1"`
-
-        @liveexample{The example shows the construction several valid JSON
-        pointers as well as the exceptional behavior.,json_pointer}
-
-        @since version 2.0.0
-        */
-        explicit json_pointer(const std::string& s = "")
-            : reference_tokens(split(s))
-        {}
-
-        /*!
-        @brief return a string representation of the JSON pointer
-
-        @invariant For each JSON pointer `ptr`, it holds:
-        @code {.cpp}
-        ptr == json_pointer(ptr.to_string());
-        @endcode
-
-        @return a string representation of the JSON pointer
-
-        @liveexample{The example shows the result of `to_string`.,
-        json_pointer__to_string}
-
-        @since version 2.0.0
-        */
-        std::string to_string() const noexcept
-        {
-            return std::accumulate(reference_tokens.begin(),
-                                   reference_tokens.end(), std::string{},
-                                   [](const std::string & a, const std::string & b)
-            {
-                return a + "/" + escape(b);
-            });
-        }
-
-        /// @copydoc to_string()
-        operator std::string() const
-        {
-            return to_string();
-        }
-
-      private:
-        /// remove and return last reference pointer
-        std::string pop_back()
-        {
-            if (is_root())
-            {
-                JSON_THROW(std::domain_error("JSON pointer has no parent"));
-            }
-
-            auto last = reference_tokens.back();
-            reference_tokens.pop_back();
-            return last;
-        }
-
-        /// return whether pointer points to the root document
-        bool is_root() const
-        {
-            return reference_tokens.empty();
-        }
-
-        json_pointer top() const
-        {
-            if (is_root())
-            {
-                JSON_THROW(std::domain_error("JSON pointer has no parent"));
-            }
-
-            json_pointer result = *this;
-            result.reference_tokens = {reference_tokens[0]};
-            return result;
-        }
-
-        /*!
-        @brief create and return a reference to the pointed to value
-
-        @complexity Linear in the number of reference tokens.
-        */
-        reference get_and_create(reference j) const
-        {
-            pointer result = &j;
-
-            // in case no reference tokens exist, return a reference to the
-            // JSON value j which will be overwritten by a primitive value
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (result->m_type)
-                {
-                    case value_t::null:
-                    {
-                        if (reference_token == "0")
-                        {
-                            // start a new array if reference token is 0
-                            result = &result->operator[](0);
-                        }
-                        else
-                        {
-                            // start a new object otherwise
-                            result = &result->operator[](reference_token);
-                        }
-                        break;
-                    }
-
-                    case value_t::object:
-                    {
-                        // create an entry in the object
-                        result = &result->operator[](reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        // create an entry in the array
-                        result = &result->operator[](static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    /*
-                    The following code is only reached if there exists a
-                    reference token _and_ the current value is primitive. In
-                    this case, we have an error situation, because primitive
-                    values may only occur as single value; that is, with an
-                    empty list of reference tokens.
-                    */
-                    default:
-                    {
-                        JSON_THROW(std::domain_error("invalid value to unflatten"));
-                    }
-                }
-            }
-
-            return *result;
-        }
-
-        /*!
-        @brief return a reference to the pointed to value
-
-        @note This version does not throw if a value is not present, but tries
-        to create nested values instead. For instance, calling this function
-        with pointer `"/this/that"` on a null value is equivalent to calling
-        `operator[]("this").operator[]("that")` on that value, effectively
-        changing the null value to an object.
-
-        @param[in] ptr  a JSON value
-
-        @return reference to the JSON value pointed to by the JSON pointer
-
-        @complexity Linear in the length of the JSON pointer.
-
-        @throw std::out_of_range      if the JSON pointer can not be resolved
-        @throw std::domain_error      if an array index begins with '0'
-        @throw std::invalid_argument  if an array index was not a number
-        */
-        reference get_unchecked(pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                // convert null values to arrays or objects before continuing
-                if (ptr->m_type == value_t::null)
-                {
-                    // check if reference token is a number
-                    const bool nums = std::all_of(reference_token.begin(),
-                                                  reference_token.end(),
-                                                  [](const char x)
-                    {
-                        return std::isdigit(x);
-                    });
-
-                    // change value to array for numbers or "-" or to object
-                    // otherwise
-                    if (nums or reference_token == "-")
-                    {
-                        *ptr = value_t::array;
-                    }
-                    else
-                    {
-                        *ptr = value_t::object;
-                    }
-                }
-
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // use unchecked object access
-                        ptr = &ptr->operator[](reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        if (reference_token == "-")
-                        {
-                            // explicitly treat "-" as index beyond the end
-                            ptr = &ptr->operator[](ptr->m_value.array->size());
-                        }
-                        else
-                        {
-                            // convert array index to number; unchecked access
-                            ptr = &ptr->operator[](static_cast<size_type>(std::stoi(reference_token)));
-                        }
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        reference get_checked(pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // note: at performs range check
-                        ptr = &ptr->at(reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (reference_token == "-")
-                        {
-                            // "-" always fails the range check
-                            JSON_THROW(std::out_of_range("array index '-' (" +
-                                                         std::to_string(ptr->m_value.array->size()) +
-                                                         ") is out of range"));
-                        }
-
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        // note: at performs range check
-                        ptr = &ptr->at(static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        /*!
-        @brief return a const reference to the pointed to value
-
-        @param[in] ptr  a JSON value
-
-        @return const reference to the JSON value pointed to by the JSON
-                pointer
-        */
-        const_reference get_unchecked(const_pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // use unchecked object access
-                        ptr = &ptr->operator[](reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (reference_token == "-")
-                        {
-                            // "-" cannot be used for const access
-                            JSON_THROW(std::out_of_range("array index '-' (" +
-                                                         std::to_string(ptr->m_value.array->size()) +
-                                                         ") is out of range"));
-                        }
-
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        // use unchecked array access
-                        ptr = &ptr->operator[](static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        const_reference get_checked(const_pointer ptr) const
-        {
-            for (const auto& reference_token : reference_tokens)
-            {
-                switch (ptr->m_type)
-                {
-                    case value_t::object:
-                    {
-                        // note: at performs range check
-                        ptr = &ptr->at(reference_token);
-                        break;
-                    }
-
-                    case value_t::array:
-                    {
-                        if (reference_token == "-")
-                        {
-                            // "-" always fails the range check
-                            JSON_THROW(std::out_of_range("array index '-' (" +
-                                                         std::to_string(ptr->m_value.array->size()) +
-                                                         ") is out of range"));
-                        }
-
-                        // error condition (cf. RFC 6901, Sect. 4)
-                        if (reference_token.size() > 1 and reference_token[0] == '0')
-                        {
-                            JSON_THROW(std::domain_error("array index must not begin with '0'"));
-                        }
-
-                        // note: at performs range check
-                        ptr = &ptr->at(static_cast<size_type>(std::stoi(reference_token)));
-                        break;
-                    }
-
-                    default:
-                    {
-                        JSON_THROW(std::out_of_range("unresolved reference token '" + reference_token + "'"));
-                    }
-                }
-            }
-
-            return *ptr;
-        }
-
-        /// split the string input to reference tokens
-        static std::vector<std::string> split(const std::string& reference_string)
-        {
-            std::vector<std::string> result;
-
-            // special case: empty reference string -> no reference tokens
-            if (reference_string.empty())
-            {
-                return result;
-            }
-
-            // check if nonempty reference string begins with slash
-            if (reference_string[0] != '/')
-            {
-                JSON_THROW(std::domain_error("JSON pointer must be empty or begin with '/'"));
-            }
-
-            // extract the reference tokens:
-            // - slash: position of the last read slash (or end of string)
-            // - start: position after the previous slash
-            for (
-                // search for the first slash after the first character
-                size_t slash = reference_string.find_first_of('/', 1),
-                // set the beginning of the first reference token
-                start = 1;
-                // we can stop if start == string::npos+1 = 0
-                start != 0;
-                // set the beginning of the next reference token
-                // (will eventually be 0 if slash == std::string::npos)
-                start = slash + 1,
-                // find next slash
-                slash = reference_string.find_first_of('/', start))
-            {
-                // use the text between the beginning of the reference token
-                // (start) and the last slash (slash).
-                auto reference_token = reference_string.substr(start, slash - start);
-
-                // check reference tokens are properly escaped
-                for (size_t pos = reference_token.find_first_of('~');
-                        pos != std::string::npos;
-                        pos = reference_token.find_first_of('~', pos + 1))
-                {
-                    assert(reference_token[pos] == '~');
-
-                    // ~ must be followed by 0 or 1
-                    if (pos == reference_token.size() - 1 or
-                            (reference_token[pos + 1] != '0' and
-                             reference_token[pos + 1] != '1'))
-                    {
-                        JSON_THROW(std::domain_error("escape error: '~' must be followed with '0' or '1'"));
-                    }
-                }
-
-                // finally, store the reference token
-                unescape(reference_token);
-                result.push_back(reference_token);
-            }
-
-            return result;
-        }
-
-      private:
-        /*!
-        @brief replace all occurrences of a substring by another string
-
-        @param[in,out] s  the string to manipulate; changed so that all
-                          occurrences of @a f are replaced with @a t
-        @param[in]     f  the substring to replace with @a t
-        @param[in]     t  the string to replace @a f
-
-        @pre The search string @a f must not be empty.
-
-        @since version 2.0.0
-        */
-        static void replace_substring(std::string& s,
-                                      const std::string& f,
-                                      const std::string& t)
-        {
-            assert(not f.empty());
-
-            for (
-                size_t pos = s.find(f);         // find first occurrence of f
-                pos != std::string::npos;       // make sure f was found
-                s.replace(pos, f.size(), t),    // replace with t
-                pos = s.find(f, pos + t.size()) // find next occurrence of f
-            );
-        }
-
-        /// escape tilde and slash
-        static std::string escape(std::string s)
-        {
-            // escape "~"" to "~0" and "/" to "~1"
-            replace_substring(s, "~", "~0");
-            replace_substring(s, "/", "~1");
-            return s;
-        }
-
-        /// unescape tilde and slash
-        static void unescape(std::string& s)
-        {
-            // first transform any occurrence of the sequence '~1' to '/'
-            replace_substring(s, "~1", "/");
-            // then transform any occurrence of the sequence '~0' to '~'
-            replace_substring(s, "~0", "~");
-        }
-
-        /*!
-        @param[in] reference_string  the reference string to the current value
-        @param[in] value             the value to consider
-        @param[in,out] result        the result object to insert values to
-
-        @note Empty objects or arrays are flattened to `null`.
-        */
-        static void flatten(const std::string& reference_string,
-                            const basic_json& value,
-                            basic_json& result)
-        {
-            switch (value.m_type)
-            {
-                case value_t::array:
-                {
-                    if (value.m_value.array->empty())
-                    {
-                        // flatten empty array as null
-                        result[reference_string] = nullptr;
-                    }
-                    else
-                    {
-                        // iterate array and use index as reference string
-                        for (size_t i = 0; i < value.m_value.array->size(); ++i)
-                        {
-                            flatten(reference_string + "/" + std::to_string(i),
-                                    value.m_value.array->operator[](i), result);
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::object:
-                {
-                    if (value.m_value.object->empty())
-                    {
-                        // flatten empty object as null
-                        result[reference_string] = nullptr;
-                    }
-                    else
-                    {
-                        // iterate object and use keys as reference string
-                        for (const auto& element : *value.m_value.object)
-                        {
-                            flatten(reference_string + "/" + escape(element.first),
-                                    element.second, result);
-                        }
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    // add primitive value with its reference string
-                    result[reference_string] = value;
-                    break;
-                }
-            }
-        }
-
-        /*!
-        @param[in] value  flattened JSON
-
-        @return unflattened JSON
-        */
-        static basic_json unflatten(const basic_json& value)
-        {
-            if (not value.is_object())
-            {
-                JSON_THROW(std::domain_error("only objects can be unflattened"));
-            }
-
-            basic_json result;
-
-            // iterate the JSON object values
-            for (const auto& element : *value.m_value.object)
-            {
-                if (not element.second.is_primitive())
-                {
-                    JSON_THROW(std::domain_error("values in object must be primitive"));
-                }
-
-                // assign value to reference pointed to by JSON pointer; Note
-                // that if the JSON pointer is "" (i.e., points to the whole
-                // value), function get_and_create returns a reference to
-                // result itself. An assignment will then create a primitive
-                // value.
-                json_pointer(element.first).get_and_create(result) = element.second;
-            }
-
-            return result;
-        }
-
-      private:
-        friend bool operator==(json_pointer const& lhs,
-                               json_pointer const& rhs) noexcept
-        {
-            return lhs.reference_tokens == rhs.reference_tokens;
-        }
-
-        friend bool operator!=(json_pointer const& lhs,
-                               json_pointer const& rhs) noexcept
-        {
-            return !(lhs == rhs);
-        }
-
-        /// the reference tokens
-        std::vector<std::string> reference_tokens {};
-    };
+        binary_writer<uint8_t>(o).write_bson(j);
+    }
+
+    /*!
+    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+
+    /*!
+    @brief create a JSON value from an input in CBOR format
+
+    Deserializes a given input @a i to a JSON value using the CBOR (Concise
+    Binary Object Representation) serialization format.
+
+    The library maps CBOR types to JSON value types as follows:
+
+    CBOR type              | JSON value type | first byte
+    ---------------------- | --------------- | ----------
+    Integer                | number_unsigned | 0x00..0x17
+    Unsigned integer       | number_unsigned | 0x18
+    Unsigned integer       | number_unsigned | 0x19
+    Unsigned integer       | number_unsigned | 0x1A
+    Unsigned integer       | number_unsigned | 0x1B
+    Negative integer       | number_integer  | 0x20..0x37
+    Negative integer       | number_integer  | 0x38
+    Negative integer       | number_integer  | 0x39
+    Negative integer       | number_integer  | 0x3A
+    Negative integer       | number_integer  | 0x3B
+    Negative integer       | number_integer  | 0x40..0x57
+    UTF-8 string           | string          | 0x60..0x77
+    UTF-8 string           | string          | 0x78
+    UTF-8 string           | string          | 0x79
+    UTF-8 string           | string          | 0x7A
+    UTF-8 string           | string          | 0x7B
+    UTF-8 string           | string          | 0x7F
+    array                  | array           | 0x80..0x97
+    array                  | array           | 0x98
+    array                  | array           | 0x99
+    array                  | array           | 0x9A
+    array                  | array           | 0x9B
+    array                  | array           | 0x9F
+    map                    | object          | 0xA0..0xB7
+    map                    | object          | 0xB8
+    map                    | object          | 0xB9
+    map                    | object          | 0xBA
+    map                    | object          | 0xBB
+    map                    | object          | 0xBF
+    False                  | `false`         | 0xF4
+    True                   | `true`          | 0xF5
+    Null                   | `null`          | 0xF6
+    Half-Precision Float   | number_float    | 0xF9
+    Single-Precision Float | number_float    | 0xFA
+    Double-Precision Float | number_float    | 0xFB
+
+    @warning The mapping is **incomplete** in the sense that not all CBOR
+             types can be converted to a JSON value. The following CBOR types
+             are not supported and will yield parse errors (parse_error.112):
+             - byte strings (0x40..0x5F)
+             - date/time (0xC0..0xC1)
+             - bignum (0xC2..0xC3)
+             - decimal fraction (0xC4)
+             - bigfloat (0xC5)
+             - tagged items (0xC6..0xD4, 0xD8..0xDB)
+             - expected conversions (0xD5..0xD7)
+             - simple values (0xE0..0xF3, 0xF8)
+             - undefined (0xF7)
+
+    @warning CBOR allows map keys of any type, whereas JSON only allows
+             strings as keys in object values. Therefore, CBOR maps with keys
+             other than UTF-8 strings are rejected (parse_error.113).
+
+    @note Any CBOR output created @ref to_cbor can be successfully parsed by
+          @ref from_cbor.
+
+    @param[in] i  an input in CBOR format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from CBOR were
+    used in the given input @a v or if the input is not valid CBOR
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in CBOR
+    format to a JSON value.,from_cbor}
+
+    @sa http://cbor.io
+    @sa @ref to_cbor(const basic_json&) for the analogous serialization
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
+        related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    JSON_NODISCARD
+    static basic_json from_cbor(detail::input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::cbor, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_NODISCARD
+    static basic_json from_cbor(A1 && a1, A2 && a2,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::cbor, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in MessagePack format
+
+    Deserializes a given input @a i to a JSON value using the MessagePack
+    serialization format.
+
+    The library maps MessagePack types to JSON value types as follows:
+
+    MessagePack type | JSON value type | first byte
+    ---------------- | --------------- | ----------
+    positive fixint  | number_unsigned | 0x00..0x7F
+    fixmap           | object          | 0x80..0x8F
+    fixarray         | array           | 0x90..0x9F
+    fixstr           | string          | 0xA0..0xBF
+    nil              | `null`          | 0xC0
+    false            | `false`         | 0xC2
+    true             | `true`          | 0xC3
+    float 32         | number_float    | 0xCA
+    float 64         | number_float    | 0xCB
+    uint 8           | number_unsigned | 0xCC
+    uint 16          | number_unsigned | 0xCD
+    uint 32          | number_unsigned | 0xCE
+    uint 64          | number_unsigned | 0xCF
+    int 8            | number_integer  | 0xD0
+    int 16           | number_integer  | 0xD1
+    int 32           | number_integer  | 0xD2
+    int 64           | number_integer  | 0xD3
+    str 8            | string          | 0xD9
+    str 16           | string          | 0xDA
+    str 32           | string          | 0xDB
+    array 16         | array           | 0xDC
+    array 32         | array           | 0xDD
+    map 16           | object          | 0xDE
+    map 32           | object          | 0xDF
+    negative fixint  | number_integer  | 0xE0-0xFF
+
+    @warning The mapping is **incomplete** in the sense that not all
+             MessagePack types can be converted to a JSON value. The following
+             MessagePack types are not supported and will yield parse errors:
+              - bin 8 - bin 32 (0xC4..0xC6)
+              - ext 8 - ext 32 (0xC7..0xC9)
+              - fixext 1 - fixext 16 (0xD4..0xD8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @param[in] i  an input in MessagePack format convertible to an input
+                  adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from MessagePack were
+    used in the given input @a i or if the input is not valid MessagePack
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    MessagePack format to a JSON value.,from_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
+        the related UBJSON format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    JSON_NODISCARD
+    static basic_json from_msgpack(detail::input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_NODISCARD
+    static basic_json from_msgpack(A1 && a1, A2 && a2,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in UBJSON format
+
+    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
+    Binary JSON) serialization format.
+
+    The library maps UBJSON types to JSON value types as follows:
+
+    UBJSON type | JSON value type                         | marker
+    ----------- | --------------------------------------- | ------
+    no-op       | *no value, next value is read*          | `N`
+    null        | `null`                                  | `Z`
+    false       | `false`                                 | `F`
+    true        | `true`                                  | `T`
+    float32     | number_float                            | `d`
+    float64     | number_float                            | `D`
+    uint8       | number_unsigned                         | `U`
+    int8        | number_integer                          | `i`
+    int16       | number_integer                          | `I`
+    int32       | number_integer                          | `l`
+    int64       | number_integer                          | `L`
+    string      | string                                  | `S`
+    char        | string                                  | `C`
+    array       | array (optimized values are supported)  | `[`
+    object      | object (optimized values are supported) | `{`
+
+    @note The mapping is **complete** in the sense that any UBJSON value can
+          be converted to a JSON value.
+
+    @param[in] i  an input in UBJSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if a parse error occurs
+    @throw parse_error.113 if a string could not be parsed successfully
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    UBJSON format to a JSON value.,from_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
+    */
+    JSON_NODISCARD
+    static basic_json from_ubjson(detail::input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_NODISCARD
+    static basic_json from_ubjson(A1 && a1, A2 && a2,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief Create a JSON value from an input in BSON format
+
+    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
+    serialization format.
+
+    The library maps BSON record types to JSON value types as follows:
+
+    BSON type       | BSON marker byte | JSON value type
+    --------------- | ---------------- | ---------------------------
+    double          | 0x01             | number_float
+    string          | 0x02             | string
+    document        | 0x03             | object
+    array           | 0x04             | array
+    binary          | 0x05             | still unsupported
+    undefined       | 0x06             | still unsupported
+    ObjectId        | 0x07             | still unsupported
+    boolean         | 0x08             | boolean
+    UTC Date-Time   | 0x09             | still unsupported
+    null            | 0x0A             | null
+    Regular Expr.   | 0x0B             | still unsupported
+    DB Pointer      | 0x0C             | still unsupported
+    JavaScript Code | 0x0D             | still unsupported
+    Symbol          | 0x0E             | still unsupported
+    JavaScript Code | 0x0F             | still unsupported
+    int32           | 0x10             | number_integer
+    Timestamp       | 0x11             | still unsupported
+    128-bit decimal float | 0x13       | still unsupported
+    Max Key         | 0x7F             | still unsupported
+    Min Key         | 0xFF             | still unsupported
+
+    @warning The mapping is **incomplete**. The unsupported mappings
+             are indicated in the table above.
+
+    @param[in] i  an input in BSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.114 if an unsupported BSON record type is encountered
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    BSON format to a JSON value.,from_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref to_bson(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+    */
+    JSON_NODISCARD
+    static basic_json from_bson(detail::input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_NODISCARD
+    static basic_json from_bson(A1 && a1, A2 && a2,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+
+    /// @}
 
     //////////////////////////
     // JSON Pointer support //
@@ -12273,9 +19971,9 @@ basic_json_parser_74:
 
     @complexity Constant.
 
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
 
     @liveexample{The behavior is shown in the example.,operatorjson_pointer}
 
@@ -12300,9 +19998,10 @@ basic_json_parser_74:
 
     @complexity Constant.
 
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
 
     @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
 
@@ -12323,15 +20022,33 @@ basic_json_parser_74:
 
     @return reference to the element pointed to by @a ptr
 
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
     @complexity Constant.
 
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
+    @since version 2.0.0
 
     @liveexample{The behavior is shown in the example.,at_json_pointer}
-
-    @since version 2.0.0
     */
     reference at(const json_pointer& ptr)
     {
@@ -12348,15 +20065,33 @@ basic_json_parser_74:
 
     @return reference to the element pointed to by @a ptr
 
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
     @complexity Constant.
 
-    @throw std::out_of_range      if the JSON pointer can not be resolved
-    @throw std::domain_error      if an array index begins with '0'
-    @throw std::invalid_argument  if an array index was not a number
+    @since version 2.0.0
 
     @liveexample{The behavior is shown in the example.,at_json_pointer_const}
-
-    @since version 2.0.0
     */
     const_reference at(const json_pointer& ptr) const
     {
@@ -12412,6 +20147,9 @@ basic_json_parser_74:
 
     @complexity Linear in the size the JSON value.
 
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+
     @liveexample{The following code shows how a flattened JSON object is
     unflattened into the original nested JSON object.,unflatten}
 
@@ -12449,12 +20187,23 @@ basic_json_parser_74:
           any case, the original value is not changed: the patch is applied
           to a copy of the value.
 
-    @throw std::out_of_range if a JSON pointer inside the patch could not
-    be resolved successfully in the current JSON value; example: `"key baz
-    not found"`
-    @throw invalid_argument if the JSON patch is malformed (e.g., mandatory
+    @throw parse_error.104 if the JSON patch does not consist of an array of
+    objects
+
+    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
     attributes are missing); example: `"operation add must have member path"`
 
+    @throw out_of_range.401 if an array index is out of range.
+
+    @throw out_of_range.403 if a JSON pointer inside the patch could not be
+    resolved successfully in the current JSON value; example: `"key baz not
+    found"`
+
+    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
+    "move")
+
+    @throw other_error.501 if "test" operation was unsuccessful
+
     @complexity Linear in the size of the JSON value and the length of the
     JSON patch. As usually only a fraction of the JSON value is affected by
     the patch, the complexity can usually be neglected.
@@ -12477,7 +20226,7 @@ basic_json_parser_74:
         // the valid JSON Patch operations
         enum class patch_operations {add, remove, replace, move, copy, test, invalid};
 
-        const auto get_op = [](const std::string op)
+        const auto get_op = [](const std::string & op)
         {
             if (op == "add")
             {
@@ -12511,63 +20260,59 @@ basic_json_parser_74:
         const auto operation_add = [&result](json_pointer & ptr, basic_json val)
         {
             // adding to the root of the target document means replacing it
-            if (ptr.is_root())
+            if (ptr.empty())
             {
                 result = val;
+                return;
             }
-            else
+
+            // make sure the top element of the pointer exists
+            json_pointer top_pointer = ptr.top();
+            if (top_pointer != ptr)
             {
-                // make sure the top element of the pointer exists
-                json_pointer top_pointer = ptr.top();
-                if (top_pointer != ptr)
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result[ptr];
+
+            switch (parent.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
                 {
-                    result.at(top_pointer);
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
                 }
 
-                // get reference to parent of JSON pointer ptr
-                const auto last_path = ptr.pop_back();
-                basic_json& parent = result[ptr];
-
-                switch (parent.m_type)
+                case value_t::array:
                 {
-                    case value_t::null:
-                    case value_t::object:
+                    if (last_path == "-")
                     {
-                        // use operator[] to add value
-                        parent[last_path] = val;
-                        break;
+                        // special case: append to back
+                        parent.push_back(val);
                     }
-
-                    case value_t::array:
+                    else
                     {
-                        if (last_path == "-")
+                        const auto idx = json_pointer::array_index(last_path);
+                        if (JSON_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
                         {
-                            // special case: append to back
-                            parent.push_back(val);
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
                         }
-                        else
-                        {
-                            const auto idx = std::stoi(last_path);
-                            if (static_cast<size_type>(idx) > parent.size())
-                            {
-                                // avoid undefined behavior
-                                JSON_THROW(std::out_of_range("array index " + std::to_string(idx) + " is out of range"));
-                            }
-                            else
-                            {
-                                // default case: insert add offset
-                                parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
-                            }
-                        }
-                        break;
-                    }
 
-                    default:
-                    {
-                        // if there exists a parent it cannot be primitive
-                        assert(false);  // LCOV_EXCL_LINE
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
                     }
+                    break;
                 }
+
+                // if there exists a parent it cannot be primitive
+                default:            // LCOV_EXCL_LINE
+                    assert(false);  // LCOV_EXCL_LINE
             }
         };
 
@@ -12575,7 +20320,8 @@ basic_json_parser_74:
         const auto operation_remove = [&result](json_pointer & ptr)
         {
             // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.pop_back();
+            const auto last_path = ptr.back();
+            ptr.pop_back();
             basic_json& parent = result.at(ptr);
 
             // remove child
@@ -12583,27 +20329,26 @@ basic_json_parser_74:
             {
                 // perform range check
                 auto it = parent.find(last_path);
-                if (it != parent.end())
+                if (JSON_LIKELY(it != parent.end()))
                 {
                     parent.erase(it);
                 }
                 else
                 {
-                    JSON_THROW(std::out_of_range("key '" + last_path + "' not found"));
+                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
                 }
             }
             else if (parent.is_array())
             {
                 // note erase performs range check
-                parent.erase(static_cast<size_type>(std::stoi(last_path)));
+                parent.erase(static_cast<size_type>(json_pointer::array_index(last_path)));
             }
         };
 
-        // type check
-        if (not json_patch.is_array())
+        // type check: top level value must be an array
+        if (JSON_UNLIKELY(not json_patch.is_array()))
         {
-            // a JSON patch must be an array of objects
-            JSON_THROW(std::invalid_argument("JSON patch must be an array of objects"));
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
         }
 
         // iterate and apply the operations
@@ -12612,7 +20357,7 @@ basic_json_parser_74:
             // wrapper to get a value for an operation
             const auto get_value = [&val](const std::string & op,
                                           const std::string & member,
-                                          bool string_type) -> basic_json&
+                                          bool string_type) -> basic_json &
             {
                 // find value
                 auto it = val.m_value.object->find(member);
@@ -12621,25 +20366,25 @@ basic_json_parser_74:
                 const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
 
                 // check if desired value is present
-                if (it == val.m_value.object->end())
+                if (JSON_UNLIKELY(it == val.m_value.object->end()))
                 {
-                    JSON_THROW(std::invalid_argument(error_msg + " must have member '" + member + "'"));
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
                 }
 
                 // check if result is of type string
-                if (string_type and not it->second.is_string())
+                if (JSON_UNLIKELY(string_type and not it->second.is_string()))
                 {
-                    JSON_THROW(std::invalid_argument(error_msg + " must have string member '" + member + "'"));
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
                 }
 
                 // no error: return value
                 return it->second;
             };
 
-            // type check
-            if (not val.is_object())
+            // type check: every element of the array must be an object
+            if (JSON_UNLIKELY(not val.is_object()))
             {
-                JSON_THROW(std::invalid_argument("JSON patch must be an array of objects"));
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
             }
 
             // collect mandatory members
@@ -12687,11 +20432,16 @@ basic_json_parser_74:
 
                 case patch_operations::copy:
                 {
-                    const std::string from_path = get_value("copy", "from", true);;
+                    const std::string from_path = get_value("copy", "from", true);
                     const json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
-                    result[ptr] = result.at(from_ptr);
+                    basic_json v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
                     break;
                 }
 
@@ -12704,25 +20454,25 @@ basic_json_parser_74:
                         // the "path" location must exist - use at()
                         success = (result.at(ptr) == get_value("test", "value", false));
                     }
-                    JSON_CATCH (std::out_of_range&)
+                    JSON_INTERNAL_CATCH (out_of_range&)
                     {
                         // ignore out of range errors: success remains false
                     }
 
                     // throw an exception if test fails
-                    if (not success)
+                    if (JSON_UNLIKELY(not success))
                     {
-                        JSON_THROW(std::domain_error("unsuccessful: " + val.dump()));
+                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
                     }
 
                     break;
                 }
 
-                case patch_operations::invalid:
+                default:
                 {
                     // op must be "add", "remove", "replace", "move", "copy", or
                     // "test"
-                    JSON_THROW(std::invalid_argument("operation value '" + op + "' is invalid"));
+                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
                 }
             }
         }
@@ -12757,13 +20507,14 @@ basic_json_parser_74:
     diff for two JSON values.,diff}
 
     @sa @ref patch -- apply a JSON patch
+    @sa @ref merge_patch -- apply a JSON Merge Patch
 
     @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
 
     @since version 2.0.0
     */
-    static basic_json diff(const basic_json& source,
-                           const basic_json& target,
+    JSON_NODISCARD
+    static basic_json diff(const basic_json& source, const basic_json& target,
                            const std::string& path = "")
     {
         // the patch
@@ -12780,114 +20531,107 @@ basic_json_parser_74:
             // different types: replace value
             result.push_back(
             {
-                {"op", "replace"},
-                {"path", path},
-                {"value", target}
+                {"op", "replace"}, {"path", path}, {"value", target}
             });
+            return result;
         }
-        else
+
+        switch (source.type())
         {
-            switch (source.type())
+            case value_t::array:
             {
-                case value_t::array:
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() and i < target.size())
                 {
-                    // first pass: traverse common elements
-                    size_t i = 0;
-                    while (i < source.size() and i < target.size())
-                    {
-                        // recursive call to compare array values at index i
-                        auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
-                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                        ++i;
-                    }
-
-                    // i now reached the end of at least one array
-                    // in a second pass, traverse the remaining elements
-
-                    // remove my remaining elements
-                    const auto end_index = static_cast<difference_type>(result.size());
-                    while (i < source.size())
-                    {
-                        // add operations in reverse order to avoid invalid
-                        // indices
-                        result.insert(result.begin() + end_index, object(
-                        {
-                            {"op", "remove"},
-                            {"path", path + "/" + std::to_string(i)}
-                        }));
-                        ++i;
-                    }
-
-                    // add other remaining elements
-                    while (i < target.size())
-                    {
-                        result.push_back(
-                        {
-                            {"op", "add"},
-                            {"path", path + "/" + std::to_string(i)},
-                            {"value", target[i]}
-                        });
-                        ++i;
-                    }
-
-                    break;
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
                 }
 
-                case value_t::object:
+                // i now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
                 {
-                    // first pass: traverse this object's elements
-                    for (auto it = source.begin(); it != source.end(); ++it)
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
                     {
-                        // escape the key name to be used in a JSON patch
-                        const auto key = json_pointer::escape(it.key());
-
-                        if (target.find(it.key()) != target.end())
-                        {
-                            // recursive call to compare object values at key it
-                            auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
-                            result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                        }
-                        else
-                        {
-                            // found a key that is not in o -> remove it
-                            result.push_back(object(
-                            {
-                                {"op", "remove"},
-                                {"path", path + "/" + key}
-                            }));
-                        }
-                    }
-
-                    // second pass: traverse other object's elements
-                    for (auto it = target.begin(); it != target.end(); ++it)
-                    {
-                        if (source.find(it.key()) == source.end())
-                        {
-                            // found a key that is not in this -> add it
-                            const auto key = json_pointer::escape(it.key());
-                            result.push_back(
-                            {
-                                {"op", "add"},
-                                {"path", path + "/" + key},
-                                {"value", it.value()}
-                            });
-                        }
-                    }
-
-                    break;
+                        {"op", "remove"},
+                        {"path", path + "/" + std::to_string(i)}
+                    }));
+                    ++i;
                 }
 
-                default:
+                // add other remaining elements
+                while (i < target.size())
                 {
-                    // both primitive type: replace value
                     result.push_back(
                     {
-                        {"op", "replace"},
-                        {"path", path},
-                        {"value", target}
+                        {"op", "add"},
+                        {"path", path + "/" + std::to_string(i)},
+                        {"value", target[i]}
                     });
-                    break;
+                    ++i;
                 }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto key = json_pointer::escape(it.key());
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path + "/" + key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto key = json_pointer::escape(it.key());
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path + "/" + key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
             }
         }
 
@@ -12895,24 +20639,86 @@ basic_json_parser_74:
     }
 
     /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON Merge Patch
+
+    The merge patch format is primarily intended for use with the HTTP PATCH
+    method as a means of describing a set of modifications to a target
+    resource's content. This function applies a merge patch to the current
+    JSON value.
+
+    The function implements the following algorithm from Section 2 of
+    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
+
+    ```
+    define MergePatch(Target, Patch):
+      if Patch is an Object:
+        if Target is not an Object:
+          Target = {} // Ignore the contents and set it to an empty Object
+        for each Name/Value pair in Patch:
+          if Value is null:
+            if Name exists in Target:
+              remove the Name/Value pair from Target
+          else:
+            Target[Name] = MergePatch(Target[Name], Value)
+        return Target
+      else:
+        return Patch
+    ```
+
+    Thereby, `Target` is the current object; that is, the patch is applied to
+    the current value.
+
+    @param[in] apply_patch  the patch to apply
+
+    @complexity Linear in the lengths of @a patch.
+
+    @liveexample{The following code shows how a JSON Merge Patch is applied to
+    a JSON document.,merge_patch}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
+
+    @since version 3.0.0
+    */
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (not is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
 };
-
-/////////////
-// presets //
-/////////////
-
-/*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
-*/
-using json = basic_json<>;
 } // namespace nlohmann
 
-
 ///////////////////////
 // nonmember support //
 ///////////////////////
@@ -12920,20 +20726,6 @@ using json = basic_json<>;
 // specialization of std::swap, and std::hash
 namespace std
 {
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap(nlohmann::json& j1,
-                 nlohmann::json& j2) noexcept(
-                     is_nothrow_move_constructible<nlohmann::json>::value and
-                     is_nothrow_move_assignable<nlohmann::json>::value
-                 )
-{
-    j1.swap(j2);
-}
 
 /// hash value for JSON objects
 template<>
@@ -12951,6 +20743,38 @@ struct hash<nlohmann::json>
         return h(j.dump());
     }
 };
+
+/// specialization for std::less<value_t>
+/// @note: do not remove the space after '<',
+///        see https://github.com/nlohmann/json/pull/679
+template<>
+struct less< ::nlohmann::detail::value_t>
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(nlohmann::detail::value_t lhs,
+                    nlohmann::detail::value_t rhs) const noexcept
+    {
+        return nlohmann::detail::operator<(lhs, rhs);
+    }
+};
+
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
+    is_nothrow_move_constructible<nlohmann::json>::value and
+    is_nothrow_move_assignable<nlohmann::json>::value
+)
+{
+    j1.swap(j2);
+}
+
 } // namespace std
 
 /*!
@@ -12989,15 +20813,30 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
     return nlohmann::json::json_pointer(std::string(s, n));
 }
 
+// #include <nlohmann/detail/macro_unscope.hpp>
+
+
 // restore GCC/clang diagnostic settings
 #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
     #pragma GCC diagnostic pop
 #endif
+#if defined(__clang__)
+    #pragma GCC diagnostic pop
+#endif
 
 // clean up
+#undef JSON_INTERNAL_CATCH
 #undef JSON_CATCH
-#undef JSON_DEPRECATED
 #undef JSON_THROW
 #undef JSON_TRY
+#undef JSON_LIKELY
+#undef JSON_UNLIKELY
+#undef JSON_DEPRECATED
+#undef JSON_NODISCARD
+#undef JSON_HAS_CPP_14
+#undef JSON_HAS_CPP_17
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
 
-#endif
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 089e19d776..6dc9432799 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -57,7 +57,6 @@ struct TestResult {
          */
         enum class Reason {
             MissingKey,       ///< The offending key that was requested was not found
-            ExtraKey,         ///< The exhaustive documentation contained an extra key
             WrongType,        ///< The key's value was not of the expected type
             Verification,     ///< The value did not pass a necessary non-type verifier
             UnknownIdentifier ///< The identifier for a ReferencingVerifier did not exist
diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index 3e21f81f35..994ba901fa 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -52,6 +52,7 @@ struct WindowDelegate;
 namespace configuration { struct Configuration; }
 namespace interaction {
     struct JoystickInputStates;
+    struct WebsocketInputStates;
     class KeybindingManager;
     class NavigationHandler;
     class SessionRecording;
@@ -87,6 +88,7 @@ VirtualPropertyManager& gVirtualPropertyManager();
 WindowDelegate& gWindowDelegate();
 configuration::Configuration& gConfiguration();
 interaction::JoystickInputStates& gJoystickInputStates();
+interaction::WebsocketInputStates& gWebsocketInputStates();
 interaction::KeybindingManager& gKeybindingManager();
 interaction::NavigationHandler& gNavigationHandler();
 interaction::SessionRecording& gSessionRecording();
@@ -120,6 +122,8 @@ static WindowDelegate& windowDelegate = detail::gWindowDelegate();
 static configuration::Configuration& configuration = detail::gConfiguration();
 static interaction::JoystickInputStates& joystickInputStates =
     detail::gJoystickInputStates();
+static interaction::WebsocketInputStates& websocketInputStates =
+    detail::gWebsocketInputStates();
 static interaction::KeybindingManager& keybindingManager = detail::gKeybindingManager();
 static interaction::NavigationHandler& navigationHandler = detail::gNavigationHandler();
 static interaction::SessionRecording& sessionRecording = detail::gSessionRecording();
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index f0d8523264..fb0ad85061 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -109,6 +109,7 @@ private:
 
     std::unique_ptr<Scene> _scene;
     std::unique_ptr<AssetManager> _assetManager;
+    bool _shouldAbortLoading = false;
     std::unique_ptr<LoadingScreen> _loadingScreen;
     std::unique_ptr<VersionChecker> _versionChecker;
 
diff --git a/include/openspace/interaction/inputstate.h b/include/openspace/interaction/inputstate.h
index 3442e47866..1ff5b39b8b 100644
--- a/include/openspace/interaction/inputstate.h
+++ b/include/openspace/interaction/inputstate.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___INPUTSTATE___H__
 #define __OPENSPACE_CORE___INPUTSTATE___H__
 
+#include <openspace/interaction/websocketinputstate.h>
 #include <openspace/util/keys.h>
 #include <openspace/util/mouse.h>
 #include <ghoul/glm.h>
@@ -33,6 +34,7 @@
 namespace openspace::interaction {
 
 struct JoystickInputStates;
+struct WebsocketInputStates;
 
 // This class represents the global input state of interaction devices
 class InputState {
@@ -56,6 +58,12 @@ public:
     float joystickAxis(int i) const;
     bool joystickButton(int i) const;
 
+    WebsocketInputStates& websocketInputStates();
+    float websocketAxis(int i) const;
+    bool websocketButton(int i) const;
+    bool hasWebsocketStates() const;
+    void resetWebsockets();
+
 private:
     // Input from keyboard
     std::vector<std::pair<Key, KeyModifier>> _keysDown;
diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/interaction/interpolator.h
index b2f79a9e55..54750bc1eb 100644
--- a/include/openspace/interaction/interpolator.h
+++ b/include/openspace/interaction/interpolator.h
@@ -51,7 +51,7 @@ public:
 
 private:
     std::function<T(float)> _transferFunction;
-    float _t = 0.f;
+    float _t = 1.f;
     float _interpolationTime = 1.f;
     float _scaledDeltaTime = 0.f;
 };
diff --git a/include/openspace/interaction/navigationhandler.h b/include/openspace/interaction/navigationhandler.h
index 3ab99cd0e9..1d6249c6d0 100644
--- a/include/openspace/interaction/navigationhandler.h
+++ b/include/openspace/interaction/navigationhandler.h
@@ -25,13 +25,18 @@
 #ifndef __OPENSPACE_CORE___NAVIGATIONHANDLER___H__
 #define __OPENSPACE_CORE___NAVIGATIONHANDLER___H__
 
-#include <openspace/properties/propertyowner.h>
-
+#include <openspace/documentation/documentation.h>
+#include <openspace/interaction/inputstate.h>
 #include <openspace/interaction/joystickcamerastates.h>
+#include <openspace/interaction/orbitalnavigator.h>
+#include <openspace/interaction/keyframenavigator.h>
+#include <openspace/properties/propertyowner.h>
+#include <openspace/interaction/websocketcamerastates.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/util/mouse.h>
 #include <openspace/util/keys.h>
+#include <optional>
 
 namespace openspace {
     class Camera;
@@ -43,11 +48,31 @@ namespace openspace::scripting { struct LuaLibrary; }
 namespace openspace::interaction {
 
 struct JoystickInputStates;
+struct WebsocketInputStates;
 class KeyframeNavigator;
 class OrbitalNavigator;
 
 class NavigationHandler : public properties::PropertyOwner {
 public:
+    struct NavigationState {
+        NavigationState() = default;
+        NavigationState(const ghoul::Dictionary& dictionary);
+        NavigationState(std::string anchor, std::string aim, std::string referenceFrame,
+            glm::dvec3 position, std::optional<glm::dvec3> up = std::nullopt,
+            double yaw = 0.0, double pitch = 0.0);
+
+        ghoul::Dictionary dictionary() const;
+        static documentation::Documentation Documentation();
+
+        std::string anchor;
+        std::string aim;
+        std::string referenceFrame;
+        glm::dvec3 position;
+        std::optional<glm::dvec3> up;
+        double yaw = 0.0;
+        double pitch = 0.0;
+    };
+
     NavigationHandler();
     ~NavigationHandler();
 
@@ -55,10 +80,10 @@ public:
     void deinitialize();
 
     // Mutators
+    void setNavigationStateNextFame(NavigationState state);
     void setCamera(Camera* camera);
     void setInterpolationTime(float durationInSeconds);
 
-    void setCameraStateFromDictionary(const ghoul::Dictionary& cameraDict);
     void updateCamera(double deltaTime);
     void setEnableKeyFrameInteraction();
     void setDisableKeyFrameInteraction();
@@ -66,12 +91,11 @@ public:
     void stopPlayback();
 
     // Accessors
-    ghoul::Dictionary cameraStateDictionary();
     Camera* camera() const;
     const InputState& inputState() const;
     const OrbitalNavigator& orbitalNavigator() const;
     OrbitalNavigator& orbitalNavigator();
-    KeyframeNavigator& keyframeNavigator() const;
+    KeyframeNavigator& keyframeNavigator();
     bool isKeyFrameInteractionEnabled() const;
     float interpolationTime() const;
 
@@ -100,10 +124,21 @@ public:
     void clearJoystickButtonCommand(int button);
     std::vector<std::string> joystickButtonCommand(int button) const;
 
+    // Websockets
+    void setWebsocketAxisMapping(int axis, WebsocketCameraStates::AxisType mapping,
+        WebsocketCameraStates::AxisInvert shouldInvert =
+        WebsocketCameraStates::AxisInvert::No,
+        WebsocketCameraStates::AxisNormalize shouldNormalize =
+        WebsocketCameraStates::AxisNormalize::No);
+    
+    NavigationState navigationState(const SceneGraphNode& referenceFrame) const;
 
+    void saveNavigationState(const std::string& filepath,
+        const std::string& referenceFrameIdentifier);
 
-    void saveCameraStateToFile(const std::string& filepath);
-    void restoreCameraStateFromFile(const std::string& filepath);
+    void loadNavigationState(const std::string& filepath);
+
+    void setNavigationStateNextFrame(NavigationState state);
 
     /**
     * \return The Lua library that contains all Lua functions available to affect the
@@ -112,15 +147,18 @@ public:
     static scripting::LuaLibrary luaLibrary();
 
 private:
-    bool _cameraUpdatedFromScript = false;
+    void applyNavigationState(const NavigationHandler::NavigationState& ns);
+
     bool _playbackModeEnabled = false;
 
-    std::unique_ptr<InputState> _inputState;
+    InputState _inputState;
     Camera* _camera = nullptr;
     std::function<void()> _playbackEndCallback;
 
-    std::unique_ptr<OrbitalNavigator> _orbitalNavigator;
-    std::unique_ptr<KeyframeNavigator> _keyframeNavigator;
+    OrbitalNavigator _orbitalNavigator;
+    KeyframeNavigator _keyframeNavigator;
+
+    std::optional<NavigationState> _pendingNavigationState;
 
     properties::BoolProperty _useKeyFrameInteraction;
 };
diff --git a/include/openspace/interaction/orbitalnavigator.h b/include/openspace/interaction/orbitalnavigator.h
index 3f60af50c6..7ee5368b03 100644
--- a/include/openspace/interaction/orbitalnavigator.h
+++ b/include/openspace/interaction/orbitalnavigator.h
@@ -31,6 +31,8 @@
 #include <openspace/interaction/interpolator.h>
 #include <openspace/interaction/joystickcamerastates.h>
 #include <openspace/interaction/mousecamerastates.h>
+#include <openspace/interaction/scriptcamerastates.h>
+#include <openspace/interaction/websocketcamerastates.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
@@ -38,6 +40,8 @@
 #include <ghoul/glm.h>
 #include <glm/gtx/quaternion.hpp>
 
+#include <optional>
+
 namespace openspace {
     class SceneGraphNode;
     class Camera;
@@ -58,6 +62,7 @@ public:
 
     Camera* camera() const;
     void setCamera(Camera* camera);
+    void clearPreviousState();
 
     void setFocusNode(const std::string& focusNode);
     void setAnchorNode(const std::string& anchorNode);
@@ -70,6 +75,13 @@ public:
     void resetNodeMovements();
 
     JoystickCameraStates& joystickStates();
+    const JoystickCameraStates& joystickStates() const;
+    
+    WebsocketCameraStates& websocketStates();
+    const WebsocketCameraStates& websocketStates() const;
+    
+    ScriptCameraStates& scriptStates();
+    const ScriptCameraStates& scriptStates() const;
 
     bool followingNodeRotation() const;
     const SceneGraphNode* anchorNode() const;
@@ -131,6 +143,7 @@ private:
 
     properties::FloatProperty _mouseSensitivity;
     properties::FloatProperty _joystickSensitivity;
+    properties::FloatProperty _websocketSensitivity;
 
     properties::BoolProperty _useAdaptiveStereoscopicDepth;
     properties::FloatProperty _stereoscopicDepthOfFocusSurface;
@@ -142,14 +155,15 @@ private:
 
     MouseCameraStates _mouseStates;
     JoystickCameraStates _joystickStates;
+    WebsocketCameraStates _websocketStates;
+    ScriptCameraStates _scriptStates;
 
     const SceneGraphNode* _anchorNode = nullptr;
     const SceneGraphNode* _aimNode = nullptr;
 
-    glm::dvec3 _previousAnchorNodePosition;
-    glm::dquat _previousAnchorNodeRotation;
-
-    glm::dvec3 _previousAimNodePosition;
+    std::optional<glm::dvec3>_previousAnchorNodePosition;
+    std::optional<glm::dquat> _previousAnchorNodeRotation;
+    std::optional<glm::dvec3> _previousAimNodePosition;
 
     double _currentCameraToSurfaceDistance = 0.0;
     bool _directlySetStereoDistance = false;
diff --git a/include/openspace/interaction/scriptcamerastates.h b/include/openspace/interaction/scriptcamerastates.h
new file mode 100644
index 0000000000..2153dee497
--- /dev/null
+++ b/include/openspace/interaction/scriptcamerastates.h
@@ -0,0 +1,54 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__
+#define __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__
+
+#include <openspace/interaction/camerainteractionstates.h>
+
+namespace openspace::interaction {
+
+class ScriptCameraStates : public CameraInteractionStates {
+public:
+    ScriptCameraStates();
+
+    void updateStateFromInput(const InputState& inputState, double deltaTime) override;
+
+    void addLocalRotation(const glm::dvec2& delta);
+    void addGlobalRotation(const glm::dvec2& delta);
+    void addTruckMovement(const glm::dvec2& delta);
+    void addLocalRoll(const glm::dvec2& delta);
+    void addGlobalRoll(const glm::dvec2& delta);
+
+private:
+    glm::dvec2 _localRotation;
+    glm::dvec2 _globalRotation;
+    glm::dvec2 _truckMovement;
+    glm::dvec2 _localRoll;
+    glm::dvec2 _globalRoll;
+};
+
+} // namespace openspace::interaction
+
+#endif // __OPENSPACE_CORE___SCRIPTCAMERASTATES___H__
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 470f018fcb..26c5f5a094 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -221,7 +221,6 @@ private:
         double timestamp;
     };
     ExternInteraction _externInteract;
-    bool _isRecording = false;
     double _timestampRecordStarted = 0.0;
     double _timestampPlaybackStarted_application = 0.0;
     double _timestampPlaybackStarted_simulation = 0.0;
diff --git a/include/openspace/interaction/websocketcamerastates.h b/include/openspace/interaction/websocketcamerastates.h
new file mode 100644
index 0000000000..ab38160203
--- /dev/null
+++ b/include/openspace/interaction/websocketcamerastates.h
@@ -0,0 +1,117 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__
+#define __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__
+
+#include <openspace/interaction/camerainteractionstates.h>
+
+#include <openspace/interaction/websocketinputstate.h>
+#include <ghoul/misc/boolean.h>
+#include <ghoul/misc/stringconversion.h>
+#include <map>
+#include <vector>
+
+namespace openspace::interaction {
+
+class WebsocketCameraStates : public CameraInteractionStates {
+public:
+    enum class AxisType {
+        None = 0,
+        OrbitX,
+        OrbitY,
+        ZoomIn,
+        ZoomOut,
+        LocalRollX,
+        LocalRollY,
+        GlobalRollX,
+        GlobalRollY,
+        PanX,
+        PanY
+    };
+
+    BooleanType(AxisInvert);
+    BooleanType(AxisNormalize);
+    BooleanType(ButtonCommandRemote);
+
+    struct AxisInformation {
+        AxisType type = AxisType::None;
+        AxisInvert invert = AxisInvert::No;
+        AxisNormalize normalize = AxisNormalize::No;
+
+        float deadzone = 0.f;
+    };
+
+    WebsocketCameraStates(double sensitivity, double velocityScaleFactor);
+
+    void updateStateFromInput(const InputState& inputState, double deltaTime) override;
+
+    void setAxisMapping(int axis, AxisType mapping,
+        AxisInvert shouldInvert = AxisInvert::No,
+        AxisNormalize shouldNormalize = AxisNormalize::No
+    );
+
+    AxisInformation axisMapping(int axis) const;
+
+    void setDeadzone(int axis, float deadzone);
+    float deadzone(int axis) const;
+
+
+    void bindButtonCommand(int button, std::string command, WebsocketAction action,
+        ButtonCommandRemote remote, std::string documentation);
+    void clearButtonCommand(int button);
+    std::vector<std::string> buttonCommand(int button) const;
+
+private:
+    // We use an array for the axes and a map for the buttons since the axis are going to
+    // be accessed much more often and thus have to be more efficient. And storing a few
+    // extra AxisInformation that are not used will not matter that much; finding an axis
+    // location in a potential map each frame, however, would
+
+    std::array<AxisInformation, WebsocketInputState::MaxAxes> _axisMapping;
+
+    struct ButtonInformation {
+        std::string command;
+        WebsocketAction action;
+        ButtonCommandRemote synchronization;
+        std::string documentation;
+    };
+
+    std::multimap<int, ButtonInformation> _buttonMapping;
+};
+
+} // namespace openspace::interaction
+
+namespace ghoul {
+
+template <>
+std::string to_string(const openspace::interaction::WebsocketCameraStates::AxisType& type);
+
+template <>
+openspace::interaction::WebsocketCameraStates::AxisType
+from_string(const std::string& string);
+
+} // namespace ghoul
+
+#endif // __OPENSPACE_CORE___WEBSOCKETCAMERASTATES___H__
diff --git a/include/openspace/interaction/websocketinputstate.h b/include/openspace/interaction/websocketinputstate.h
new file mode 100644
index 0000000000..a5a722491e
--- /dev/null
+++ b/include/openspace/interaction/websocketinputstate.h
@@ -0,0 +1,125 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
+#define __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
+
+#include <ghoul/misc/stringconversion.h>
+#include <array>
+#include <memory>
+#include <unordered_map>
+#include <string>
+
+namespace openspace::interaction {
+
+/**
+ * Actions that any button of a websocket can have. Each button must be in one of these
+ * states
+ */
+enum class WebsocketAction : uint8_t {
+    /// Idle state if the button is unpressed and has been unpressed since last frame
+    Idle = 0,
+    /// If the button has been pressed since the last frame
+    Press,
+    /// If the button has been pressed since longer than last frame
+    Repeat,
+    /// If the button was released since the last frame
+    Release
+};
+
+/**
+ * The input state of a single websocket.
+ */
+struct WebsocketInputState {
+    /// The maximum number of supported axes
+    static constexpr const int MaxAxes = 10;
+    /// The maximum number of supported buttons
+    static constexpr const int MaxButtons = 32;
+
+    /// Marks whether this websocket is connected. If this value is \c false, all other
+    /// members of this struct are undefined
+    bool isConnected = false;
+
+    /// The name of this websocket
+    std::string name;
+
+    /// The number of axes that this websocket supports
+    int nAxes = 0;
+    /// The values for each axis. Each value is in the range [-1, 1]. Only the first
+    /// \c nAxes values are defined values, the rest are undefined
+    std::array<float, MaxAxes> axes;
+
+    /// The number of buttons that this websocket possesses
+    int nButtons = 0;
+    /// The status of each button. Only the first \c nButtons values are defined, the rest
+    /// are undefined
+    std::array<WebsocketAction, MaxButtons> buttons;
+};
+
+/// The maximum number of websockets that are supported by this system. This number is
+/// derived from the available GLFW constants
+constexpr const int MaxWebsockets = 16;
+//struct WebsocketInputStates : public std::array<WebsocketInputState, MaxWebsockets> {
+struct WebsocketInputStates : public std::unordered_map<size_t, WebsocketInputState*> {
+    /**
+     * This function adds the contributions of all connected websockets for the provided
+     * \p axis. After adding each websockets contribution, the result is clamped to [-1,1].
+     * If a websocket does not possess a particular axis, it's does not contribute to the
+     * sum.
+     *
+     * \param axis The numerical axis for which the values are added
+     * \return The summed axis values of all connected websockets
+     *
+     * \pre \p axis must be 0 or positive
+     */
+    float axis(int axis) const;
+
+    /**
+     * This functions checks whether any connected websocket has its \p button in the
+     * passed \p action. Any websocket that does not posses the \p button, it will be
+     * ignored.
+     *
+     * \param button The button that is to be checked
+     * \param action The action which is checked for each button
+     * \return \c true if there is at least one websocket whose \param button is in the
+     *         \p action state
+     *
+     * \pre \p button must be 0 or positive
+     */
+    bool button(int button, WebsocketAction action) const;
+};
+
+} // namespace openspace::interaction
+
+namespace ghoul {
+
+template <>
+std::string to_string(const openspace::interaction::WebsocketAction& action);
+
+template <>
+openspace::interaction::WebsocketAction from_string(const std::string& str);
+
+} // namespace ghoul
+
+#endif // __OPENSPACE_CORE___WEBSOCKETINPUTSTATE___H__
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 8844726c53..d7134b9c54 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -303,7 +303,6 @@ protected:
     /// The description for this PropertyOwner
     std::string _description;
 
-private:
     /// The owner of this PropertyOwner
     PropertyOwner* _owner = nullptr;
     /// A list of all registered Property's
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index 453d12a460..0c4a300776 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -86,8 +86,8 @@ public:
     struct ProgressInfo {
         float progress = 0.f;
 
-        int currentSize = -1;
-        int totalSize = -1;
+        int64_t currentSize = -1;
+        int64_t totalSize = -1;
     };
 
     void updateItem(const std::string& itemIdentifier, const std::string& itemName,
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 779e6cf926..3ab7b9baaf 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -187,7 +187,21 @@ private:
     properties::TriggerProperty _takeScreenshot;
     bool _shouldTakeScreenshot = false;
     properties::BoolProperty _applyWarping;
-    properties::BoolProperty _showFrameNumber;
+    properties::BoolProperty _showFrameInformation;
+#ifdef OPENSPACE_WITH_INSTRUMENTATION
+    struct FrameInfo {
+        uint64_t iFrame;
+        double deltaTime;
+        double avgDeltaTime;
+    };
+
+    struct {
+        std::vector<FrameInfo> frames;
+        uint64_t lastSavedFrame = 0;
+        uint16_t saveEveryNthFrame = 2048;
+    } _frameInfo;
+    properties::BoolProperty _saveFrameInformation;
+#endif // OPENSPACE_WITH_INSTRUMENTATION
     properties::BoolProperty _disableMasterRendering;
 
     properties::FloatProperty _globalBlackOutFactor;
@@ -205,7 +219,7 @@ private:
 
     std::vector<ghoul::opengl::ProgramObject*> _programs;
 
-    std::shared_ptr<ghoul::fontrendering::Font> _fontBig;
+    std::shared_ptr<ghoul::fontrendering::Font> _fontFrameInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontInfo;
     std::shared_ptr<ghoul::fontrendering::Font> _fontDate;
     std::shared_ptr<ghoul::fontrendering::Font> _fontLog;
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 6f780f29b4..d5dfabef94 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -82,7 +82,7 @@ protected:
 
     void draw(glm::mat4 modelTransform);
 
-    virtual void bindTexture();
+    virtual void bindTexture() = 0;
     virtual void unbindTexture();
 
     properties::BoolProperty _enabled;
@@ -106,10 +106,8 @@ protected:
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize;
-    UniformCache(occlusionDepth, alpha, modelTransform, viewProj, texture) _uniformCache;
+    UniformCache(alpha, modelTransform, viewProj, texture) _uniformCache;
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
-
-    glm::vec2 _originalViewportSize;
 };
 
 } // namespace openspace
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index aa8cf2e4c0..d784ac2426 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -65,7 +65,7 @@ public:
      */
     static double convertTime(const std::string& time);
 
-    Time(double secondsJ2000 = -1);
+    explicit Time(double secondsJ2000 = -1);
     Time(const Time& other) = default;
 
     /**
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index b47d9cf4e3..81f2a9687b 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -44,7 +44,12 @@ struct KeyframeBase {
 */
 template <typename T>
 struct Keyframe : public KeyframeBase {
-    Keyframe(size_t i, double t, T p);
+    Keyframe(size_t i, double t, T d);
+
+    Keyframe(Keyframe const&) = default;
+    Keyframe(Keyframe&&) = default;
+    Keyframe& operator=(Keyframe&&) = default;
+    Keyframe& operator=(Keyframe const&) = default;
     T data;
 };
 
@@ -56,7 +61,8 @@ class Timeline {
 public:
     virtual ~Timeline() = default;
 
-    void addKeyframe(double time, T data);
+    void addKeyframe(double time, const T& data);
+    void addKeyframe(double time, T&& data);
     void clearKeyframes();
     void removeKeyframe(size_t id);
     void removeKeyframesBefore(double timestamp, bool inclusive = false);
@@ -66,6 +72,7 @@ public:
     size_t nKeyframes() const;
     const Keyframe<T>* firstKeyframeAfter(double timestamp, bool inclusive = false) const;
     const Keyframe<T>* lastKeyframeBefore(double timestamp, bool inclusive = false) const;
+
     const std::deque<Keyframe<T>>& keyframes() const;
 
 private:
diff --git a/include/openspace/util/timeline.inl b/include/openspace/util/timeline.inl
index 79ccf4c51a..d2811a6aee 100644
--- a/include/openspace/util/timeline.inl
+++ b/include/openspace/util/timeline.inl
@@ -25,13 +25,25 @@
 namespace openspace {
 
 template <typename T>
-Keyframe<T>::Keyframe(size_t i, double t, T p)
+Keyframe<T>::Keyframe(size_t i, double t, T d)
     : KeyframeBase{ i, t }
-    , data(p)
+    , data(std::move(d))
 {}
 
 template <typename T>
-void Timeline<T>::addKeyframe(double timestamp, T data) {
+void Timeline<T>::addKeyframe(double timestamp, T&& data) {
+    Keyframe<T> keyframe(++_nextKeyframeId, timestamp, std::move(data));
+    const auto iter = std::upper_bound(
+        _keyframes.cbegin(),
+        _keyframes.cend(),
+        keyframe,
+        &compareKeyframeTimes
+    );
+    _keyframes.insert(iter, std::move(keyframe));
+}
+
+template <typename T>
+void Timeline<T>::addKeyframe(double timestamp, const T& data) {
     Keyframe<T> keyframe(++_nextKeyframeId, timestamp, data);
     const auto iter = std::upper_bound(
         _keyframes.cbegin(),
@@ -39,7 +51,7 @@ void Timeline<T>::addKeyframe(double timestamp, T data) {
         keyframe,
         &compareKeyframeTimes
     );
-    _keyframes.insert(iter, keyframe);
+    _keyframes.insert(iter, std::move(keyframe));
 }
 
 template <typename T>
@@ -143,7 +155,7 @@ void Timeline<T>::removeKeyframe(size_t id) {
         std::remove_if(
             _keyframes.begin(),
             _keyframes.end(),
-            [id] (Keyframe<T> keyframe) { return keyframe.id == id; }
+            [id] (const Keyframe<T>& keyframe) { return keyframe.id == id; }
         ),
         _keyframes.end()
     );
@@ -209,7 +221,7 @@ const Keyframe<T>* Timeline<T>::lastKeyframeBefore(double timestamp, bool inclus
     return &(*it);
 }
 
-template<typename T>
+template <typename T>
 const std::deque<Keyframe<T>>& Timeline<T>::keyframes() const {
     return _keyframes;
 }
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 4836e32ead..9a7802b815 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -261,8 +261,8 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
             program.setUniform(_uniformCache2.dModelTransformMatrix, _modelTransform);
 
             // Eye Space in SGCT to Eye Space in OS (SGCT View to OS Camera Rig)
-            glm::dmat4 dSgctEye2OSEye = glm::inverse(
-                glm::dmat4(renderData.camera.viewMatrix()));
+//            glm::dmat4 dSgctEye2OSEye = glm::inverse(
+//                glm::dmat4(renderData.camera.viewMatrix()));
 
             glm::dmat4 dSGCTViewToWorldMatrix = glm::inverse(
                 renderData.camera.combinedViewMatrix()
@@ -1508,7 +1508,7 @@ bool AtmosphereDeferredcaster::isAtmosphereInFrustum(const glm::dmat4& MVMatrix,
     double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
     double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
     double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
-    double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
+//    double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
 
     // Normalize Planes
     double invMag = 1.0 / glm::length(leftNormal);
@@ -1533,7 +1533,7 @@ bool AtmosphereDeferredcaster::isAtmosphereInFrustum(const glm::dmat4& MVMatrix,
 
     invMag = 1.0 / glm::length(farNormal);
     farNormal *= invMag;
-    farDistance *= invMag;
+//    farDistance *= invMag;
 
     if ((glm::dot(leftNormal, position) + leftDistance) < -radius) {
         return false;
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index de4b747968..2ce1e6846c 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -54,8 +54,7 @@ set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/timelinerotation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.h
@@ -65,6 +64,10 @@ set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.h
   ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.h
   ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/translation/timelinetranslation.h
+  
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
@@ -98,8 +101,7 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/timelinerotation.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.cpp
@@ -109,6 +111,9 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/translation/timelinetranslation.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index ead6089797..ba70bd6c2e 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -55,9 +55,11 @@
 #include <modules/base/rotation/fixedrotation.h>
 #include <modules/base/rotation/luarotation.h>
 #include <modules/base/rotation/staticrotation.h>
+#include <modules/base/rotation/timelinerotation.h>
 #include <modules/base/scale/luascale.h>
 #include <modules/base/scale/staticscale.h>
 #include <modules/base/scale/timedependentscale.h>
+#include <modules/base/translation/timelinetranslation.h>
 #include <modules/base/translation/luatranslation.h>
 #include <modules/base/translation/statictranslation.h>
 #include <modules/base/timeframe/timeframeinterval.h>
@@ -131,6 +133,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     auto fTranslation = FactoryManager::ref().factory<Translation>();
     ghoul_assert(fTranslation, "Ephemeris factory was not created");
 
+    fTranslation->registerClass<TimelineTranslation>("TimelineTranslation");
     fTranslation->registerClass<LuaTranslation>("LuaTranslation");
     fTranslation->registerClass<StaticTranslation>("StaticTranslation");
 
@@ -141,6 +144,8 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
     fRotation->registerClass<FixedRotation>("FixedRotation");
     fRotation->registerClass<LuaRotation>("LuaRotation");
     fRotation->registerClass<StaticRotation>("StaticRotation");
+    fRotation->registerClass<TimelineRotation>("TimelineRotation");
+
 
     auto fScale = FactoryManager::ref().factory<Scale>();
     ghoul_assert(fScale, "Scale factory was not created");
@@ -198,6 +203,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         FixedRotation::Documentation(),
         LuaRotation::Documentation(),
         StaticRotation::Documentation(),
+        TimelineRotation::Documentation(),
 
         LuaScale::Documentation(),
         StaticScale::Documentation(),
@@ -205,6 +211,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
 
         LuaTranslation::Documentation(),
         StaticTranslation::Documentation(),
+        TimelineTranslation::Documentation(),
 
         TimeFrameInterval::Documentation(),
         TimeFrameUnion::Documentation(),
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 006667a6f2..bdc10a49a0 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -289,7 +289,7 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
     );
 
     int nLines = output.empty() ? 0 :
-        (std::count(output.begin(), output.end(), '\n') + 1);
+        static_cast<int>((std::count(output.begin(), output.end(), '\n') + 1));
 
     penPosition.y -= _font->height() * static_cast<float>(nLines);
 
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index e00156ec72..f8a306a6d2 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -233,8 +233,8 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
     // Write the current location into the floating position
     const glm::vec3 p = _translation->position({
         {},
-        data.time.j2000Seconds(),
-        0.0,
+        data.time,
+        Time(0.0),
         false
     });
     _vertexArray[_primaryRenderInformation.first] = { p.x, p.y, p.z };
@@ -412,8 +412,8 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
             // location
             const glm::vec3 p = _translation->position({
                 {},
-                _lastPointTime,
-                0.0,
+                Time(_lastPointTime),
+                Time(0.0),
                 false
             });
             _vertexArray[_primaryRenderInformation.first] = { p.x, p.y, p.z };
@@ -452,8 +452,8 @@ RenderableTrailOrbit::UpdateReport RenderableTrailOrbit::updateTrails(
             // location
             const glm::vec3 p = _translation->position({
                 {},
-                _firstPointTime,
-                0.0,
+                Time(_firstPointTime),
+                Time(0.0),
                 false
             });
             _vertexArray[_primaryRenderInformation.first] = { p.x, p.y, p.z };
@@ -496,7 +496,7 @@ void RenderableTrailOrbit::fullSweep(double time) {
     const double secondsPerPoint = _period / (_resolution - 1);
     // starting at 1 because the first position is a floating current one
     for (int i = 1; i < _resolution; ++i) {
-        const glm::vec3 p = _translation->position({ {}, time, 0.0, false });
+        const glm::vec3 p = _translation->position({ {}, Time(time), Time(0.0), false });
         _vertexArray[i] = { p.x, p.y, p.z };
 
         time -= secondsPerPoint;
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 54f51f1c27..ee019b8827 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -226,8 +226,8 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
         for (int i = 0; i < nValues; ++i) {
             const glm::vec3 p = _translation->position({
                 {},
-                _start + i * totalSampleInterval,
-                0.0,
+                Time(_start + i * totalSampleInterval),
+                Time(0.0),
                 false
             });
             _vertexArray[i] = { p.x, p.y, p.z };
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 9f271d350c..d86376d06f 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -212,7 +212,6 @@ void ScreenSpaceDashboard::update() {
     if (global::windowDelegate.windowHasResized()) {
         const glm::ivec2 size = global::windowDelegate.currentWindowResolution();
         _size = { 0.f, 0.f, size.x, size.y };
-        _originalViewportSize = size;
         createFramebuffer();
     }
 }
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index 28ba4d80e0..5a94669b99 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -106,15 +106,15 @@ void ScreenSpaceFramebuffer::render() {
     const glm::vec2& resolution = global::windowDelegate.currentWindowResolution();
     const glm::vec4& size = _size.value();
 
-    const float xratio = _originalViewportSize.x / (size.z - size.x);
-    const float yratio = _originalViewportSize.y / (size.w - size.y);;
+    const float xratio = resolution.x / (size.z - size.x);
+    const float yratio = resolution.y / (size.w - size.y);;
 
     if (!_renderFunctions.empty()) {
         glViewport(
             static_cast<GLint>(-size.x * xratio),
             static_cast<GLint>(-size.y * yratio),
-            static_cast<GLsizei>(_originalViewportSize.x * xratio),
-            static_cast<GLsizei>(_originalViewportSize.y * yratio)
+            static_cast<GLsizei>(resolution.x * xratio),
+            static_cast<GLsizei>(resolution.y * yratio)
         );
         GLint defaultFBO = _framebuffer->getActiveObject();
         _framebuffer->activate();
@@ -170,14 +170,16 @@ void ScreenSpaceFramebuffer::removeAllRenderFunctions() {
 }
 
 void ScreenSpaceFramebuffer::createFramebuffer() {
+    glm::vec2 resolution = global::windowDelegate.currentWindowResolution();
+
     _framebuffer = std::make_unique<ghoul::opengl::FramebufferObject>();
     _framebuffer->activate();
     _texture = std::make_unique<ghoul::opengl::Texture>(glm::uvec3(
-        _originalViewportSize.x,
-        _originalViewportSize.y,
+        resolution.x,
+        resolution.y,
         1
     ));
-    _objectSize = glm::ivec2(_originalViewportSize);
+    _objectSize = glm::ivec2(resolution);
 
     _texture->uploadTexture();
     _texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap);
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index a0751cf9f0..392a8952d0 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -28,6 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureconversion.h>
@@ -96,11 +97,30 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
         setGuiName("ScreenSpaceImageLocal " + std::to_string(iIdentifier));
     }
 
-    _texturePath.onChange([this]() { _textureIsDirty = true; });
+    _texturePath.onChange([this]() {
+        if (!FileSys.fileExists(FileSys.absolutePath(_texturePath))) {
+            LWARNINGC(
+                "ScreenSpaceImageLocal",
+                fmt::format("Image {} did not exist for {}", _texturePath, _identifier)
+            );
+        }
+        else {
+            _textureIsDirty = true;
+        }
+    });
     addProperty(_texturePath);
 
     if (dictionary.hasKey(TexturePathInfo.identifier)) {
-        _texturePath = dictionary.value<std::string>(TexturePathInfo.identifier);
+        std::string path = dictionary.value<std::string>(TexturePathInfo.identifier);
+        if (!FileSys.fileExists(FileSys.absolutePath(path))) {
+            LWARNINGC(
+                "ScreenSpaceImageLocal",
+                fmt::format("Image {} did not exist for {}", path, _identifier)
+            );
+        }
+        else {
+            _texturePath = path;
+        }
     }
 }
 
@@ -130,12 +150,13 @@ void ScreenSpaceImageLocal::update() {
             _objectSize = _texture->dimensions();
             _textureIsDirty = false;
         }
-
     }
 }
 
 void ScreenSpaceImageLocal::bindTexture() {
-    _texture->bind();
+    if (_texture) {
+        _texture->bind();
+    }
 }
 
 } // namespace openspace
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
new file mode 100644
index 0000000000..b55389aa6d
--- /dev/null
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -0,0 +1,118 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/rotation/timelinerotation.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/util/updatestructures.h>
+#include <openspace/util/time.h>
+
+namespace {
+    constexpr const char* KeyType = "Type";
+    constexpr const char* KeyKeyframes = "Keyframes";
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation TimelineRotation::Documentation() {
+    using namespace documentation;
+    return {
+        "Timeline Rotation",
+        "base_transform_rotation_keyframe",
+        {
+            {
+                KeyType,
+                new StringEqualVerifier("TimelineRotation"),
+                Optional::No
+            },
+            {
+                KeyKeyframes,
+                new TableVerifier({
+                    { "*", new TableVerifier(), Optional::No, "Any translation object" }
+                }),
+                Optional::No,
+                "A table of keyframes, with keys formatted as YYYY-MM-DDTHH:MM:SS"
+                "and values that are valid Rotation objects."
+            }
+        }
+    };
+}
+
+TimelineRotation::TimelineRotation(const ghoul::Dictionary& dictionary) {
+    documentation::testSpecificationAndThrow(
+        Documentation(),
+        dictionary,
+        "TimelineTranslation"
+    );
+
+    const ghoul::Dictionary& keyframes =
+        dictionary.value<ghoul::Dictionary>(KeyKeyframes);
+
+    std::vector<std::string> timeStrings = keyframes.keys();
+    for (const std::string& timeString : timeStrings) {
+        const double t = Time::convertTime(timeString);
+
+        std::unique_ptr<Rotation> rotation =
+            Rotation::createFromDictionary(
+                keyframes.value<ghoul::Dictionary>(timeString)
+            );
+
+        if (rotation) {
+            _timeline.addKeyframe(t, std::move(rotation));
+        }
+    }
+}
+
+glm::dmat3 TimelineRotation::matrix(const UpdateData& data) const {
+    const double now = data.time.j2000Seconds();
+    using KeyframePointer = const Keyframe<std::unique_ptr<Rotation>>*;
+
+    KeyframePointer prev = _timeline.lastKeyframeBefore(now, true);
+    KeyframePointer next = _timeline.firstKeyframeAfter(now, true);
+
+    if (!prev && !next) {
+        return glm::dmat3(0.0);
+    }
+    if (!prev) {
+        prev = next;
+    }
+    if (!next) {
+        next = prev;
+    }
+    const double prevTime = prev->timestamp;
+    const double nextTime = next->timestamp;
+
+    double t = 0.0;
+    if (nextTime - prevTime > 0.0) {
+        t = (now - prevTime) / (nextTime - prevTime);
+    }
+
+    const glm::dquat nextRot = glm::quat_cast(next->data->matrix(data));
+    const glm::dquat prevRot = glm::quat_cast(prev->data->matrix(data));
+
+    return glm::dmat3(glm::slerp(prevRot, nextRot, t));
+}
+
+} // namespace openspace
diff --git a/modules/base/rotation/timelinerotation.h b/modules/base/rotation/timelinerotation.h
new file mode 100644
index 0000000000..a969341a89
--- /dev/null
+++ b/modules/base/rotation/timelinerotation.h
@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_BASE___TIMELINEROTATION___H__
+#define __OPENSPACE_MODULE_BASE___TIMELINEROTATION___H__
+
+#include <openspace/scene/rotation.h>
+#include <openspace/util/timeline.h>
+
+namespace openspace {
+
+struct UpdateData;
+
+namespace documentation { struct Documentation; }
+
+class TimelineRotation : public Rotation {
+public:
+    TimelineRotation(const ghoul::Dictionary& dictionary);
+    glm::dmat3 matrix(const UpdateData& data) const override;
+    static documentation::Documentation Documentation();
+
+private:
+    Timeline<std::unique_ptr<Rotation>> _timeline;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___TIMELINEROTATION___H__
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index 6d4e66856c..9dc5fd70ad 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -29,10 +29,8 @@ in vec2 vs_st;
 in vec4 vs_position;
 
 uniform sampler2D texture1;
-uniform float OcclusionDepth;
 uniform float Alpha;
 
-
 Fragment getFragment() {
     Fragment frag;
 
diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp
new file mode 100644
index 0000000000..0dafe620b6
--- /dev/null
+++ b/modules/base/translation/timelinetranslation.cpp
@@ -0,0 +1,114 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/base/translation/timelinetranslation.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/util/updatestructures.h>
+#include <openspace/util/time.h>
+
+namespace {
+    constexpr const char* KeyType = "Type";
+    constexpr const char* KeyKeyframes = "Keyframes";
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation TimelineTranslation::Documentation() {
+    using namespace documentation;
+    return {
+        "Timeline Translation",
+        "base_transform_translation_keyframe",
+        {
+            {
+                KeyType,
+                new StringEqualVerifier("TimelineTranslation"),
+                Optional::No
+            },
+            {
+                KeyKeyframes,
+                new TableVerifier({
+                    { "*", new TableVerifier(), Optional::No, "Any translation object" }
+                }),
+                Optional::No,
+                "A table of keyframes, with keys formatted as YYYY-MM-DDTHH:MM:SS"
+                "and values that are valid Translation objects."
+            }
+        }
+    };
+}
+
+TimelineTranslation::TimelineTranslation(const ghoul::Dictionary& dictionary) {
+    documentation::testSpecificationAndThrow(
+        Documentation(),
+        dictionary,
+        "TimelineTranslation"
+    );
+
+    const ghoul::Dictionary& keyframes =
+        dictionary.value<ghoul::Dictionary>(KeyKeyframes);
+
+    std::vector<std::string> timeStrings = keyframes.keys();
+    for (const std::string& timeString : timeStrings) {
+        const double t = Time::convertTime(timeString);
+
+        std::unique_ptr<Translation> translation =
+            Translation::createFromDictionary(
+                keyframes.value<ghoul::Dictionary>(timeString)
+            );
+
+        if (translation) {
+            _timeline.addKeyframe(t, std::move(translation));
+        }
+    }
+}
+
+glm::dvec3 TimelineTranslation::position(const UpdateData& data) const {
+    const double now = data.time.j2000Seconds();
+    using KeyframePointer = const Keyframe<std::unique_ptr<Translation>>*;
+
+    KeyframePointer prev = _timeline.lastKeyframeBefore(now, true);
+    KeyframePointer next = _timeline.firstKeyframeAfter(now, true);
+
+    if (!prev && !next) {
+        return glm::dvec3(0.0);
+    }
+    if (!prev) {
+        prev = next;
+    }
+    if (!next) {
+        next = prev;
+    }
+    const double prevTime = prev->timestamp;
+    const double nextTime = next->timestamp;
+
+    double t = 0.0;
+    if (nextTime - prevTime > 0.0) {
+        t = (now - prevTime) / (nextTime - prevTime);
+    }
+    return t * next->data->position(data) + (1.0 - t) * prev->data->position(data);
+}
+
+} // namespace openspace
diff --git a/modules/sync/syncs/torrentsynchronization.h b/modules/base/translation/timelinetranslation.h
similarity index 63%
rename from modules/sync/syncs/torrentsynchronization.h
rename to modules/base/translation/timelinetranslation.h
index 98f9811f4e..0d528d36a6 100644
--- a/modules/sync/syncs/torrentsynchronization.h
+++ b/modules/base/translation/timelinetranslation.h
@@ -22,56 +22,29 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_SYNC___TORRENTSYNCHRONIZATION___H__
-#define __OPENSPACE_MODULE_SYNC___TORRENTSYNCHRONIZATION___H__
+#ifndef __OPENSPACE_MODULE_BASE___TIMELINETRANSLATION___H__
+#define __OPENSPACE_MODULE_BASE___TIMELINETRANSLATION___H__
 
-#ifdef SYNC_USE_LIBTORRENT
-
-#include <openspace/util/resourcesynchronization.h>
-
-#include <modules/sync/torrentclient.h>
+#include <openspace/scene/translation.h>
+#include <openspace/util/timeline.h>
 
 namespace openspace {
 
-class TorrentSynchronizationJob;
+struct UpdateData;
 
-class TorrentSynchronization : public ResourceSynchronization {
+namespace documentation { struct Documentation; }
+
+class TimelineTranslation : public Translation {
 public:
-    TorrentSynchronization(const ghoul::Dictionary& dict, std::string synchronizationRoot,
-        TorrentClient& client);
-
-    virtual ~TorrentSynchronization();
-
-    std::string directory() override;
-    void start() override;
-    void cancel() override;
-    void clear() override;
-
-    size_t nSynchronizedBytes() override;
-    size_t nTotalBytes() override;
-    bool nTotalBytesIsKnown() override;
+    TimelineTranslation(const ghoul::Dictionary& dictionary);
 
+    glm::dvec3 position(const UpdateData& data) const override;
     static documentation::Documentation Documentation();
 
 private:
-    void updateTorrentProgress(TorrentClient::TorrentProgress p);
-    std::string uniformResourceName() const;
-    bool hasSyncFile();
-    void createSyncFile();
-
-    std::atomic_bool _enabled = false;
-
-    TorrentClient::TorrentId _torrentId = 0;
-    TorrentClient::TorrentProgress _progress;
-    std::mutex _progressMutex;
-    std::string _identifier;
-    std::string _magnetLink;
-    std::string _synchronizationRoot;
-    TorrentClient& _torrentClient;
+    Timeline<std::unique_ptr<Translation>> _timeline;
 };
 
 } // namespace openspace
 
-#endif // SYNC_USE_LIBTORRENT
-
-#endif // __OPENSPACE_MODULE_SYNC___TORRENTSYNCHRONIZATION___H__
+#endif // __OPENSPACE_MODULE_BASE___TIMELINETRANSLATION___H__
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index ecdbfc46b1..4a69090acf 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -25,7 +25,6 @@
 #include <modules/cefwebgui/cefwebguimodule.h>
 
 #include <modules/webbrowser/webbrowsermodule.h>
-#include <modules/webgui/webguimodule.h>
 #include <modules/cefwebgui/include/guirenderhandler.h>
 #include <modules/cefwebgui/include/guikeyboardhandler.h>
 #include <modules/webbrowser/include/browserinstance.h>
@@ -166,7 +165,15 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
     } else {
         WebGuiModule* webGuiModule = global::moduleEngine.module<WebGuiModule>();
         _url = "http://127.0.0.1:" +
-            std::to_string(webGuiModule->port()) + "/#/onscreen";
+            std::to_string(webGuiModule->port()) + "/frontend/#/onscreen";
+
+        _endpointCallback = webGuiModule->addEndpointChangeCallback(
+            [this](const std::string& endpoint, bool exists) {
+                if (exists && endpoint == "frontend" && _instance) {
+                    _instance->reloadBrowser();
+                }
+            }
+        );
     }
 
     if (configuration.hasValue<float>(GuiScaleInfo.identifier)) {
@@ -204,6 +211,11 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
     });
 
     global::callback::deinitializeGL.emplace_back([this]() {
+        if (_endpointCallback != -1) {
+            WebGuiModule* webGuiModule = global::moduleEngine.module<WebGuiModule>();
+            webGuiModule->removeEndpointChangeCallback(_endpointCallback);
+            _endpointCallback = -1;
+        }
         _enabled = false;
         startOrStopGui();
     });
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
index 81bf8231f4..d822b838a5 100644
--- a/modules/cefwebgui/cefwebguimodule.h
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -27,6 +27,8 @@
 
 #include <openspace/util/openspacemodule.h>
 
+#include <modules/webgui/webguimodule.h>
+
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/triggerproperty.h>
@@ -53,6 +55,8 @@ private:
     properties::StringProperty _url;
     properties::FloatProperty _guiScale;
     std::unique_ptr<BrowserInstance> _instance;
+
+    WebGuiModule::CallbackHandle _endpointCallback = -1;
 };
 
 } // namespace openspace
diff --git a/modules/cefwebgui/include/guirenderhandler.h b/modules/cefwebgui/include/guirenderhandler.h
index 203ccf3eb9..b28a1875f5 100644
--- a/modules/cefwebgui/include/guirenderhandler.h
+++ b/modules/cefwebgui/include/guirenderhandler.h
@@ -39,8 +39,8 @@ public:
     GUIRenderHandler();
     virtual ~GUIRenderHandler();
 
-    void draw();
-    void render();
+    void draw() override;
+    void render() override;
 
 private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
diff --git a/modules/cefwebgui/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl
index 2488aa7924..2323d505d3 100644
--- a/modules/cefwebgui/shaders/gui_vs.glsl
+++ b/modules/cefwebgui/shaders/gui_vs.glsl
@@ -31,8 +31,7 @@ uniform mat4 ortho;
 out vec2 Texcoord;
 
 void main() {
-  Texcoord = vec2(position.x + 1.0f, position.y - 1.0f) * 0.5;
-  Texcoord.y *= -1.0f;
+  Texcoord = vec2(position.x + 1.0f, position.y + 1.0f) * 0.5;
   gl_Position = vec4(position, 0.0, 1.0);
 }
 
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
index 171625c4e3..c29d1608a9 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
@@ -750,7 +750,6 @@ void RenderableBillboardsCloud::renderBillboards(const RenderData& data,
 
     _program->activate();
 
-    const glm::dmat4 projMatrix = glm::dmat4(data.camera.projectionMatrix());
     _program->setUniform(
         "screenSize",
         glm::vec2(global::renderEngine.renderingResolution())
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index 8c4c84e4f3..ccaa706c03 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -77,19 +77,6 @@ namespace {
         "all point."
     };
 
-    //constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = {
-    //    "ScaleFactor",
-    //    "Scale Factor",
-    //    "This value is used as a multiplicative factor that is applied to the apparent "
-    //    "size of each point."
-    //};
-
-    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
-        "Color",
-        "Color",
-        "This value is used to define the color of the astronomical object."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo TextColorInfo = {
         "TextColor",
         "Text Color",
@@ -427,7 +414,7 @@ void RenderableDUMeshes::initializeGL() {
 }
 
 void RenderableDUMeshes::deinitializeGL() {
-    for (const std::pair<int, RenderingMesh>& pair : _renderingMeshesMap) {
+    for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
         for (int i = 0; i < pair.second.numU; ++i) {
             glDeleteVertexArrays(1, &pair.second.vaoArray[i]);
             glDeleteBuffers(1, &pair.second.vboArray[i]);
@@ -483,7 +470,7 @@ void RenderableDUMeshes::renderMeshes(const RenderData&,
     _program->setUniform(_uniformCache.alphaValue, _alphaValue);
     //_program->setUniform(_uniformCache.scaleFactor, _scaleFactor);
 
-    for (const std::pair<int, RenderingMesh>& pair : _renderingMeshesMap) {
+    for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
         _program->setUniform(_uniformCache.color, _meshColorMap[pair.second.colorIndex]);
         for (size_t i = 0; i < pair.second.vaoArray.size(); ++i) {
             glBindVertexArray(pair.second.vaoArray[i]);
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 7581b01f17..b06176406e 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -844,7 +844,7 @@ bool RenderablePlanesCloud::loadData() {
 
 bool RenderablePlanesCloud::loadTextures() {
     if (!_textureFileMap.empty()) {
-        for (const std::pair<int, std::string>& pair : _textureFileMap) {
+        for (const std::pair<const int, std::string>& pair : _textureFileMap) {
             const auto& p = _textureMap.insert(std::make_pair(
                 pair.first,
                 ghoul::io::TextureReader::ref().loadTexture(pair.second)
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 1afc04feab..0e108d525f 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -771,7 +771,7 @@ void RenderableFieldlinesSequence::definePropertyCallbackFunctions() {
     });
 
     _pJumpToStartBtn.onChange([this] {
-        global::timeManager.setTimeNextFrame(_startTimes[0]);
+        global::timeManager.setTimeNextFrame(Time(_startTimes[0]));
     });
 }
 
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 6377b4d648..117c60124e 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -29,6 +29,7 @@
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <fstream>
+#include <iomanip>
 
 namespace {
     constexpr const char* _loggerCat = "FieldlinesState";
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index 5d2bbafadf..7d46e40e1a 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -109,6 +109,11 @@ create_new_module(
   ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
 )
 
+option(OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION "Instrumentation for GlobeBrowsing Performance" OFF)
+if (OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION)
+  target_compile_definitions(openspace-module-globebrowsing INTERFACE "OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION")
+endif ()
+
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gdal_data DESTINATION modules/globebrowsing)
 
 if (WIN32)
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index e17d676b3e..df7dd2dbc2 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -28,7 +28,11 @@
 #include <modules/globebrowsing/src/dashboarditemglobelocation.h>
 #include <modules/globebrowsing/src/gdalwrapper.h>
 #include <modules/globebrowsing/src/geodeticpatch.h>
+#include <modules/globebrowsing/src/globelabelscomponent.h>
 #include <modules/globebrowsing/src/globetranslation.h>
+#include <modules/globebrowsing/src/layer.h>
+#include <modules/globebrowsing/src/layeradjustment.h>
+#include <modules/globebrowsing/src/layermanager.h>
 #include <modules/globebrowsing/src/memoryawaretilecache.h>
 #include <modules/globebrowsing/src/tileprovider.h>
 #include <openspace/interaction/navigationhandler.h>
@@ -38,6 +42,7 @@
 #include <openspace/util/factorymanager.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/fmt.h>
 #include <ghoul/misc/templatefactory.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/systemcapabilities/generalcapabilitiescomponent.h>
@@ -100,6 +105,14 @@ namespace {
         "The maximum size of the MemoryAwareTileCache, on the CPU and GPU."
     };
 
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    constexpr const openspace::properties::Property::PropertyInfo InstrumentationInfo = {
+        "SaveInstrumentationInfo",
+        "Save Instrumentation Info",
+        "If enabled, the instrumentation data is saved to disk at the end of the frame."
+    };
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+
 
     openspace::GlobeBrowsingModule::Capabilities
     parseSubDatasets(char** subDatasets, int nSubdatasets)
@@ -162,12 +175,24 @@ GlobeBrowsingModule::GlobeBrowsingModule()
     , _wmsCacheLocation(WMSCacheLocationInfo, "${BASE}/cache_gdal")
     , _wmsCacheSizeMB(WMSCacheSizeInfo, 1024)
     , _tileCacheSizeMB(TileCacheSizeInfo, 1024)
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    , _saveInstrumentation(InstrumentationInfo, false)
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 {
     addProperty(_wmsCacheEnabled);
     addProperty(_offlineMode);
     addProperty(_wmsCacheLocation);
     addProperty(_wmsCacheSizeMB);
     addProperty(_tileCacheSizeMB);
+
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    _saveInstrumentation.onChange([&]() {
+        if (_saveInstrumentation) {
+            _frameInfo.lastSavedFrame = global::renderEngine.frameNumber();
+        }
+    });
+    addProperty(_saveInstrumentation);
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 }
 
 void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
@@ -234,6 +259,43 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
     // Render
     global::callback::render.emplace_back([&]() { _tileCache->update(); });
 
+    // Postdraw
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    global::callback::postDraw.emplace_back([&]() {
+        // >= as we might have multiple frames per postDraw call (stereo rendering,
+        // fisheye, etc)
+        const uint16_t next = _frameInfo.lastSavedFrame + _frameInfo.saveEveryNthFrame;
+        const bool shouldSave = _saveInstrumentation &&
+                                global::renderEngine.frameNumber() >= next;
+        if (shouldSave) {
+            using K = const globebrowsing::RenderableGlobe*;
+            using V = std::vector<FrameInfo>;
+            for (const std::pair<K, V>& i : _frameInfo.frames) {
+                std::string filename = fmt::format(
+                    "_inst_globebrowsing_{}_{}_{}.txt",
+                    i.first->owner()->identifier(), // Owner of the renderable has a name
+                    _frameInfo.lastSavedFrame,
+                    _frameInfo.saveEveryNthFrame
+                );
+                std::ofstream file(absPath("${BIN}/" + filename));
+                for (const FrameInfo& f : i.second) {
+                    std::string line = fmt::format(
+                        "{}\t{}\t{}\t{}",
+                        f.iFrame,
+                        f.nTilesRenderedLocal,
+                        f.nTilesRenderedGlobal,
+                        f.nTilesUploaded
+                    );
+                    file << line << '\n';
+                }
+            }
+
+            _frameInfo.frames.clear();
+            _frameInfo.lastSavedFrame = global::renderEngine.frameNumber();
+        }
+    });
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+
     // Deinitialize
     global::callback::deinitialize.emplace_back([&]() { GdalWrapper::destroy(); });
 
@@ -327,6 +389,27 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
             "any of " + listLayerGroups + ". The third argument is the dictionary"
             "defining the layer."
         },
+        {
+            "getLayers",
+            &globebrowsing::luascriptfunctions::getLayers,
+            {},
+            "string, string",
+            "Returns the list of layers for the scene graph node specified in the first "
+            "parameter. The second parameter specifies which layer type should be "
+            "queried."
+        },
+        {
+            "moveLayer",
+            &globebrowsing::luascriptfunctions::moveLayer,
+            {},
+            "string, string, number, number",
+            "Rearranges the order of a single layer in a scene graph node. The first "
+            "parameter specifies the scene graph node, the second parameter specifies "
+            "the name of the layer group, the third parameter is the original position "
+            "of the layer that should be moved and the last parameter is the new "
+            "position. The new position may be -1 to place the layer at the top or any "
+            "large number bigger than the number of layers to place it at the bottom."
+        },
         {
             "goToChunk",
             &globebrowsing::luascriptfunctions::goToChunk,
@@ -338,16 +421,24 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
             "goToGeo",
             &globebrowsing::luascriptfunctions::goToGeo,
             {},
-            "number, number, number",
-            "Go to geographic coordinates latitude and longitude"
+            "[string], number, number, [number]",
+            "Go to geographic coordinates of a globe. The first (optional) argument is "
+            "the identifier of a scene graph node that has a RenderableGlobe attached. "
+            "If no globe is passed in, the current anchor will be used. "
+            "The second argument is latitude and the third is longitude (degrees). "
+            "North and East are expressed as positive angles, while South and West are "
+            "negative. The optional fourh argument is the altitude in meters. If no "
+            "altitude is provided, the altitude will be kept as the current distance to "
+            "the surface of the specified globe."
         },
         {
             "getGeoPosition",
             &globebrowsing::luascriptfunctions::getGeoPosition,
             {},
-            "name, latitude, longitude, altitude",
-            "Returns the specified surface position on the globe as three floating point "
-            "values"
+            "string, number, number, number",
+            "Returns the specified surface position on the globe identified by the first "
+            "argument, as three floating point values - latitude, longitude and altitude "
+            "(degrees and meters)."
         },
         {
             "getGeoPositionForCamera",
@@ -355,7 +446,7 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
             {},
             "void",
             "Get geographic coordinates of the camera poosition in latitude, "
-            "longitude, and altitude"
+            "longitude, and altitude (degrees and meters)."
         },
         {
             "loadWMSCapabilities",
@@ -395,29 +486,38 @@ scripting::LuaLibrary GlobeBrowsingModule::luaLibrary() const {
     return res;
 }
 
-void GlobeBrowsingModule::goToChunk(int x, int y, int level) {
-    Camera* cam = global::navigationHandler.camera();
-    goToChunk(*cam, globebrowsing::TileIndex(x,y,level), glm::vec2(0.5f, 0.5f), true);
+std::vector<documentation::Documentation> GlobeBrowsingModule::documentations() const {
+    return {
+        globebrowsing::Layer::Documentation(),
+        globebrowsing::LayerAdjustment::Documentation(),
+        globebrowsing::LayerManager::Documentation(),
+        GlobeLabelsComponent::Documentation()
+    };
 }
 
-void GlobeBrowsingModule::goToGeo(double latitude, double longitude) {
+void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
+                                    int x, int y, int level)
+{
+    goToChunk(globe, globebrowsing::TileIndex(x, y, level), glm::vec2(0.5f, 0.5f), true);
+}
+
+void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe,
+                                  double latitude, double longitude)
+{
     using namespace globebrowsing;
-    Camera* cam = global::navigationHandler.camera();
     goToGeodetic2(
-        *cam,
+        globe,
         Geodetic2{ glm::radians(latitude), glm::radians(longitude) },
         true
     );
 }
 
-void GlobeBrowsingModule::goToGeo(double latitude, double longitude,
-                                double altitude)
+void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe,
+                                  double latitude, double longitude, double altitude)
 {
     using namespace globebrowsing;
-
-    Camera* cam = global::navigationHandler.camera();
     goToGeodetic3(
-        *cam,
+        globe,
         {
             Geodetic2{ glm::radians(latitude), glm::radians(longitude) },
             altitude
@@ -437,32 +537,15 @@ glm::vec3 GlobeBrowsingModule::cartesianCoordinatesFromGeo(
         altitude
     };
 
-    const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianPosition(pos);
-    //glm::dmat4 modelTransform = globe.modelTransform();
-    //glm::dvec3 positionWorldSpace = glm::dvec3(modelTransform *
-        //glm::dvec4(positionModelSpace, 1.0));
-
-    return glm::vec3(positionModelSpace);
+    return glm::vec3(globe.ellipsoid().cartesianPosition(pos));
 }
 
-void GlobeBrowsingModule::goToChunk(Camera& camera, const globebrowsing::TileIndex& ti,
+void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
+                                    const globebrowsing::TileIndex& ti,
                                     glm::vec2 uv, bool doResetCameraDirection)
 {
     using namespace globebrowsing;
 
-    const RenderableGlobe* globe = castFocusNodeRenderableToGlobe();
-    if (!globe) {
-        LERROR("Focus node must have a RenderableGlobe renderable.");
-        return;
-    }
-
-    // Camera position in model space
-    const glm::dvec3 camPos = camera.positionVec3();
-    const glm::dmat4 inverseModelTransform = glm::inverse(globe->modelTransform());
-    const glm::dvec3 cameraPositionModelSpace = glm::dvec3(
-        inverseModelTransform * glm::dvec4(camPos, 1)
-    );
-
     const GeodeticPatch patch(ti);
     const Geodetic2 corner = patch.corner(SOUTH_WEST);
     Geodetic2 positionOnPatch = patch.size();
@@ -473,32 +556,50 @@ void GlobeBrowsingModule::goToChunk(Camera& camera, const globebrowsing::TileInd
         corner.lon + positionOnPatch.lon
     };
 
-    const glm::dvec3 positionOnEllipsoid = globe->ellipsoid().geodeticSurfaceProjection(
+    // Compute altitude
+    const glm::dvec3 cameraPosition = global::navigationHandler.camera()->positionVec3();
+    SceneGraphNode* globeSceneGraphNode = dynamic_cast<SceneGraphNode*>(globe.owner());
+    if (!globeSceneGraphNode) {
+        LERROR(
+            "Cannot go to chunk. The renderable is not attached to a scene graph node."
+        );
+        return;
+    }
+    const glm::dmat4 inverseModelTransform = globeSceneGraphNode->inverseModelTransform();
+    const glm::dvec3 cameraPositionModelSpace =
+        glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
+    const SurfacePositionHandle posHandle = globe.calculateSurfacePositionHandle(
         cameraPositionModelSpace
     );
-    const double altitude = glm::length(cameraPositionModelSpace - positionOnEllipsoid);
 
-    goToGeodetic3(camera, {pointPosition, altitude}, doResetCameraDirection);
+    const Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(
+        posHandle.centerToReferenceSurface
+    );
+
+    const double altitude = glm::length(
+        cameraPositionModelSpace - posHandle.centerToReferenceSurface
+    );
+
+    goToGeodetic3(globe, { pointPosition, altitude }, doResetCameraDirection);
 }
 
-void GlobeBrowsingModule::goToGeodetic2(Camera& camera, globebrowsing::Geodetic2 geo2,
+void GlobeBrowsingModule::goToGeodetic2(const globebrowsing::RenderableGlobe& globe,
+                                        globebrowsing::Geodetic2 geo2,
                                         bool doResetCameraDirection)
 {
     using namespace globebrowsing;
 
-    const RenderableGlobe* globe = castFocusNodeRenderableToGlobe();
-    if (!globe) {
-        LERROR("Focus node must have a RenderableGlobe renderable.");
-        return;
+    const glm::dvec3 cameraPosition = global::navigationHandler.camera()->positionVec3();
+    SceneGraphNode* globeSceneGraphNode = dynamic_cast<SceneGraphNode*>(globe.owner());
+    if (!globeSceneGraphNode) {
+        LERROR("Error when going to Geodetic2");
     }
 
-    interaction::NavigationHandler& nav = global::navigationHandler;
-    const glm::dvec3 cameraPosition = nav.camera()->positionVec3();
-    const glm::dmat4 inverseModelTransform =
-        nav.orbitalNavigator().anchorNode()->inverseModelTransform();
+    const glm::dmat4 inverseModelTransform = globeSceneGraphNode->inverseModelTransform();
+
     const glm::dvec3 cameraPositionModelSpace =
         glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
-    const SurfacePositionHandle posHandle = globe->calculateSurfacePositionHandle(
+    const SurfacePositionHandle posHandle = globe.calculateSurfacePositionHandle(
         cameraPositionModelSpace
     );
 
@@ -506,71 +607,58 @@ void GlobeBrowsingModule::goToGeodetic2(Camera& camera, globebrowsing::Geodetic2
                        posHandle.referenceSurfaceOutDirection * posHandle.heightToSurface;
     const double altitude = glm::length(cameraPositionModelSpace - centerToActualSurface);
 
-    goToGeodetic3(camera, { geo2, altitude }, doResetCameraDirection);
+    goToGeodetic3(globe, { geo2, altitude }, doResetCameraDirection);
 }
 
-void GlobeBrowsingModule::goToGeodetic3(Camera& camera, globebrowsing::Geodetic3 geo3,
+void GlobeBrowsingModule::goToGeodetic3(const globebrowsing::RenderableGlobe& globe,
+                                        globebrowsing::Geodetic3 geo3,
                                         bool doResetCameraDirection)
 {
     using namespace globebrowsing;
+    const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianPosition(geo3);
 
-    const RenderableGlobe* globe = castFocusNodeRenderableToGlobe();
-    if (!globe) {
-        LERROR("Focus node must have a RenderableGlobe renderable.");
-        return;
-    }
 
-    const glm::dvec3 positionModelSpace = globe->ellipsoid().cartesianPosition(geo3);
-    const glm::dmat4 modelTransform = globe->modelTransform();
-    const glm::dvec3 positionWorldSpace = glm::dvec3(modelTransform *
-                                    glm::dvec4(positionModelSpace, 1.0));
-    camera.setPositionVec3(positionWorldSpace);
+    const glm::dvec3 slightlyNorth = globe.ellipsoid().cartesianSurfacePosition(
+        Geodetic2{ geo3.geodetic2.lat + 0.001, geo3.geodetic2.lon }
+    );
 
-    if (doResetCameraDirection) {
-        resetCameraDirection(camera, geo3.geodetic2);
-    }
+    interaction::NavigationHandler::NavigationState state;
+    state.anchor = globe.owner()->identifier();
+    state.referenceFrame = globe.owner()->identifier();
+    state.position = positionModelSpace;
+    state.up = slightlyNorth;
+
+    global::navigationHandler.setNavigationStateNextFrame(state);
 }
 
-void GlobeBrowsingModule::resetCameraDirection(Camera& camera,
-                                               globebrowsing::Geodetic2 geo2)
+glm::dquat GlobeBrowsingModule::lookDownCameraRotation(
+                                              const globebrowsing::RenderableGlobe& globe,
+                                                              glm::dvec3 cameraModelSpace,
+                                                            globebrowsing::Geodetic2 geo2)
 {
     using namespace globebrowsing;
 
-    const RenderableGlobe* globe = castFocusNodeRenderableToGlobe();
-    if (!globe) {
-        LERROR("Focus node must have a RenderableGlobe renderable.");
-        return;
-    }
-
     // Camera is described in world space
-    const glm::dmat4 modelTransform = globe->modelTransform();
+    const glm::dmat4 modelTransform = globe.modelTransform();
 
     // Lookup vector
-    const glm::dvec3 positionModelSpace = globe->ellipsoid().cartesianSurfacePosition(
+    const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianSurfacePosition(
         geo2
     );
-    const glm::dvec3 slightlyNorth = globe->ellipsoid().cartesianSurfacePosition(
+    const glm::dvec3 slightlyNorth = globe.ellipsoid().cartesianSurfacePosition(
         Geodetic2{ geo2.lat + 0.001, geo2.lon }
     );
     const glm::dvec3 lookUpModelSpace = glm::normalize(
         slightlyNorth - positionModelSpace
     );
-    const glm::dvec3 lookUpWorldSpace = glm::dmat3(modelTransform) * lookUpModelSpace;
-
-    // Lookat vector
-    const glm::dvec3 lookAtWorldSpace = glm::dvec3(
-        modelTransform * glm::dvec4(positionModelSpace, 1.0)
-    );
-
-    // Eye position
-    const glm::dvec3 eye = camera.positionVec3();
 
     // Matrix
-    const glm::dmat4 lookAtMatrix = glm::lookAt(eye, lookAtWorldSpace, lookUpWorldSpace);
+    const glm::dmat4 lookAtMatrix =
+        glm::lookAt(cameraModelSpace, positionModelSpace, lookUpModelSpace);
 
     // Set rotation
     const glm::dquat rotation = glm::quat_cast(inverse(lookAtMatrix));
-    camera.setRotation(rotation);
+    return rotation;
 }
 
 const globebrowsing::RenderableGlobe*
@@ -732,5 +820,27 @@ uint64_t GlobeBrowsingModule::wmsCacheSize() const {
     return size * 1024 * 1024;
 }
 
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+void GlobeBrowsingModule::addFrameInfo(globebrowsing::RenderableGlobe* globe,
+                                       uint32_t nTilesRenderedLocal,
+                                       uint32_t nTilesRenderedGlobal,
+                                       uint32_t nTilesUploaded)
+{
+    auto it = _frameInfo.frames.find(globe);
+    if (it == _frameInfo.frames.end()) {
+        _frameInfo.frames[globe] = std::vector<FrameInfo>();
+        _frameInfo.frames[globe].reserve(_frameInfo.saveEveryNthFrame);
+    }
+    else {
+        it->second.push_back({
+            global::renderEngine.frameNumber(),
+            nTilesRenderedLocal,
+            nTilesRenderedGlobal,
+            nTilesUploaded
+        });
+    }
+}
+
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 
 } // namespace openspace
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index 9db83196a9..8f9367a0fd 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -53,15 +53,20 @@ public:
 
     GlobeBrowsingModule();
 
-    void goToChunk(int x, int y, int level);
-    void goToGeo(double latitude, double longitude);
-    void goToGeo(double latitude, double longitude, double altitude);
+    void goToChunk(const globebrowsing::RenderableGlobe& globe, int x, int y, int level);
+    void goToGeo(const globebrowsing::RenderableGlobe& globe,
+        double latitude, double longitude);
+
+    void goToGeo(const globebrowsing::RenderableGlobe& globe,
+        double latitude, double longitude, double altitude);
 
     glm::vec3 cartesianCoordinatesFromGeo(const globebrowsing::RenderableGlobe& globe,
         double latitude, double longitude, double altitude);
 
     globebrowsing::cache::MemoryAwareTileCache* tileCache();
     scripting::LuaLibrary luaLibrary() const override;
+    std::vector<documentation::Documentation> documentations() const override;
+
     const globebrowsing::RenderableGlobe* castFocusNodeRenderableToGlobe();
 
     struct Layer {
@@ -90,17 +95,26 @@ public:
     std::string wmsCacheLocation() const;
     uint64_t wmsCacheSize() const; // bytes
 
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    void addFrameInfo(globebrowsing::RenderableGlobe* globe, uint32_t nTilesRenderedLocal,
+        uint32_t nTilesRenderedGlobal, uint32_t nTilesUploaded);
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
 
 private:
-    void goToChunk(Camera& camera, const globebrowsing::TileIndex& ti, glm::vec2 uv,
-        bool doResetCameraDirection);
-    void goToGeodetic2(Camera& camera, globebrowsing::Geodetic2 geo2,
-        bool doResetCameraDirection);
-    void goToGeodetic3(Camera& camera, globebrowsing::Geodetic3 geo3,
-        bool doResetCameraDirection);
-    void resetCameraDirection(Camera& camera, globebrowsing::Geodetic2 geo2);
+    void goToChunk(const globebrowsing::RenderableGlobe& globe,
+        const globebrowsing::TileIndex& ti, glm::vec2 uv, bool doResetCameraDirection);
+
+    void goToGeodetic2(const globebrowsing::RenderableGlobe& globe,
+        globebrowsing::Geodetic2 geo2, bool doResetCameraDirection);
+
+    void goToGeodetic3(const globebrowsing::RenderableGlobe& globe,
+        globebrowsing::Geodetic3 geo3, bool doResetCameraDirection);
+
+    glm::dquat lookDownCameraRotation(const globebrowsing::RenderableGlobe& globe,
+        glm::dvec3 cameraPositionModelSpace, globebrowsing::Geodetic2 geo2);
 
     /**
      \return a comma separated list of layer group names.
@@ -127,6 +141,26 @@ private:
     std::map<std::string, Capabilities> _capabilitiesMap;
 
     std::multimap<std::string, UrlInfo> _urlList;
+
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    struct FrameInfo {
+        uint64_t iFrame = 0;
+        uint32_t nTilesRenderedLocal = 0;
+        uint32_t nTilesRenderedGlobal = 0;
+        uint32_t nTilesUploaded = 0;
+    };
+
+    struct {
+        std::unordered_map<
+            globebrowsing::RenderableGlobe*,
+            std::vector<FrameInfo>
+        > frames;
+
+        uint64_t lastSavedFrame = 0;
+        const uint16_t saveEveryNthFrame = 2048;
+    } _frameInfo;
+    properties::BoolProperty _saveInstrumentation;
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 };
 
 } // namespace openspace
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index b9928a119f..82f7690d65 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -25,6 +25,7 @@
 #include <modules/globebrowsing/src/renderableglobe.h>
 
 #include <modules/globebrowsing/src/layer.h>
+#include <modules/globebrowsing/src/layergroup.h>
 #include <modules/globebrowsing/src/layermanager.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
@@ -127,32 +128,151 @@ int deleteLayer(lua_State* L) {
     return 0;
 }
 
+int getLayers(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::getLayers");
+
+    const std::string& globeIdentifier = ghoul::lua::value<std::string>(L, 1);
+    const std::string& layer = ghoul::lua::value<std::string>(L, 2);
+    lua_pop(L, 2);
+
+    SceneGraphNode* n = sceneGraphNode(globeIdentifier);
+    if (!n) {
+        return ghoul::lua::luaError(L, "Unknown globe name: " + globeIdentifier);
+    }
+
+    const RenderableGlobe* globe = dynamic_cast<const RenderableGlobe*>(n->renderable());
+    if (!globe) {
+        return ghoul::lua::luaError(L, "Identifier must be a RenderableGlobe");
+    }
+
+    globebrowsing::layergroupid::GroupID group =
+        ghoul::from_string<globebrowsing::layergroupid::GroupID>(layer);
+    if (group == globebrowsing::layergroupid::GroupID::Unknown) {
+        return ghoul::lua::luaError(L, "Unknown layer groupd: " + layer);
+    }
+
+    const globebrowsing::LayerGroup& lg = globe->layerManager().layerGroup(group);
+    std::vector<globebrowsing::Layer*> layers = lg.layers();
+
+    lua_newtable(L);
+    int key = 1;
+    for (globebrowsing::Layer* l : layers) {
+        ghoul::lua::push(L, key, l->identifier());
+        lua_settable(L, -3);
+        key++;
+    }
+    return 1;
+}
+
+int moveLayer(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 4, "lua::moveLayer");
+
+    const std::string& globeIdentifier = ghoul::lua::value<std::string>(L, 1);
+    const std::string& layer = ghoul::lua::value<std::string>(L, 2);
+    int oldPosition = ghoul::lua::value<int>(L, 3);
+    int newPosition = ghoul::lua::value<int>(L, 4);
+    lua_pop(L, 4);
+
+    if (oldPosition == newPosition) {
+        return 0;
+    }
+
+    SceneGraphNode* n = sceneGraphNode(globeIdentifier);
+    if (!n) {
+        return ghoul::lua::luaError(L, "Unknown globe name: " + globeIdentifier);
+    }
+
+    RenderableGlobe* globe = dynamic_cast<RenderableGlobe*>(n->renderable());
+    if (!globe) {
+        return ghoul::lua::luaError(L, "Identifier must be a RenderableGlobe");
+    }
+
+    globebrowsing::layergroupid::GroupID group =
+        ghoul::from_string<globebrowsing::layergroupid::GroupID>(layer);
+    if (group == globebrowsing::layergroupid::GroupID::Unknown) {
+        return ghoul::lua::luaError(L, "Unknown layer groupd: " + layer);
+    }
+
+    globebrowsing::LayerGroup& lg = globe->layerManager().layerGroup(group);
+    lg.moveLayers(oldPosition, newPosition);
+
+    return 0;
+}
+
 int goToChunk(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 3, "lua::goToChunk");
+    ghoul::lua::checkArgumentsAndThrow(L, 4, "lua::goToChunk");
 
-    const int x = ghoul::lua::value<int>(L, 1);
-    const int y = ghoul::lua::value<int>(L, 2);
-    const int level = ghoul::lua::value<int>(L, 3);
-    lua_pop(L, 3);
+    const std::string& globeIdentifier = ghoul::lua::value<std::string>(L, 1);
+    const int x = ghoul::lua::value<int>(L, 2);
+    const int y = ghoul::lua::value<int>(L, 3);
+    const int level = ghoul::lua::value<int>(L, 4);
+    lua_pop(L, 4);
 
-    global::moduleEngine.module<GlobeBrowsingModule>()->goToChunk(x, y, level);
+    SceneGraphNode* n = sceneGraphNode(globeIdentifier);
+    if (!n) {
+        return ghoul::lua::luaError(L, "Unknown globe name: " + globeIdentifier);
+    }
+
+    const RenderableGlobe* globe = dynamic_cast<const RenderableGlobe*>(n->renderable());
+    if (!globe) {
+        return ghoul::lua::luaError(L, "Identifier must be a RenderableGlobe");
+    }
+
+    global::moduleEngine.module<GlobeBrowsingModule>()->goToChunk(*globe, x, y, level);
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
     return 0;
 }
 
 int goToGeo(lua_State* L) {
-    const int nArguments = ghoul::lua::checkArgumentsAndThrow(L, 2, 3, "lua::goToGeo");
+    int nArguments = ghoul::lua::checkArgumentsAndThrow(L, { 2, 4 }, "lua::goToGeo");
 
-    const double latitude = ghoul::lua::value<double>(L, 1);
-    const double longitude = ghoul::lua::value<double>(L, 2);
+    // Check if the user provided a Scene graph node identifier as the first argument.
+    // lua_isstring returns true for both numbers and strings, so better use !lua_isnumber
+    const bool providedGlobeIdentifier = !lua_isnumber(L, 1);
+    const int parameterOffset = providedGlobeIdentifier ? 1 : 0;
 
-    if (nArguments == 2) {
-        global::moduleEngine.module<GlobeBrowsingModule>()->goToGeo(latitude, longitude);
+    const SceneGraphNode* n;
+    if (providedGlobeIdentifier) {
+        const std::string& globeIdentifier = ghoul::lua::value<std::string>(L, 1);
+        n = sceneGraphNode(globeIdentifier);
+        if (!n) {
+            return ghoul::lua::luaError(L, "Unknown globe name: " + globeIdentifier);
+        }
     }
-    else if (nArguments == 3) {
-        const double altitude = ghoul::lua::value<double>(L, 3);
+    else {
+        n = global::navigationHandler.orbitalNavigator().anchorNode();
+        if (!n) {
+            return ghoul::lua::luaError(L, "No anchor node is set.");
+        }
+    }
+
+    const double latitude = ghoul::lua::value<double>(L, parameterOffset + 1);
+    const double longitude = ghoul::lua::value<double>(L, parameterOffset + 2);
+
+    const RenderableGlobe* globe = dynamic_cast<const RenderableGlobe*>(n->renderable());
+    if (!globe) {
+        if (providedGlobeIdentifier) {
+            return ghoul::lua::luaError(L, "Identifier must be a RenderableGlobe");
+        }
+        else {
+            return ghoul::lua::luaError(L,
+                "Current anchor node is not a RenderableGlobe. "
+                "Either change the anchor to a globe, or specify a globe identifier "
+                "as the first argument"
+            );
+        }
+    }
+
+    if (nArguments == parameterOffset + 2) {
         global::moduleEngine.module<GlobeBrowsingModule>()->goToGeo(
+            *globe, latitude, longitude
+        );
+    }
+    else if (nArguments == parameterOffset + 3) {
+        const double altitude = ghoul::lua::value<double>(L, parameterOffset + 3);
+        global::moduleEngine.module<GlobeBrowsingModule>()->goToGeo(
+            *globe,
             latitude,
             longitude,
             altitude
@@ -168,19 +288,19 @@ int goToGeo(lua_State* L) {
 int getGeoPosition(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 4, "lua::getGeoPosition");
 
-    const std::string& name = ghoul::lua::value<std::string>(L, 1);
+    const std::string& globeIdentifier = ghoul::lua::value<std::string>(L, 1);
     const double latitude = ghoul::lua::value<double>(L, 2);
     const double longitude = ghoul::lua::value<double>(L, 3);
     const double altitude = ghoul::lua::value<double>(L, 4);
     lua_pop(L, 4);
 
-    SceneGraphNode* n = sceneGraphNode(name);
+    SceneGraphNode* n = sceneGraphNode(globeIdentifier);
     if (!n) {
-        return ghoul::lua::luaError(L, "Unknown globe name: " + name);
+        return ghoul::lua::luaError(L, "Unknown globe identifier: " + globeIdentifier);
     }
     const RenderableGlobe* globe = dynamic_cast<const RenderableGlobe*>(n->renderable());
     if (!globe) {
-        return ghoul::lua::luaError(L, "Name must be a RenderableGlobe");
+        return ghoul::lua::luaError(L, "Identifier must be a RenderableGlobe");
     }
 
     GlobeBrowsingModule& mod = *(global::moduleEngine.module<GlobeBrowsingModule>());
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index 86ab30d9e0..3b6dcbf462 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -173,9 +173,16 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
     bool isEast = lon > 0.0;
     lon = std::abs(lon);
 
-    const double altitude = glm::length(
+    double altitude = glm::length(
         cameraPositionModelSpace - posHandle.centerToReferenceSurface
     );
+
+    if (glm::length(cameraPositionModelSpace) <
+        glm::length(posHandle.centerToReferenceSurface))
+    {
+        altitude = -altitude;
+    }
+
     std::pair<double, std::string> dist = simplifyDistance(altitude);
 
     penPosition.y -= _font->height();
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 864b85d6c7..9cea901ce7 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -45,11 +45,10 @@
 #include <locale>
 
 namespace {
-    constexpr const char* KeyLabels = "Labels";
-    constexpr const char* KeyLabelsFileName = "FileName";
-
     constexpr const char* _loggerCat = "GlobeLabels";
 
+    constexpr const char* KeyLabelsFileName = "FileName";
+
     constexpr const double LabelFadeRangeConst = 1500.0;
     constexpr const double RangeAngularCoefConst = 0.8;
     constexpr const float MinTransparencyValueConst = 0.009f;
@@ -671,19 +670,10 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
                                         float distToCamera,
                                         float fadeInVariable
 ) {
-    constexpr double DIST_EPS = 6000.0;
-    constexpr double SIN_EPS = 0.001;
-
     glm::vec4 textColor = _labelsColor;
     textColor.a *= fadeInVariable;
 
-    glm::dmat4 invMP = glm::inverse(_globe->modelTransform());
-    glm::dmat4 invCombinedView = glm::inverse(data.camera.combinedViewMatrix());
-
-    glm::dvec4 cameraPosWorld = invCombinedView * glm::dvec4(0.0, 0.0, 0.0, 1.0);
-    glm::dvec3 cameraPosObj = glm::dvec3(invMP * cameraPosWorld);
     glm::dvec4 cameraUpVecWorld = glm::dvec4(data.camera.lookUpVectorWorldSpace(), 0.0);
-    glm::dvec3 cameraLookUpObj = glm::dvec3(invMP * cameraUpVecWorld);
 
     glm::dmat4 VP = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
                     data.camera.combinedViewMatrix();
@@ -799,7 +789,7 @@ bool GlobeLabelsComponent::isLabelInFrustum(const glm::dmat4& MVMatrix,
     double bottomDistance = MVMatrix[3][3] + MVMatrix[3][1];
     double topDistance = MVMatrix[3][3] - MVMatrix[3][1];
     double nearDistance = MVMatrix[3][3] + MVMatrix[3][2];
-    double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
+    // double farDistance = MVMatrix[3][3] - MVMatrix[3][2];
 
     // Normalize Planes
     const double invMagLeft = 1.0 / glm::length(leftNormal);
@@ -824,7 +814,7 @@ bool GlobeLabelsComponent::isLabelInFrustum(const glm::dmat4& MVMatrix,
 
     const double invMagFar = 1.0 / glm::length(farNormal);
     farNormal *= invMagFar;
-    farDistance *= invMagFar;
+    // farDistance *= invMagFar;
 
     constexpr const float Radius = 1.0;
 
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 6c4a5ea2c9..560994bed4 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -58,20 +58,21 @@ namespace {
         "globe. The default value is 0.0"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo FixedAltitudeInfo = {
-        "FixedAltitude",
-        "Fixed Altitude",
-        "The altitude in meters of the location on the globe's surface. This value is "
-        "used if the 'UseFixedAltitude' property is 'true'. The default value is 10000km."
+    constexpr openspace::properties::Property::PropertyInfo AltitudeInfo = {
+        "Altitude",
+        "Altitude",
+        "The altitude in meters. "
+        "If the 'UseHeightmap' property is 'true', this is an offset from the actual "
+        "surface of the globe. If not, this is an offset from the reference ellipsoid."
+        "The default value is 0.0"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo UseFixedAltitudeInfo = {
-        "UseFixedAltitude",
-        "Use Fixed Altitude",
-        "If this value is 'true', the altitude specified in 'FixedAltitude' is used for "
-        "this translation. If it is 'false', the altitude will be computed based on the "
-        "height information that is available about the globe to which this translation "
-        "is attached. The default value is 'true'."
+    constexpr openspace::properties::Property::PropertyInfo UseHeightmapInfo = {
+        "UseHeightmap",
+        "Use Heightmap",
+        "If this value is 'true', the altitude specified in 'Altitude' will be treated "
+        "as an offset from the heightmap. Otherwise, it will be an offset from the "
+        "globe's reference ellipsoid. The default value is 'false'."
     };
 } // namespace
 
@@ -81,8 +82,8 @@ documentation::Documentation GlobeTranslation::Documentation() {
     using namespace openspace::documentation;
 
     return {
-        "Spice Translation",
-        "space_translation_spicetranslation",
+        "Globe Translation",
+        "space_translation_globetranslation",
         {
             {
                 "Type",
@@ -110,16 +111,16 @@ documentation::Documentation GlobeTranslation::Documentation() {
                 LatitudeInfo.description,
             },
             {
-                FixedAltitudeInfo.identifier,
+                AltitudeInfo.identifier,
                 new DoubleVerifier,
                 Optional::Yes,
-                FixedAltitudeInfo.description
+                AltitudeInfo.description
             },
             {
-                UseFixedAltitudeInfo.identifier,
+                UseHeightmapInfo.identifier,
                 new BoolVerifier,
                 Optional::Yes,
-                UseFixedAltitudeInfo.description
+                UseHeightmapInfo.description
             }
         }
     };
@@ -129,8 +130,8 @@ GlobeTranslation::GlobeTranslation(const ghoul::Dictionary& dictionary)
     : _globe(GlobeInfo)
     , _longitude(LongitudeInfo, 0.0, -180.0, 180.0)
     , _latitude(LatitudeInfo, 0.0, -90.0, 90.0)
-    , _fixedAltitude(FixedAltitudeInfo, 1e8, 0.0, 1e12)
-    , _useFixedAltitude(UseFixedAltitudeInfo, false)
+    , _altitude(AltitudeInfo, 0.0, 0.0, 1e12)
+    , _useHeightmap(UseHeightmapInfo, false)
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
@@ -145,11 +146,11 @@ GlobeTranslation::GlobeTranslation(const ghoul::Dictionary& dictionary)
     if (dictionary.hasKey(LatitudeInfo.identifier)) {
         _latitude = dictionary.value<double>(LatitudeInfo.identifier);
     }
-    if (dictionary.hasKey(FixedAltitudeInfo.identifier)) {
-        _fixedAltitude = dictionary.value<double>(FixedAltitudeInfo.identifier);
+    if (dictionary.hasKey(AltitudeInfo.identifier)) {
+        _altitude = dictionary.value<double>(AltitudeInfo.identifier);
     }
-    if (dictionary.hasKey(UseFixedAltitudeInfo.identifier)) {
-        _useFixedAltitude = dictionary.value<bool>(UseFixedAltitudeInfo.identifier);
+    if (dictionary.hasKey(UseHeightmapInfo.identifier)) {
+        _useHeightmap = dictionary.value<bool>(UseHeightmapInfo.identifier);
     }
 
     _globe.onChange([this]() {
@@ -159,8 +160,13 @@ GlobeTranslation::GlobeTranslation(const ghoul::Dictionary& dictionary)
 
     _longitude.onChange([this]() { _positionIsDirty = true; });
     _latitude.onChange([this]() { _positionIsDirty = true; });
-    _fixedAltitude.onChange([this]() { _positionIsDirty = true; });
-    _useFixedAltitude.onChange([this]() { _positionIsDirty = true; });
+    _altitude.onChange([this]() { _positionIsDirty = true; });
+    _useHeightmap.onChange([this]() { _positionIsDirty = true; });
+
+    addProperty(_longitude);
+    addProperty(_latitude);
+    addProperty(_altitude);
+    addProperty(_useHeightmap);
 }
 
 void GlobeTranslation::fillAttachedNode() {
@@ -173,8 +179,10 @@ void GlobeTranslation::fillAttachedNode() {
             "GlobeTranslation",
             "Could not set attached node as it does not have a RenderableGlobe"
         );
-        // Reset the globe name to it's previous name
-        _globe = _attachedNode->identifier();
+        if (_attachedNode) {
+            // Reset the globe name to it's previous name
+            _globe = _attachedNode->identifier();
+        }
     }
 }
 
@@ -188,8 +196,8 @@ glm::dvec3 GlobeTranslation::position(const UpdateData&) const {
         _positionIsDirty = true;
     }
 
-    if (!_useFixedAltitude) {
-        // If we don't use the fixed altitude, we have to compute the height every frame
+    if (_useHeightmap) {
+        // If we use the heightmap, we have to compute the height every frame
         _positionIsDirty = true;
     }
 
@@ -197,33 +205,35 @@ glm::dvec3 GlobeTranslation::position(const UpdateData&) const {
         return _position;
     }
 
-
     GlobeBrowsingModule& mod = *(global::moduleEngine.module<GlobeBrowsingModule>());
 
-    glm::vec3 pos = mod.cartesianCoordinatesFromGeo(
-        *_attachedNode,
-        _latitude,
-        _longitude,
-        _fixedAltitude
-    );
-
-    if (_useFixedAltitude) {
-        _position = glm::dvec3(pos);
-        _positionIsDirty = true;
-
-        return _position;
-    }
-    else {
-        SurfacePositionHandle h = _attachedNode->calculateSurfacePositionHandle(pos);
-
-        pos = mod.cartesianCoordinatesFromGeo(
+    if (_useHeightmap) {
+        glm::vec3 groundPos = mod.cartesianCoordinatesFromGeo(
             *_attachedNode,
             _latitude,
             _longitude,
-            h.heightToSurface
+            0.0
         );
 
-        _position = glm::dvec3(pos);
+        SurfacePositionHandle h =
+            _attachedNode->calculateSurfacePositionHandle(groundPos);
+
+        _position = mod.cartesianCoordinatesFromGeo(
+            *_attachedNode,
+            _latitude,
+            _longitude,
+            h.heightToSurface + _altitude
+        );
+        return _position;
+    }
+    else {
+        _position = mod.cartesianCoordinatesFromGeo(
+            *_attachedNode,
+            _latitude,
+            _longitude,
+            _altitude
+        );
+        _positionIsDirty = false;
         return _position;
     }
 }
diff --git a/modules/globebrowsing/src/globetranslation.h b/modules/globebrowsing/src/globetranslation.h
index 7fbd943b7b..91c0bdf61b 100644
--- a/modules/globebrowsing/src/globetranslation.h
+++ b/modules/globebrowsing/src/globetranslation.h
@@ -49,8 +49,8 @@ private:
     properties::StringProperty _globe;
     properties::DoubleProperty _longitude;
     properties::DoubleProperty _latitude;
-    properties::DoubleProperty _fixedAltitude;
-    properties::BoolProperty _useFixedAltitude;
+    properties::DoubleProperty _altitude;
+    properties::BoolProperty _useHeightmap;
 
     RenderableGlobe* _attachedNode = nullptr;
 
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index 52e69b7731..b176825333 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -24,6 +24,8 @@
 
 #include <modules/globebrowsing/src/layer.h>
 
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
 #include <modules/globebrowsing/src/layergroup.h>
 #include <modules/globebrowsing/src/layermanager.h>
 #include <modules/globebrowsing/src/tileindex.h>
@@ -93,6 +95,114 @@ namespace {
     };
 } // namespace
 
+documentation::Documentation Layer::Documentation() {
+    using namespace documentation;
+    return {
+        "Layer",
+        "globebrowsing_layer",
+        {
+            {
+                KeyIdentifier,
+                new StringVerifier,
+                Optional::No,
+                "The unique identifier for this layer. May not contain '.' or spaces."
+            },
+            {
+                KeyName,
+                new StringVerifier,
+                Optional::Yes,
+                "A human-readable name for the user interface. If this is omitted, the "
+                "identifier is used instead."
+            },
+            {
+                KeyDesc,
+                new StringVerifier,
+                Optional::Yes,
+                "A human-readable description of the layer to be used in informational "
+                "texts presented to the user."
+            },
+            {
+                "Type",
+                new StringInListVerifier({
+                    "DefaultTileLayer", "SingleImageTileLayer", "SizeReferenceTileLayer",
+                    "TemporalTileLayer", "TileIndexTileLayer", "ByIndexTileLayer",
+                    "ByLevelTileLayer", "SolidColor"
+                }),
+                Optional::Yes,
+                "Specifies the type of layer that is to be added. If this value is not "
+                "specified, the layer is a DefaultTileLayer."
+            },
+            {
+                EnabledInfo.identifier,
+                new BoolVerifier,
+                Optional::Yes,
+                "Determine whether the layer is enabled or not. If this value is not "
+                "specified, the layer is disabled."
+            },
+            {
+                KeyPadTiles,
+                new BoolVerifier,
+                Optional::Yes,
+                "Determines whether the downloaded tiles should have a padding added to "
+                "the borders."
+            },
+            {
+                KeySettings,
+                new TableVerifier({
+                    {
+                        KeyOpacity,
+                        new DoubleInRangeVerifier(0.0, 1.0),
+                        Optional::Yes,
+                        "The opacity value of the layer."
+                    },
+                    {
+                        KeyGamma,
+                        new DoubleVerifier,
+                        Optional::Yes,
+                        "The gamma value that is applied to each pixel of the layer."
+                    },
+                    {
+                        KeyMultiplier,
+                        new DoubleVerifier,
+                        Optional::Yes,
+                        "The multiplicative factor that is applied to each pixel of the "
+                        "layer."
+                    },
+                    {
+                        KeyOffset,
+                        new DoubleVerifier,
+                        Optional::Yes,
+                        "An additive offset that is applied to each pixel of the layer."
+                    }
+                }),
+                Optional::Yes,
+                "Specifies the render settings that should be applied to this layer."
+            },
+            {
+                KeyAdjustment,
+                new ReferencingVerifier("globebrowsing_layeradjustment"),
+                Optional::Yes,
+                ""
+            },
+            {
+                BlendModeInfo.identifier,
+                new StringInListVerifier({
+                    "Normal", "Multiply", "Add", "Subtract", "Color"
+                }),
+                Optional::Yes,
+                "Sets the blend mode of this layer to determine how it interacts with "
+                "other layers on top of this."
+            },
+            {
+                "Fallback",
+                new ReferencingVerifier("globebrowsing_layer"),
+                Optional::Yes,
+                "If the primary layer creation fails, this layer is used as a fallback"
+            }
+        }
+    };
+}
+
 Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
              LayerGroup& parent)
     : properties::PropertyOwner({
@@ -109,13 +219,15 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
     , _solidColor(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _layerGroupId(id)
 {
+    documentation::testSpecificationAndThrow(Documentation(), layerDict, "Layer");
+
     layergroupid::TypeID typeID;
     if (layerDict.hasKeyAndValue<std::string>("Type")) {
         const std::string& typeString = layerDict.value<std::string>("Type");
         typeID = ghoul::from_string<layergroupid::TypeID>(typeString);
     }
     else {
- typeID = layergroupid::TypeID::DefaultTileLayer;
+        typeID = layergroupid::TypeID::DefaultTileLayer;
     }
     if (typeID == layergroupid::TypeID::Unknown) {
         throw ghoul::RuntimeError("Unknown layer type!");
@@ -341,9 +453,12 @@ void Layer::onChange(std::function<void(Layer*)> callback) {
     _onChangeCallback = std::move(callback);
 }
 
-void Layer::update() {
+int Layer::update() {
     if (_tileProvider) {
-        tileprovider::update(*_tileProvider);
+        return tileprovider::update(*_tileProvider);
+    }
+    else {
+        return 0;
     }
 }
 
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index 4658468b90..fb8f30dfd4 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -34,6 +34,8 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 
+namespace openspace::documentation { struct Documentation; }
+
 namespace openspace::globebrowsing {
 
 struct LayerGroup;
@@ -64,13 +66,16 @@ public:
 
     void onChange(std::function<void(Layer*)> callback);
 
-    void update();
+    // Return:  number of tiles that were updated
+    int update();
 
     glm::ivec2 tilePixelStartOffset() const;
     glm::ivec2 tilePixelSizeDifference() const;
     glm::vec2 tileUvToTextureSamplePosition(const TileUvTransform& uvTransform,
         const glm::vec2& tileUV, const glm::uvec2& resolution);
 
+    static documentation::Documentation Documentation();
+
 private:
     void initializeBasedOnType(layergroupid::TypeID typeId, ghoul::Dictionary initDict);
     void addVisibleProperties();
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index e529c544ed..3317133bb0 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -24,6 +24,9 @@
 
 #include <modules/globebrowsing/src/layeradjustment.h>
 
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+
 namespace {
     constexpr const char* KeyType = "Type";
     constexpr const char* KeyChromaKeyColor = "ChromaKeyColor";
@@ -51,6 +54,35 @@ namespace {
 
 namespace openspace::globebrowsing {
 
+documentation::Documentation LayerAdjustment::Documentation() {
+    using namespace documentation;
+    return {
+        "LayerAdjustment",
+        "globebrowsing_layeradjustment",
+        {
+            {
+                KeyType,
+                new StringInListVerifier({ "None", "ChromaKey", "TransferFunction" }),
+                Optional::Yes,
+                "Specifies the type of the adjustment that is applied"
+            },
+            {
+                KeyChromaKeyColor,
+                new DoubleVector3Verifier,
+                Optional::Yes,
+                "Specifies the chroma key used when selecting 'ChromaKey' for the 'Type'."
+            },
+            {
+                KeyChromaKeyTolerance,
+                new DoubleVerifier,
+                Optional::Yes,
+                "Specifies the tolerance to match the color to the chroma key when the "
+                "'ChromaKey' type is selected for the 'Type'."
+            }
+        }
+    };
+}
+
 LayerAdjustment::LayerAdjustment()
     : properties::PropertyOwner({ "adjustment" })
     , _chromaKeyColor(ChromaKeyColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
@@ -89,6 +121,12 @@ LayerAdjustment::LayerAdjustment()
 }
 
 void LayerAdjustment::setValuesFromDictionary(const ghoul::Dictionary& adjustmentDict) {
+    documentation::testSpecificationAndThrow(
+        Documentation(),
+        adjustmentDict,
+        "LayerAdjustment"
+    );
+
     if (adjustmentDict.hasKeyAndValue<std::string>(KeyType)) {
         std::string dictType = adjustmentDict.value<std::string>(KeyType);
         _typeOption = static_cast<int>(
diff --git a/modules/globebrowsing/src/layeradjustment.h b/modules/globebrowsing/src/layeradjustment.h
index eefa79c047..07c7c9460c 100644
--- a/modules/globebrowsing/src/layeradjustment.h
+++ b/modules/globebrowsing/src/layeradjustment.h
@@ -32,6 +32,8 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 
+namespace openspace::documentation { struct Documentation; }
+
 namespace openspace::globebrowsing {
 
 namespace tileprovider { struct TileProvider; }
@@ -50,6 +52,8 @@ public:
 
     void onChange(std::function<void(void)> callback);
 
+    static documentation::Documentation Documentation();
+
 private:
     void addVisibleProperties();
 
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index f6088e8869..909eb3dae4 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -25,6 +25,7 @@
 #include <modules/globebrowsing/src/layergroup.h>
 
 #include <modules/globebrowsing/src/layer.h>
+#include <openspace/documentation/documentation.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace {
@@ -91,18 +92,29 @@ void LayerGroup::deinitialize() {
     }
 }
 
-void LayerGroup::update() {
+int LayerGroup::update() {
+    int res = 0;
     _activeLayers.clear();
 
     for (const std::unique_ptr<Layer>& layer : _layers) {
         if (layer->enabled()) {
-            layer->update();
+            res += layer->update();
             _activeLayers.push_back(layer.get());
         }
     }
+
+    return res;
 }
 
 Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
+    documentation::TestResult res = documentation::testSpecification(
+        Layer::Documentation(),
+        layerDict
+    );
+    if (!res.success) {
+        LERROR("Error adding layer. " + ghoul::to_string(res));
+    }
+
     if (!layerDict.hasKeyAndValue<std::string>("Identifier")) {
         LERROR("'Identifier' must be specified for layer.");
         return nullptr;
@@ -152,6 +164,33 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
     LERROR("Could not find layer " + layerName);
 }
 
+void LayerGroup::moveLayers(int oldPosition, int newPosition) {
+    oldPosition = std::max(0, oldPosition);
+    newPosition = std::min(newPosition, static_cast<int>(_layers.size()));
+
+    // We need to adjust the new position as we first delete the old position, if this
+    // position is before the new position we have reduced the size of the vector by 1 and
+    // need to adapt where we want to put the value in
+    if (oldPosition < newPosition) {
+        newPosition -= 1;
+    }
+
+    // There are two synchronous vectors that we have to update here.  The _layers vector
+    // is used to determine the order while rendering, the _subowners is the order in
+    // which the layers are shown in the UI
+    auto oldPosLayers = _layers.begin() + oldPosition;
+    std::unique_ptr<Layer> v = std::move(*oldPosLayers);
+    _layers.erase(oldPosLayers);
+    auto newPosLayers = _layers.begin() + newPosition;
+    _layers.insert(newPosLayers, std::move(v));
+
+    auto oldPosOwner = _subOwners.begin() + oldPosition;
+    PropertyOwner* owner = std::move(*oldPosOwner);
+    _subOwners.erase(oldPosOwner);
+    auto newPosOwner = _subOwners.begin() + newPosition;
+    _subOwners.insert(newPosOwner, std::move(owner));
+}
+
 std::vector<Layer*> LayerGroup::layers() const {
     std::vector<Layer*> res;
     res.reserve(_layers.size());
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 923cef7011..f02fd0d80a 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -48,10 +48,12 @@ struct LayerGroup : public properties::PropertyOwner {
     void deinitialize();
 
     /// Updates all layers tile providers within this group
-    void update();
+    /// Return:  Number of tiles that were updated
+    int update();
 
     Layer* addLayer(const ghoul::Dictionary& layerDict);
     void deleteLayer(const std::string& layerName);
+    void moveLayers(int oldPosition, int newPosition);
 
     /// @returns const vector of all layers
     std::vector<Layer*> layers() const;
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 0f442d8bcf..18b91da259 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -28,10 +28,28 @@
 #include <modules/globebrowsing/src/layergroup.h>
 #include <modules/globebrowsing/src/tileprovider.h>
 #include <modules/globebrowsing/src/tiletextureinitdata.h>
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
 #include <ghoul/logging/logmanager.h>
 
 namespace openspace::globebrowsing {
 
+documentation::Documentation LayerManager::Documentation() {
+    using namespace documentation;
+    return {
+        "LayerManager",
+        "globebrowsing_layermanager",
+        {
+            {
+                "*",
+                new ReferencingVerifier("globebrowsing_layer"),
+                Optional::Yes,
+                "Specifies an individual layer"
+            }
+        }
+    };
+}
+
 LayerManager::LayerManager() : properties::PropertyOwner({ "Layers" }) {}
 
 void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
@@ -88,6 +106,10 @@ void LayerManager::deleteLayer(layergroupid::GroupID id, const std::string& laye
     _layerGroups[id]->deleteLayer(layerName);
 }
 
+LayerGroup& LayerManager::layerGroup(layergroupid::GroupID groupId) {
+    return *_layerGroups[groupId];
+}
+
 const LayerGroup& LayerManager::layerGroup(layergroupid::GroupID groupId) const {
     return *_layerGroups[groupId];
 }
@@ -111,10 +133,12 @@ std::array<LayerGroup*, LayerManager::NumLayerGroups> LayerManager::layerGroups(
     return res;
 }
 
-void LayerManager::update() {
+int LayerManager::update() {
+    int res = 0;
     for (std::unique_ptr<LayerGroup>& layerGroup : _layerGroups) {
-        layerGroup->update();
+        res += layerGroup->update();
     }
+    return res;
 }
 
 void LayerManager::reset(bool includeDisabled) {
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index de7fbb4c62..3052f8f4ee 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -35,6 +35,8 @@
 
 namespace ghoul { class Dictionary; }
 
+namespace openspace::documentation { struct Documentation; }
+
 namespace openspace::globebrowsing {
 
 class Layer;
@@ -57,17 +59,21 @@ public:
         const ghoul::Dictionary& layerDict);
     void deleteLayer(layergroupid::GroupID groupId, const std::string& layerName);
 
+    LayerGroup& layerGroup(layergroupid::GroupID);
     const LayerGroup& layerGroup(layergroupid::GroupID) const;
 
     bool hasAnyBlendingLayersEnabled() const;
 
     std::array<LayerGroup*, NumLayerGroups> layerGroups() const;
 
-    void update();
+    // Return:  Number of tiles updated
+    int update();
     void reset(bool includeDisabled = false);
 
     void onChange(std::function<void(Layer* l)> callback);
 
+    static documentation::Documentation Documentation();
+
 private:
     std::array<std::unique_ptr<LayerGroup>, NumLayerGroups> _layerGroups;
 };
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 6361670ee6..285c19c13a 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -31,6 +31,8 @@
 #include <modules/globebrowsing/src/renderableglobe.h>
 #include <modules/globebrowsing/src/tileprovider.h>
 #include <modules/debugging/rendering/debugrenderer.h>
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
 #include <openspace/performance/performancemanager.h>
 #include <openspace/performance/performancemeasurement.h>
@@ -47,6 +49,13 @@
 #include <numeric>
 #include <queue>
 
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+#include <openspace/engine/moduleengine.h>
+#include <modules/globebrowsing/globebrowsingmodule.h>
+openspace::GlobeBrowsingModule* _module = nullptr;
+
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+
 namespace {
     // Global flags to modify the RenderableGlobe
     constexpr const bool LimitLevelByAvailableData = true;
@@ -176,7 +185,7 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo TargetLodScaleFactorInfo = {
-        "TargetLodScaleFactorInfo",
+        "TargetLodScaleFactor",
         "Target Level of Detail Scale Factor",
         "" // @TODO Missing documentation
     };
@@ -417,6 +426,57 @@ Chunk::Chunk(const TileIndex& ti)
     , status(Status::DoNothing)
 {}
 
+documentation::Documentation RenderableGlobe::Documentation() {
+    using namespace documentation;
+    return {
+        "RenderableGlobe",
+        "globebrowsing_renderableglobe",
+        {
+            {
+                "Type",
+                new StringEqualVerifier("RenderableGlobe"),
+                Optional::No,
+                ""
+            },
+            {
+                KeyRadii,
+                new OrVerifier({ new DoubleVector3Verifier, new DoubleVerifier }),
+                Optional::Yes,
+                "Specifies the radii for this planet. If the Double version of this is "
+                "used, all three radii are assumed to be equal."
+            },
+            {
+                "PerformShading",
+                new BoolVerifier,
+                Optional::Yes,
+                "Specifies whether the planet should be shaded by the primary light "
+                "source or not. If it is disabled, all parts of the planet are "
+                "illuminated."
+            },
+            {
+                KeyLayers,
+                new TableVerifier({
+                    {
+                        "*",
+                        new ReferencingVerifier("globebrowsing_layermanager"),
+                        Optional::Yes,
+                        "Descriptions of the individual layer groups"
+                    }
+                }),
+                Optional::Yes,
+                "A list of all the layers that should be added"
+            },
+            {
+                KeyLabels,
+                new ReferencingVerifier("globebrowsing_globelabelscomponent"),
+                Optional::Yes,
+                "Specifies information about planetary labels that can be rendered on "
+                "the object's surface."
+            }
+        }
+    };
+}
+
 RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _debugProperties({
@@ -595,10 +655,13 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyLabels)) {
         _labelsDictionary = dictionary.value<ghoul::Dictionary>(KeyLabels);
     }
+
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    _module = global::moduleEngine.module<GlobeBrowsingModule>();
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 }
 
 void RenderableGlobe::initializeGL() {
-
     if (!_labelsDictionary.empty()) {
         _globeLabelsComponent.initialize(_labelsDictionary, this);
         addPropertySubOwner(_globeLabelsComponent);
@@ -745,7 +808,11 @@ void RenderableGlobe::update(const UpdateData& data) {
         _layerManager.reset();
         _debugProperties.resetTileProviders = false;
     }
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    _nUploadedTiles = _layerManager.update();
+#else
     _layerManager.update();
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 
     if (_nLayersIsDirty) {
         std::array<LayerGroup*, LayerManager::NumLayerGroups> lgs =
@@ -1034,6 +1101,14 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&) {
     }
     _localRenderer.program->deactivate();
 
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    _module->addFrameInfo(
+        this,
+        std::min(localCount, ChunkBufferSize),
+        std::min(globalCount, ChunkBufferSize),
+        _nUploadedTiles
+    );
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 
     if (_debugProperties.showChunkBounds || _debugProperties.showChunkAABB) {
         for (int i = 0; i < std::min(globalCount, ChunkBufferSize); ++i) {
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index 93022b532c..26cd45573c 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -41,6 +41,8 @@
 #include <ghoul/opengl/uniformcache.h>
 #include <cstddef>
 
+namespace openspace::documentation { struct Documentation; }
+
 namespace openspace::globebrowsing {
 
 class GPULayerGroup;
@@ -111,6 +113,8 @@ public:
     LayerManager& layerManager();
     const glm::dmat4& modelTransform() const;
 
+    static documentation::Documentation Documentation();
+
 private:
     constexpr static const int MinSplitDepth = 2;
     constexpr static const int MaxSplitDepth = 22;
@@ -274,6 +278,10 @@ private:
     // Labels
     GlobeLabelsComponent _globeLabelsComponent;
     ghoul::Dictionary _labelsDictionary;
+
+#ifdef OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
+    int _nUploadedTiles = 0;
+#endif // OPENSPACE_MODULE_GLOBEBROWSING_INSTRUMENTATION
 };
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp
index 0fe168fd78..ad72426685 100644
--- a/modules/globebrowsing/src/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider.cpp
@@ -162,15 +162,17 @@ void initAsyncTileDataReader(DefaultTileProvider& t, TileTextureInitData initDat
     );
 }
 
-void initTexturesFromLoadedData(DefaultTileProvider& t) {
+bool initTexturesFromLoadedData(DefaultTileProvider& t) {
     if (t.asyncTextureDataProvider) {
         std::optional<RawTile> tile = t.asyncTextureDataProvider->popFinishedRawTile();
         if (tile) {
             const cache::ProviderTileKey key = { tile->tileIndex, t.uniqueIdentifier };
             ghoul_assert(!t.tileCache->exist(key), "Tile must not be existing in cache");
             t.tileCache->createTileAndPut(key, std::move(tile.value()));
+            return true;
         }
     }
+    return false;
 }
 
 
@@ -1073,7 +1075,7 @@ TileDepthTransform depthTransform(TileProvider& tp) {
 
 
 
-void update(TileProvider& tp) {
+int update(TileProvider& tp) {
     switch (tp.type) {
         case Type::DefaultTileProvider: {
             DefaultTileProvider& t = static_cast<DefaultTileProvider&>(tp);
@@ -1082,7 +1084,7 @@ void update(TileProvider& tp) {
             }
 
             t.asyncTextureDataProvider->update();
-            initTexturesFromLoadedData(t);
+            bool hasUploaded = initTexturesFromLoadedData(t);
 
             if (t.asyncTextureDataProvider->shouldBeDeleted()) {
                 t.asyncTextureDataProvider = nullptr;
@@ -1091,6 +1093,9 @@ void update(TileProvider& tp) {
                     tileTextureInitData(t.layerGroupID, t.padTiles, t.tilePixelSize)
                 );
             }
+            if (hasUploaded) {
+                return 1;
+            }
             break;
         }
         case Type::SingleImageTileProvider:
@@ -1123,13 +1128,16 @@ void update(TileProvider& tp) {
                 if (newCurrent) {
                     t.currentTileProvider = newCurrent;
                 }
-                update(*t.currentTileProvider);
+                if (t.currentTileProvider) {
+                    update(*t.currentTileProvider);
+                }
             }
             break;
         }
         default:
             throw ghoul::MissingCaseException();
     }
+    return 0;
 }
 
 
diff --git a/modules/globebrowsing/src/tileprovider.h b/modules/globebrowsing/src/tileprovider.h
index c367638374..c7e3cd5196 100644
--- a/modules/globebrowsing/src/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider.h
@@ -222,8 +222,10 @@ TileDepthTransform depthTransform(TileProvider& tp);
 /**
  * This method should be called once per frame. Here, TileProviders
  * are given the opportunity to update their internal state.
+ *
+ * \return The number of tiles that have been updated in this call
  */
-void update(TileProvider& tp);
+int update(TileProvider& tp);
 
 /**
  * Provides a uniform way of all TileProviders to reload or
diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp
index 51088e6abf..0767a812a4 100644
--- a/modules/imgui/src/gui.cpp
+++ b/modules/imgui/src/gui.cpp
@@ -53,32 +53,69 @@ namespace {
 
     constexpr const std::array<const char*, 2> UniformNames = { "tex", "ortho" };
 
-    void addScreenSpaceRenderableLocal(std::string texturePath) {
+    void addScreenSpaceRenderableLocal(std::string identifier, std::string texturePath) {
         if (!FileSys.fileExists(absPath(texturePath))) {
             LWARNING(fmt::format("Could not find image '{}'", texturePath));
             return;
         }
 
-        openspace::global::scriptEngine.queueScript(
-            fmt::format(
+        std::string script;
+        if (identifier.empty()) {
+            script = fmt::format(
                 "openspace.addScreenSpaceRenderable({{\
                     Type = 'ScreenSpaceImageLocal',\
                     TexturePath = openspace.absPath('{}')\
                 }});",
-                std::move(texturePath)
-            ),
+                texturePath
+            );
+        }
+        else {
+            script = fmt::format(
+                "openspace.addScreenSpaceRenderable({{\
+                    Type = 'ScreenSpaceImageLocal',\
+                    TexturePath = openspace.absPath('{}'),\
+                    Identifier = '{}',\
+                    Name = '{}'\
+                }});",
+                texturePath,
+                identifier,
+                identifier
+            );
+        }
+
+        openspace::global::scriptEngine.queueScript(
+            script,
             openspace::scripting::ScriptEngine::RemoteScripting::Yes
         );
     }
 
-    void addScreenSpaceRenderableOnline(std::string texturePath) {
-        openspace::global::scriptEngine.queueScript(
-            fmt::format(
+    void addScreenSpaceRenderableOnline(std::string identifier, std::string texturePath) {
+        std::string script;
+        if (identifier.empty()) {
+            script = fmt::format(
                 "openspace.addScreenSpaceRenderable({{\
-                    Type = 'ScreenSpaceImageOnline', URL = '{}'\
+                    Type = 'ScreenSpaceImageOnline',\
+                    URL = '{}'\
                 }});",
-                std::move(texturePath)
-            ),
+                texturePath
+            );
+        }
+        else {
+            script = fmt::format(
+                "openspace.addScreenSpaceRenderable({{\
+                    Type = 'ScreenSpaceImageOnline',\
+                    URL = '{}',\
+                    Identifier = '{}',\
+                    Name = '{}'\
+                }});",
+                texturePath,
+                identifier,
+                identifier
+            );
+        }
+
+        openspace::global::scriptEngine.queueScript(
+            script,
             openspace::scripting::ScriptEngine::RemoteScripting::Yes
         );
     }
@@ -616,9 +653,16 @@ void GUI::render() {
     renderAndUpdatePropertyVisibility();
 
     static const int addImageBufferSize = 256;
+    static char identifierBuffer[addImageBufferSize];
     static char addImageLocalBuffer[addImageBufferSize];
     static char addImageOnlineBuffer[addImageBufferSize];
 
+    ImGui::InputText(
+        "Identifier for Local/Online Images",
+        identifierBuffer,
+        addImageBufferSize
+    );
+
     bool addImageLocal = ImGui::InputText(
         "Add Local Image",
         addImageLocalBuffer,
@@ -626,7 +670,10 @@ void GUI::render() {
         ImGuiInputTextFlags_EnterReturnsTrue
     );
     if (addImageLocal) {
-        addScreenSpaceRenderableLocal(std::string(addImageLocalBuffer));
+        addScreenSpaceRenderableLocal(
+            std::string(identifierBuffer),
+            std::string(addImageLocalBuffer)
+        );
     }
 
     bool addImageOnline = ImGui::InputText(
@@ -637,7 +684,10 @@ void GUI::render() {
     );
 
     if (addImageOnline) {
-        addScreenSpaceRenderableOnline(std::string(addImageOnlineBuffer));
+        addScreenSpaceRenderableOnline(
+            std::string(identifierBuffer),
+            std::string(addImageOnlineBuffer)
+        );
     }
 
     bool addDashboard = ImGui::Button("Add New Dashboard");
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index a9dbad74bd..fd674170ba 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -34,6 +34,7 @@ set(HEADER_FILES
   include/topics/authorizationtopic.h
   include/topics/bouncetopic.h
   include/topics/documentationtopic.h
+  include/topics/flightcontrollertopic.h
   include/topics/getpropertytopic.h
   include/topics/luascripttopic.h
   include/topics/sessionrecordingtopic.h
@@ -56,6 +57,7 @@ set(SOURCE_FILES
   src/topics/authorizationtopic.cpp
   src/topics/bouncetopic.cpp
   src/topics/documentationtopic.cpp
+  src/topics/flightcontrollertopic.cpp
   src/topics/getpropertytopic.cpp
   src/topics/luascripttopic.cpp
   src/topics/sessionrecordingtopic.cpp
diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h
new file mode 100644
index 0000000000..ffbf562e95
--- /dev/null
+++ b/modules/server/include/topics/flightcontrollertopic.h
@@ -0,0 +1,79 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_MODULE_SERVER___FLIGHTCONTROLLER_TOPIC___H__
+#define __OPENSPACE_MODULE_SERVER___FLIGHTCONTROLLER_TOPIC___H__
+
+#include <modules/server/include/topics/topic.h>
+
+#include <openspace/interaction/websocketinputstate.h>
+
+namespace openspace::interaction {
+
+    struct WebsocketInputStates;
+    struct WebsocketInputState;
+}
+
+namespace openspace {
+
+class FlightControllerTopic : public Topic {
+public:
+    FlightControllerTopic();
+    ~FlightControllerTopic();
+
+    void handleJson(const nlohmann::json& json) override;
+    bool isDone() const override;
+
+    void engageAutopilot(const nlohmann::json &json);
+    void disengageAutopilot() const;
+    void handleAutopilot(const nlohmann::json &json);
+
+private:
+    bool _isDone = false;
+    bool _autopilotEngaged;
+    nlohmann::json _payload;
+    nlohmann::json _focusNodes;
+    nlohmann::json _allNodes;
+    nlohmann::json _interestingTimes;
+
+    openspace::interaction::WebsocketInputStates _inputStates;
+    openspace::interaction::WebsocketInputState _inputState;
+
+    void connect();
+    void disconnect();
+    void processInputState(const nlohmann::json& json);
+    void setFocusNodes();
+    void setInterestingTimes();
+    void updateView(const nlohmann::json& json) const;
+    void changeFocus(const nlohmann::json& json) const;
+    void setRenderableEnabled(const nlohmann::json& json) const;
+    void processLua(const nlohmann::json& json);
+    void setFriction(const nlohmann::json& json) const;
+    void setFriction(bool roll, bool rotation, bool zoom) const;
+    void setFriction(bool all) const;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___FLIGHTCONTROLLER_TOPIC___H__
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index 6205adb904..b40bf007ad 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -27,6 +27,7 @@
 #include <modules/server/include/topics/authorizationtopic.h>
 #include <modules/server/include/topics/bouncetopic.h>
 #include <modules/server/include/topics/documentationtopic.h>
+#include <modules/server/include/topics/flightcontrollertopic.h>
 #include <modules/server/include/topics/getpropertytopic.h>
 #include <modules/server/include/topics/luascripttopic.h>
 #include <modules/server/include/topics/sessionrecordingtopic.h>
@@ -64,6 +65,7 @@ namespace {
     constexpr const char* TimeTopicKey = "time";
     constexpr const char* TriggerPropertyTopicKey = "trigger";
     constexpr const char* BounceTopicKey = "bounce";
+    constexpr const char* FlightControllerTopicKey = "flightcontroller";
 } // namespace
 
 namespace openspace {
@@ -95,6 +97,7 @@ Connection::Connection(std::unique_ptr<ghoul::io::Socket> s,
     _topicFactory.registerClass<TimeTopic>(TimeTopicKey);
     _topicFactory.registerClass<TriggerPropertyTopic>(TriggerPropertyTopicKey);
     _topicFactory.registerClass<BounceTopic>(BounceTopicKey);
+    _topicFactory.registerClass<FlightControllerTopic>(FlightControllerTopicKey);
     _topicFactory.registerClass<VersionTopic>(VersionTopicKey);
 }
 
@@ -125,8 +128,8 @@ void Connection::handleMessage(const std::string& message) {
                 message.begin(),
                 message.end(),
                 sanitizedString.begin(),
-                [](const unsigned char& c) {
-                    return std::isprint(c) ? c : ' ';
+                [](wchar_t c) {
+                    return std::isprint(c, std::locale("")) ? c : ' ';
                 }
             );
             LERROR(fmt::format("Could not parse JSON: '{}'", sanitizedString));
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
new file mode 100644
index 0000000000..e9a7efbc32
--- /dev/null
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -0,0 +1,438 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/server/include/topics/flightcontrollertopic.h>
+
+#include <modules/server/include/connection.h>
+#include <modules/server/include/jsonconverters.h>
+#include <openspace/engine/globals.h>
+#include <openspace/interaction/inputstate.h>
+#include <openspace/interaction/websocketcamerastates.h>
+#include <openspace/interaction/websocketinputstate.h>
+#include <openspace/interaction/navigationhandler.h>
+#include <openspace/interaction/orbitalnavigator.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scripting/scriptengine.h>
+#include <openspace/util/timemanager.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/fmt.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/lua/ghoul_lua.h>
+#include <iterator>
+#include <unordered_map>
+
+namespace {
+    constexpr const char* BasePathToken = "${BASE}";
+
+    enum class Command {
+        Connect = 0,
+        Disconnect,
+        InputState,
+        UpdateView,
+        Autopilot,
+        Friction,
+        Lua
+    };
+
+    using AxisType = openspace::interaction::WebsocketCameraStates::AxisType;
+
+    constexpr const char* _loggerCat = "FlightControllerTopic";
+    constexpr const char* TypeKey = "type";
+    constexpr const char* ValuesKey = "values";
+
+    // Disconnect JSON keys
+    constexpr const char* SuccessKey = "success";
+
+    // Connect JSON keys
+    constexpr const char* FocusNodesKey = "focusNodes";
+    constexpr const char* AllNodesKey = "allNodes";
+    constexpr const char* InterestingTimesKey = "interestingTimes";
+
+    // Change focus JSON keys
+    constexpr const char* FocusKey = "focus";
+    constexpr const char* SceneNodeName = "identifier";
+    constexpr const char* SceneNodeEnabled = "enabled";
+
+    constexpr const char* RenderableKey = "renderable";
+    constexpr const char* RenderableEnabled = "Enabled";
+
+    // Autopilot JSON keys
+    constexpr const char* AutopilotEngagedKey = "engaged";
+    constexpr const char* AutopilotInputKey = "autopilotInput";
+
+    constexpr const char* FlightControllerType = "flightcontroller";
+
+    // Friction JSON Keys
+    constexpr const char* FrictionEngagedKey = "engaged";
+    constexpr const char* FrictionPropertyUri = "NavigationHandler.OrbitalNavigator.Friction";
+    constexpr const char* FrictionRotationKey = "rotation";
+    constexpr const char* FrictionZoomKey = "zoom";
+    constexpr const char* FrictionRollKey = "roll";
+    constexpr const char* RotationalFriction = "Friction.RotationalFriction";
+    constexpr const char* ZoomFriction = "Friction.ZoomFriction";
+    constexpr const char* RollFriction = "Friction.RollFriction";
+
+    // Friction Lua Keys
+    constexpr const char* LuaKey = "lua";
+    constexpr const char* LuaScript = "script";
+
+    constexpr const char* OrbitX = "orbitX";
+    constexpr const char* OrbitY = "orbitY";
+    constexpr const char* ZoomIn = "zoomIn";
+    constexpr const char* ZoomOut = "zoomOut";
+    constexpr const char* LocalRollX = "localRollX";
+    constexpr const char* LocalRollY = "localRollY";
+    constexpr const char* GlobalRollX = "globalRollX";
+    constexpr const char* GlobalRollY = "globalRollY";
+    constexpr const char* PanX = "panX";
+    constexpr const char* PanY = "panY";
+
+    constexpr const char* Connect = "connect";
+    constexpr const char* Disconnect = "disconnect";
+    constexpr const char* InputState = "inputState";
+    constexpr const char* UpdateView = "updateView";
+    constexpr const char* Autopilot = "autopilot";
+    constexpr const char* Friction = "friction";
+    constexpr const char* Lua = "lua";
+
+    const static std::unordered_map<std::string, AxisType> AxisIndexMap ({
+        { OrbitX, AxisType::OrbitX },
+        { OrbitY, AxisType::OrbitY },
+        { ZoomIn, AxisType::ZoomIn },
+        { ZoomOut, AxisType::ZoomOut },
+        { LocalRollX, AxisType::LocalRollX },
+        { LocalRollY, AxisType::LocalRollY },
+        { GlobalRollX, AxisType::GlobalRollX },
+        { GlobalRollY, AxisType::GlobalRollY },
+        { PanX, AxisType::PanX },
+        { PanY, AxisType::PanY }
+    });
+
+    const static std::unordered_map<std::string, Command> CommandMap ({
+        { Connect, Command::Connect },
+        { Disconnect, Command::Disconnect },
+        { InputState, Command::InputState },
+        { UpdateView, Command::UpdateView },
+        { Autopilot, Command::Autopilot },
+        { Friction, Command::Friction },
+        { Lua, Command::Lua }
+    });
+
+    const int Axes = 10;
+
+} // namespace
+
+using nlohmann::json;
+
+namespace openspace {
+
+FlightControllerTopic::FlightControllerTopic() {
+    for (auto it = AxisIndexMap.begin(); it != AxisIndexMap.end(); ++it) {
+        global::navigationHandler.setWebsocketAxisMapping(
+            int(std::distance(AxisIndexMap.begin(), it)),
+            it->second
+        );
+    }
+
+    // Add WebsocketInputState to global states
+    global::websocketInputStates[_topicId] = &_inputState;
+}
+
+FlightControllerTopic::~FlightControllerTopic() {
+    // Reset global websocketInputStates
+    global::websocketInputStates.erase(_topicId);
+    global::websocketInputStates = interaction::WebsocketInputStates();
+}
+
+bool FlightControllerTopic::isDone() const {
+    if (_isDone) {
+        disengageAutopilot();
+    }
+    return _isDone;
+}
+
+void FlightControllerTopic::handleJson(const nlohmann::json& json) {
+    auto it = CommandMap.find(json[TypeKey]);
+    if (it == CommandMap.end()) {
+        LWARNING(fmt::format("Poorly formatted JSON command: no '{}' in payload", TypeKey));
+        return;
+    }
+
+    switch (it->second) {
+        case Command::Connect:
+            connect();
+            break;
+        case Command::Disconnect:
+            disconnect();
+            break;
+        case Command::InputState:
+            processInputState(json);
+            break;
+        case Command::UpdateView:
+            updateView(json);
+            break;
+        case Command::Autopilot:
+            handleAutopilot(json[Autopilot]);
+            break;
+        case Command::Friction:
+            setFriction(json[Friction]);
+            break;
+        case Command::Lua:
+            processLua(json[Lua]);
+            break;
+        default:
+            LWARNING(fmt::format("Unrecognized action: {}", it->first));
+            break;
+    }
+}
+
+void FlightControllerTopic::connect() {
+    _isDone = false;
+    std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0);
+    _payload[TypeKey] = Connect;
+    setFocusNodes();
+    setInterestingTimes();
+    _payload[Connect][FocusNodesKey] = _focusNodes;
+    _payload[Connect][AllNodesKey] = _allNodes;
+    _payload[Connect][InterestingTimesKey] = _interestingTimes;
+    _connection->sendJson(wrappedPayload(_payload));
+}
+
+void FlightControllerTopic::setFocusNodes() {
+    // Get all scene nodes
+    std::vector<SceneGraphNode*> nodes =
+        global::renderEngine.scene()->allSceneGraphNodes();
+
+    // Remove all nodes with no renderable
+    nodes.erase(
+        std::remove_if(
+            nodes.begin(),
+           nodes.end(),
+           [](SceneGraphNode* node) { return node->renderable() == nullptr; }
+        ),
+        nodes.end()
+    );
+
+    // Sort them alphabetically
+    std::sort(
+        nodes.begin(),
+        nodes.end(),
+        [](SceneGraphNode* lhs, SceneGraphNode* rhs) {
+            return lhs->guiName() < rhs->guiName();
+        }
+    );
+
+    // Add to interesting nodes list and all nodes list
+    for (SceneGraphNode* n : nodes) {
+        // Set whether it's enabled
+        const std::vector<std::string>& tags = n->tags();
+        const auto it = std::find(tags.begin(), tags.end(), "GUI.Interesting");
+        if (it != tags.end()) {
+            _focusNodes[n->guiName()][SceneNodeName] = n->identifier();
+            _focusNodes[n->guiName()][SceneNodeEnabled] = n->renderable()->isEnabled();
+        }
+        _allNodes[n->guiName()][SceneNodeName] = n->identifier();
+        _allNodes[n->guiName()][SceneNodeEnabled] = n->renderable()->isEnabled();
+    }
+}
+
+void FlightControllerTopic::setInterestingTimes() {
+    std::vector<Scene::InterestingTime> times =
+        global::renderEngine.scene()->interestingTimes();
+
+    std::sort(
+        times.begin(),
+        times.end(),
+        [](Scene::InterestingTime lhs, Scene::InterestingTime rhs) {
+            return lhs.name < rhs.name;
+        }
+    );
+
+    for (const Scene::InterestingTime& t : times) {
+        _interestingTimes[t.name] = t.time;
+    }
+}
+
+void FlightControllerTopic::updateView(const nlohmann::json& json) const {
+    if (json.find(FocusKey) != json.end()) {
+        changeFocus(json);
+    }
+    if (json.find(RenderableKey) != json.end()) {
+        setRenderableEnabled(json);
+    }
+}
+
+void FlightControllerTopic::changeFocus(const nlohmann::json& json) const {
+    if (json[FocusKey].find(SceneNodeName) == json[FocusKey].end()) {
+        const std::string j = json;
+        LWARNING(fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j));
+        return;
+    }
+    
+    const std::string focus = json[FocusKey][SceneNodeName];
+    const SceneGraphNode* node = global::renderEngine.scene()->sceneGraphNode(focus);
+    if (node) {
+        global::navigationHandler.orbitalNavigator().setFocusNode(node->identifier());
+        global::navigationHandler.orbitalNavigator().startRetargetAnchor();
+    }
+    else {
+        LWARNING(fmt::format("Could not find node named {}", focus));
+    }
+}
+
+void FlightControllerTopic::setRenderableEnabled(const nlohmann::json& json) const {
+    if (json[RenderableKey].find(SceneNodeName) == json[RenderableKey].end()) {
+        const std::string j = json;
+        LWARNING(fmt::format("Could not find {} key in JSON. JSON was:\n{}", FocusKey, j));
+        return;
+    }
+
+    const std::string name = json[RenderableKey][SceneNodeName];
+    const bool enabled = json[RenderableKey][SceneNodeEnabled];
+
+    const SceneGraphNode* node = global::renderEngine.scene()->sceneGraphNode(name);
+    if (node && node->renderable() != nullptr) {
+        node->renderable()->property(RenderableEnabled)->set(enabled);
+    }
+}
+
+void FlightControllerTopic::disconnect() {
+    // Reset global websocketInputStates
+    global::websocketInputStates.erase(_topicId);
+    global::websocketInputStates = interaction::WebsocketInputStates();
+
+    // Update FlightController
+    nlohmann::json j;
+    j[TypeKey] = Disconnect;
+    j[Disconnect][SuccessKey] = true;
+    _connection->sendJson(wrappedPayload(j));
+
+    _isDone = true;
+}
+
+void FlightControllerTopic::setFriction(bool all) const {
+    setFriction(all, all, all);
+}
+
+void FlightControllerTopic::setFriction(bool roll, bool rotation, bool zoom) const {
+    const interaction::OrbitalNavigator& navigator =
+        global::navigationHandler.orbitalNavigator();
+
+    navigator.property(RollFriction)->set(roll);
+    navigator.property(RotationalFriction)->set(rotation);
+    navigator.property(ZoomFriction)->set(zoom);
+
+    // Update FlightController
+    nlohmann::json j;
+    j[TypeKey] = Friction;
+    j[Friction][FrictionRollKey] = roll;
+    j[Friction][FrictionRotationKey] = rotation;
+    j[Friction][FrictionZoomKey] = zoom;
+    _connection->sendJson(wrappedPayload(j));
+}
+
+void FlightControllerTopic::setFriction(const nlohmann::json& json) const {
+    setFriction(json[FrictionRollKey], json[FrictionRotationKey], json[FrictionZoomKey]);
+}
+
+void FlightControllerTopic::disengageAutopilot() const {
+    setFriction(true);
+}
+
+void FlightControllerTopic::engageAutopilot(const nlohmann::json &json) {
+    // Disable/enable friction
+    setFriction(false);
+    auto input = json[AutopilotInputKey][ValuesKey];
+
+    std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0);
+    _inputState.isConnected = true;
+
+    for (auto it = input.begin(); it != input.end(); ++it) {
+        const auto mapIt = AxisIndexMap.find(it.key());
+        if (mapIt == AxisIndexMap.end()) {
+            if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
+                LWARNING(fmt::format(
+                    "No axis, button, or command named {} (value: {})",
+                    it.key(), static_cast<int>(it.value())
+                ));
+            }
+            continue;
+        }
+        _inputState.axes[std::distance(AxisIndexMap.begin(), mapIt)] = float(it.value());
+    }
+}
+
+void FlightControllerTopic::handleAutopilot(const nlohmann::json &json) {
+    const bool engaged = json[AutopilotEngagedKey];
+
+    if (engaged) {
+        engageAutopilot(json);
+    }
+    else {
+        disengageAutopilot();
+    }
+    _autopilotEngaged = engaged;
+
+    nlohmann::json j;
+    j[TypeKey] = Autopilot;
+    j[Autopilot][AutopilotEngagedKey] = _autopilotEngaged;
+
+    _connection->sendJson(wrappedPayload(j));
+}
+
+void FlightControllerTopic::processInputState(const nlohmann::json& json) {
+    std::fill(_inputState.axes.begin(), _inputState.axes.end(), 0);
+    _inputState.isConnected = true;
+
+    // Get "inputState" object from "payload"
+    auto input = json[InputState][ValuesKey];
+
+    for (auto it = input.begin(); it != input.end(); ++it) {
+        const auto mapIt = AxisIndexMap.find(it.key());
+        if (mapIt == AxisIndexMap.end()) {
+            if (it.key() != TypeKey || CommandMap.find(it.value()) == CommandMap.end()) {
+                LWARNING(fmt::format(
+                    "No axis, button, or command named {} (value: {})",
+                    it.key() , static_cast<int>(it.value())
+                ));
+            }
+            continue;
+        }
+        _inputState.axes[std::distance(AxisIndexMap.begin(), mapIt)] = float(it.value());
+    }
+}
+    
+void FlightControllerTopic::processLua(const nlohmann::json &json) {
+    const std::string script = json[LuaScript];
+    global::scriptEngine.queueScript(
+        script,
+        openspace::scripting::ScriptEngine::RemoteScripting::Yes
+    );
+}
+    
+} // namespace openspace
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index f883410764..018159f0ba 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -69,7 +69,7 @@ namespace {
         return "[" + formatLuaString(it.key()) + "] = " + formatLua(it);
     }
 
-    std::string formatLuaTable(const nlohmann::json& json) {
+    std::string formatObjectAsLuaTable(const nlohmann::json& json) {
         std::string output = "{";
         auto it = json.begin();
         for (size_t i = 0; i < json.size(); ++i, ++it) {
@@ -81,9 +81,24 @@ namespace {
         return output + "}";
     }
 
+    std::string formatArrayAsLuaTable(const nlohmann::json& json) {
+        std::string output = "{";
+        auto it = json.begin();
+        for (size_t i = 0; i < json.size(); ++i, ++it) {
+            output += formatLua(it);
+            if (i < json.size() - 1) {
+                output += ",";
+            }
+        }
+        return output + "}";
+    }
+
     std::string formatLua(const nlohmann::json::const_iterator& it) {
         if (it->is_object()) {
-            return formatLuaTable(it->get<nlohmann::json>());
+            return formatObjectAsLuaTable(it->get<nlohmann::json>());
+        }
+        if (it->is_array()) {
+            return formatArrayAsLuaTable(it->get<nlohmann::json>());
         }
         if (it->is_number()) {
             return fmt::format("{:E}", it->get<double>());
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index 584f8c2fe8..2e40e4d99d 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -41,15 +41,29 @@ namespace {
 
     std::string escapedLuaString(const std::string& str) {
         std::string luaString;
+
         for (const char& c : str) {
             switch (c) {
-                case '\'':
-                    luaString += "\'";
-                    break;
-                default:
-                    luaString += c;
+            case '\t':
+                luaString += "\\t"; // Replace tab with \t.
+                break;
+            case '"':
+                luaString += "\\\""; // Replace " with \".
+                break;
+            case '\\':
+                luaString += "\\\\"; // Replace \ with \\.
+                break;
+            case '\n':
+                luaString += "\\\\n"; // Replace newline with \n.
+                break;
+            case '\r':
+                luaString += "\\r"; // Replace carriage return with \r.
+                break;
+            default:
+                luaString += c;
             }
         }
+
         return luaString;
     }
 
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
index 4710d13c4f..60512f4516 100644
--- a/modules/server/src/topics/timetopic.cpp
+++ b/modules/server/src/topics/timetopic.cpp
@@ -32,7 +32,6 @@
 #include <ghoul/logging/logmanager.h>
 
 namespace {
-    constexpr const char* _loggerCat = "TimeTopic";
     constexpr const char* EventKey = "event";
     constexpr const char* SubscribeEvent = "start_subscription";
     constexpr const char* UnsubscribeEvent = "stop_subscription";
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index 891ee0efb8..474e7158b3 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -773,7 +773,6 @@ void RenderableStars::renderPSFToTexture() {
     GLenum blendDestRGB;
     GLenum blendSrcAlpha;
     GLenum blendSrcRGB;
-    GLboolean depthMask;
 
     glGetIntegerv(GL_BLEND_EQUATION_RGB, &blendEquationRGB);
     glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &blendEquationAlpha);
@@ -927,7 +926,6 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
         glm::dmat4(data.modelTransform.rotation) *
         glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
 
-    glm::dmat4 modelViewMatrix = data.camera.combinedViewMatrix() * modelMatrix;
     glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
 
     glm::dmat4 cameraViewProjectionMatrix = projectionMatrix *
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index 986fd5682f..272b6b9242 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -165,7 +165,6 @@ private:
     GLuint _psfVao = 0;
     GLuint _psfVbo = 0;
     GLuint _psfTexture = 0;
-    GLuint _discTexture = 0;
     GLuint _convolvedTexture = 0;
 };
 
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index e50d284047..80dca66afe 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -179,7 +179,7 @@ void HorizonsTranslation::readHorizonsTextFile(const std::string& horizonsTextFi
         );
 
         // Add position to stored timeline.
-        _timeline.addKeyframe(timeInJ2000, gPos);
+        _timeline.addKeyframe(timeInJ2000, std::move(gPos));
 
         std::getline(fileStream, line);
     }
diff --git a/modules/sync/CMakeLists.txt b/modules/sync/CMakeLists.txt
index 28fde9802a..a263e5498f 100644
--- a/modules/sync/CMakeLists.txt
+++ b/modules/sync/CMakeLists.txt
@@ -24,8 +24,6 @@
 
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
-option(OPENSPACE_MODULE_SYNC_USE_LIBTORRENT "Use libtorrent" OFF)
-
 set(HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.h
   ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.h
@@ -42,48 +40,4 @@ set(SOURCE_FILES
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
-if (OPENSPACE_MODULE_SYNC_USE_LIBTORRENT)
-  set(HEADER_FILES
-    ${HEADER_FILES}
-    ${CMAKE_CURRENT_SOURCE_DIR}/torrentclient.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/syncs/torrentsynchronization.h
-  )
-  set(SOURCE_FILES
-    ${SOURCE_FILES}
-    ${CMAKE_CURRENT_SOURCE_DIR}/torrentclient.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/syncs/torrentsynchronization.cpp
-  )
-endif ()
-
-
 create_new_module("Sync" sync_module ${HEADER_FILES} ${SOURCE_FILES})
-
-#####
-# Libtorrent
-#####
-
-if (OPENSPACE_MODULE_SYNC_USE_LIBTORRENT)
-  set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_MULTITHREADED ON)
-  set(LIBTORRENT_encryption OFF CACHE BOOL "Use OpenSSL Encryption" FORCE)
-  set(LIBTORRENT_shared OFF CACHE BOOL "Use Libtorrent as shared library" FORCE)
-
-  include_external_library(
-    ${sync_module}
-    torrent-rasterbar
-    ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent
-  )
-  target_include_directories(
-    ${sync_module}
-    SYSTEM PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/ext/libtorrent/include
-  )
-
-  target_compile_definitions(openspace-module-sync PUBLIC SYNC_USE_LIBTORRENT)
-
-  mark_as_advanced(LIBTORRENT_build_examples LIBTORRENT_build_tests
-    LIBTORRENT_deprecated-functions LIBTORRENT_dht LIBTORRENT_encryption
-    LIBTORRENT_exceptions LIBTORRENT_exceptions LIBTORRENT_libiconv
-    LIBTORRENT_logging LIBTORRENT_shared LIBTORRENT_static_runtime
-    )
-endif () # OPENSPACE_MODULE_SYNC_USE_LIBTORRENT
\ No newline at end of file
diff --git a/modules/sync/ext/libtorrent b/modules/sync/ext/libtorrent
deleted file mode 160000
index 22477e7430..0000000000
--- a/modules/sync/ext/libtorrent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 22477e7430a643fc64e55a669e2ad0e87a67647e
diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp
index 791254a3cd..6f920b85d4 100644
--- a/modules/sync/syncmodule.cpp
+++ b/modules/sync/syncmodule.cpp
@@ -25,7 +25,6 @@
 #include <modules/sync/syncmodule.h>
 
 #include <modules/sync/syncs/httpsynchronization.h>
-#include <modules/sync/syncs/torrentsynchronization.h>
 #include <modules/sync/syncs/urlsynchronization.h>
 #include <modules/sync/tasks/syncassettask.h>
 #include <openspace/documentation/documentation.h>
@@ -87,19 +86,6 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
         }
     );
 
-#ifdef SYNC_USE_LIBTORRENT
-    fSynchronization->registerClass(
-        "TorrentSynchronization",
-        [this](bool, const ghoul::Dictionary& dictionary) {
-            return new TorrentSynchronization(
-                dictionary,
-                _synchronizationRoot,
-                _torrentClient
-            );
-        }
-    );
-#endif // SYNC_USE_LIBTORRENT
-
     fSynchronization->registerClass(
         "UrlSynchronization",
         [this](bool, const ghoul::Dictionary& dictionary) {
@@ -113,17 +99,6 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
     auto fTask = FactoryManager::ref().factory<Task>();
     ghoul_assert(fTask, "No task factory existed");
     fTask->registerClass<SyncAssetTask>("SyncAssetTask");
-
-#ifdef SYNC_USE_LIBTORRENT
-    _torrentClient.initialize();
-    global::callback::deinitialize.emplace_back([&]() { _torrentClient.deinitialize(); });
-#endif // SYNC_USE_LIBTORRENT
-}
-
-void SyncModule::internalDeinitialize() {
-#ifdef SYNC_USE_LIBTORRENT
-    _torrentClient.deinitialize();
-#endif // SYNC_USE_LIBTORRENT
 }
 
 std::string SyncModule::synchronizationRoot() const {
@@ -140,10 +115,7 @@ std::vector<std::string> SyncModule::httpSynchronizationRepositories() const {
 
 std::vector<documentation::Documentation> SyncModule::documentations() const {
     return {
-        HttpSynchronization::Documentation(),
-#ifdef SYNC_USE_LIBTORRENT
-        TorrentSynchronization::Documentation()
-#endif // SYNC_USE_LIBTORRENT
+        HttpSynchronization::Documentation()
     };
 }
 
diff --git a/modules/sync/syncmodule.h b/modules/sync/syncmodule.h
index eef18e8b72..64cb7e412d 100644
--- a/modules/sync/syncmodule.h
+++ b/modules/sync/syncmodule.h
@@ -27,10 +27,6 @@
 
 #include <openspace/util/openspacemodule.h>
 
-#ifdef SYNC_USE_LIBTORRENT
-#include <modules/sync/torrentclient.h>
-#endif // SYNC_USE_LIBTORRENT
-
 namespace openspace {
 
 class SyncModule : public OpenSpaceModule {
@@ -44,20 +40,12 @@ public:
     void addHttpSynchronizationRepository(std::string repository);
     std::vector<std::string> httpSynchronizationRepositories() const;
 
-#ifdef SYNC_USE_LIBTORRENT
-    TorrentClient& torrentClient();
-#endif // SYNC_USE_LIBTORRENT
-
     std::vector<documentation::Documentation> documentations() const override;
 
 protected:
     void internalInitialize(const ghoul::Dictionary& configuration) override;
-    void internalDeinitialize() override;
 
 private:
-#ifdef SYNC_USE_LIBTORRENT
-    TorrentClient _torrentClient;
-#endif // SYNC_USE_LIBTORRENT
     std::vector<std::string> _synchronizationRepositories;
     std::string _synchronizationRoot;
 };
diff --git a/modules/sync/syncs/torrentsynchronization.cpp b/modules/sync/syncs/torrentsynchronization.cpp
deleted file mode 100644
index 2f3bfd1485..0000000000
--- a/modules/sync/syncs/torrentsynchronization.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2019                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <modules/sync/syncs/torrentsynchronization.h>
-
-#include <openspace/documentation/verifier.h>
-#include <ghoul/logging/logmanager.h>
-#include <ghoul/filesystem/file.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <ghoul/misc/dictionary.h>
-#include <fstream>
-
-namespace {
-    constexpr const char* KeyIdentifier = "Identifier";
-    constexpr const char* KeyMagnet = "Magnet";
-} // namespace
-
-namespace openspace {
-
-documentation::Documentation TorrentSynchronization::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "TorrentSynchronization",
-        "torrent_synchronization",
-        {
-            {
-                KeyIdentifier,
-                new StringVerifier,
-                Optional::No,
-                "A unique identifier for this torrent"
-            },
-            {
-                KeyMagnet,
-                new StringVerifier,
-                Optional::No,
-                "A magnet link identifying the torrent"
-            }
-        }
-    };
-}
-
-TorrentSynchronization::TorrentSynchronization(const ghoul::Dictionary& dict,
-                                               std::string synchronizationRoot,
-                                               TorrentClient& torrentClient)
-    : ResourceSynchronization(dict)
-    , _synchronizationRoot(std::move(synchronizationRoot))
-    , _torrentClient(torrentClient)
-{
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dict,
-        "TorrentSynchronization"
-    );
-
-    _identifier = dict.value<std::string>(KeyIdentifier);
-    _magnetLink = dict.value<std::string>(KeyMagnet);
-}
-
-TorrentSynchronization::~TorrentSynchronization() {
-    cancel();
-}
-
-std::string TorrentSynchronization::uniformResourceName() const {
-    const size_t begin = _magnetLink.find("=urn") + 1;
-    const size_t end = _magnetLink.find('&', begin);
-    std::string xs = _magnetLink.substr(
-        begin,
-        (end == std::string::npos) ? end : (end - begin)
-    );
-
-    std::transform(
-        xs.begin(),
-        xs.end(),
-        xs.begin(),
-        [](char x) { return (x == ':') ? '.' : x; }
-    );
-    return xs;
-}
-
-std::string TorrentSynchronization::directory() {
-    ghoul::filesystem::Directory d(
-        _synchronizationRoot +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        "torrent" +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        _identifier +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        uniformResourceName()
-    );
-
-    return FileSys.absPath(d);
-}
-
-void TorrentSynchronization::start() {
-    if (_enabled) {
-        return;
-    }
-    begin();
-
-    if (hasSyncFile()) {
-        resolve();
-    }
-
-    _enabled = true;
-    try {
-        _torrentId = _torrentClient.addMagnetLink(
-            _magnetLink,
-            directory(),
-            [this](TorrentClient::TorrentProgress p) {
-                updateTorrentProgress(p);
-            }
-        );
-    } catch (const TorrentError& e) {
-        LERRORC(name(), e.message);
-        if (!isResolved()) {
-            reject();
-        }
-    }
-}
-
-void TorrentSynchronization::cancel() {
-    if (_enabled) {
-        _torrentClient.removeTorrent(_torrentId);
-        _enabled = false;
-        reset();
-    }
-}
-
-void TorrentSynchronization::clear() {
-    cancel();
-    // TODO: Remove all files from directory.
-}
-
-bool TorrentSynchronization::hasSyncFile() {
-    const std::string& path = directory() + ".ossync";
-    return FileSys.fileExists(path);
-}
-
-void TorrentSynchronization::createSyncFile() {
-    const std::string& directoryName = directory();
-    const std::string& filepath = directoryName + ".ossync";
-
-    FileSys.createDirectory(directoryName, ghoul::filesystem::FileSystem::Recursive::Yes);
-
-    std::ofstream syncFile(filepath, std::ofstream::out);
-    syncFile << "Synchronized";
-    syncFile.close();
-}
-
-size_t TorrentSynchronization::nSynchronizedBytes() {
-    std::lock_guard<std::mutex> g(_progressMutex);
-    return _progress.nDownloadedBytes;
-}
-
-size_t TorrentSynchronization::nTotalBytes() {
-    std::lock_guard<std::mutex> g(_progressMutex);
-    return _progress.nTotalBytes;
-}
-
-bool TorrentSynchronization::nTotalBytesIsKnown() {
-    std::lock_guard<std::mutex> g(_progressMutex);
-    return _progress.nTotalBytesKnown;
-}
-
-void TorrentSynchronization::updateTorrentProgress(
-                                                  TorrentClient::TorrentProgress progress)
-{
-    std::lock_guard<std::mutex> g(_progressMutex);
-    _progress = progress;
-    if (progress.finished && (state() == State::Syncing)) {
-        createSyncFile();
-        resolve();
-    }
-}
-
-} // namespace openspace
diff --git a/modules/sync/torrentclient.cpp b/modules/sync/torrentclient.cpp
deleted file mode 100644
index e2379f9c67..0000000000
--- a/modules/sync/torrentclient.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2019                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#include <modules/sync/torrentclient.h>
-
-#include <openspace/openspace.h>
-#include <ghoul/fmt.h>
-#include <ghoul/logging/logmanager.h>
-
-#ifdef SYNC_USE_LIBTORRENT
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable : 4265)
-#pragma warning (disable : 4996)
-#endif // _MSC_VER
-
-#include <libtorrent/entry.hpp>
-#include <libtorrent/bencode.hpp>
-#include <libtorrent/session.hpp>
-#include <libtorrent/alert_types.hpp>
-#include <libtorrent/torrent_info.hpp>
-#include <libtorrent/magnet_uri.hpp>
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif // _MSC_VER
-
-
-namespace {
-    constexpr const char* _loggerCat = "TorrentClient";
-    constexpr const std::chrono::milliseconds PollInterval(1000);
-} // namespace
-
-#endif // SYNC_USE_LIBTORRENT
-
-namespace openspace {
-
-TorrentError::TorrentError(std::string msg)
-    : RuntimeError(std::move(msg), "TorrentClient")
-{}
-
-void TorrentClient::initialize() {
-#ifdef SYNC_USE_LIBTORRENT
-    libtorrent::settings_pack settings;
-    settings.set_str(
-        libtorrent::settings_pack::user_agent,
-        "OpenSpace/" + std::string(OPENSPACE_VERSION_NUMBER)
-    );
-
-    settings.set_str(
-        libtorrent::settings_pack::listen_interfaces,
-        "0.0.0.0:6881,0.0.0.0:20280,0.0.0.0:20285,0.0.0.0:20290"
-    );
-    settings.set_bool(libtorrent::settings_pack::allow_multiple_connections_per_ip, true);
-    settings.set_bool(libtorrent::settings_pack::enable_upnp, true);
-    //settings.set_bool(libtorrent::settings_pack::ignore_limits_on_local_network, true);
-    settings.set_int(libtorrent::settings_pack::connection_speed, 20);
-    settings.set_int(libtorrent::settings_pack::active_downloads, -1);
-    settings.set_int(libtorrent::settings_pack::active_seeds, -1);
-    settings.set_int(libtorrent::settings_pack::active_limit, 30);
-
-    settings.set_str(
-        libtorrent::settings_pack::dht_bootstrap_nodes,
-        "router.utorrent.com,dht.transmissionbt.com,router.bittorrent.com,\
-router.bitcomet.com"
-    );
-    settings.set_int(libtorrent::settings_pack::dht_announce_interval, 15);
-
-    _session.apply_settings(settings);
-
-    libtorrent::error_code ec;
-
-    _isInitialized = true;
-    _isActive = true;
-
-    _torrentThread = std::thread([this]() {
-        while (_isActive) {
-            pollAlerts();
-            std::unique_lock<std::mutex> lock(_abortMutex);
-            _abortNotifier.wait_for(lock, PollInterval);
-        }
-    });
-#endif // SYNC_USE_LIBTORRENT
-}
-
-void TorrentClient::deinitialize() {
-#ifdef SYNC_USE_LIBTORRENT
-    if (!_isActive) {
-        return;
-    }
-
-    _isActive = false;
-    _abortNotifier.notify_all();
-    if (_torrentThread.joinable()) {
-        _torrentThread.join();
-    }
-
-    const std::vector<lt::torrent_handle>& handles = _session.get_torrents();
-    for (const lt::torrent_handle& h : handles) {
-        _session.remove_torrent(h);
-    }
-    _torrents.clear();
-
-    _session.abort();
-    _isInitialized = false;
-#endif // SYNC_USE_LIBTORRENT
-}
-
-void TorrentClient::pollAlerts() {
-#ifdef SYNC_USE_LIBTORRENT
-    // Libtorrent does not seem to reliably generate alerts for all added torrents.
-    // To make sure that the program does not keep waiting for already finished
-    // downsloads, we go through the whole list of torrents when polling.
-    // However, in theory, the commented code below should be more efficient:
-    /*
-    std::vector<libtorrent::alert*> alerts;
-    {
-        std::lock_guard<std::mutex> guard(_mutex);
-        _session->pop_alerts(&alerts);
-    }
-    for (lt::alert* a : alerts) {
-        if (const lt::torrent_alert* alert =
-           dynamic_cast<lt::torrent_alert*>(a))
-        {
-            notify(alert->handle.id());
-        }
-    }
-    */
-    std::vector<lt::torrent_handle> handles;
-    {
-        std::lock_guard<std::mutex> guard(_mutex);
-        handles = _session.get_torrents();
-    }
-    for (const lt::torrent_handle& h : handles) {
-        notify(h.id());
-    }
-#endif // SYNC_USE_LIBTORRENT
-}
-
-TorrentClient::TorrentId TorrentClient::addTorrentFile(
-                                        [[ maybe_unused ]] const std::string& torrentFile,
-                                          [[maybe_unused]] const std::string& destination,
-                                              [[maybe_unused]] TorrentProgressCallback cb)
-{
-#ifdef SYNC_USE_LIBTORRENT
-    std::lock_guard<std::mutex> guard(_mutex);
-
-    if (!_isInitialized) {
-        LERROR("Torrent session not initialized when adding torrent");
-        return -1;
-    }
-
-    libtorrent::error_code ec;
-    libtorrent::add_torrent_params p;
-    p.save_path = destination;
-    p.ti = std::make_shared<libtorrent::torrent_info>(torrentFile, ec);
-    if (ec) {
-        LERROR(fmt::format("{}: {}", torrentFile, ec.message()));
-    }
-    const libtorrent::torrent_handle h = _session.add_torrent(p, ec);
-    if (ec) {
-        LERROR(fmt::format("{}: {}", torrentFile, ec.message()));
-    }
-
-    TorrentId id = h.id();
-    _torrents.emplace(id, Torrent{ id, h, std::move(cb) });
-    return id;
-#else // SYNC_USE_LIBTORRENT
-    throw TorrentError("SyncModule is compiled without libtorrent support");
-#endif // SYNC_USE_LIBTORRENT
-}
-
-TorrentClient::TorrentId TorrentClient::addMagnetLink(
-                                           [[maybe_unused]] const std::string& magnetLink,
-                                          [[maybe_unused]] const std::string& destination,
-                                              [[maybe_unused]] TorrentProgressCallback cb)
-{
-#ifdef SYNC_USE_LIBTORRENT
-    std::lock_guard<std::mutex> guard(_mutex);
-
-    // TODO: register callback!
-    if (!_isInitialized) {
-        LERROR("Torrent session not initialized when adding torrent");
-        return -1;
-    }
-    libtorrent::error_code ec;
-    libtorrent::add_torrent_params p = libtorrent::parse_magnet_uri(magnetLink, ec);
-    if (ec) {
-        LERROR(fmt::format("{}: {}", magnetLink, ec.message()));
-    }
-    p.save_path = destination;
-    p.storage_mode = libtorrent::storage_mode_allocate;
-    const libtorrent::torrent_handle h = _session.add_torrent(p, ec);
-    if (ec) {
-        LERROR(fmt::format("{}: {}", magnetLink, ec.message()));
-    }
-
-    TorrentId id = h.id();
-    _torrents.emplace(id, Torrent{ id, h, std::move(cb) });
-    return id;
-#else // SYNC_USE_LIBTORRENT
-    throw TorrentError("SyncModule is compiled without libtorrent support");
-#endif // SYNC_USE_LIBTORRENT
-}
-
-void TorrentClient::removeTorrent([[maybe_unused]] TorrentId id) {
-#ifdef SYNC_USE_LIBTORRENT
-    std::lock_guard<std::mutex> guard(_mutex);
-
-    const auto it = _torrents.find(id);
-    if (it == _torrents.end()) {
-        return;
-    }
-
-    const libtorrent::torrent_handle h = it->second.handle;
-    _session.remove_torrent(h);
-
-    _torrents.erase(it);
-#endif // SYNC_USE_LIBTORRENT
-}
-
-void TorrentClient::notify([[maybe_unused]] TorrentId id) {
-#ifdef SYNC_USE_LIBTORRENT
-    TorrentProgressCallback callback;
-    TorrentProgress progress;
-
-    {
-        std::lock_guard<std::mutex> guard(_mutex);
-
-        const auto it = _torrents.find(id);
-        if (it == _torrents.end()) {
-            return;
-        }
-
-        const libtorrent::torrent_handle h = it->second.handle;
-        const libtorrent::torrent_status status = h.status();
-
-        progress.finished = status.is_finished;
-        progress.nTotalBytesKnown = status.total_wanted > 0;
-        progress.nTotalBytes = status.total_wanted;
-        progress.nDownloadedBytes = status.total_wanted_done;
-
-        callback = it->second.callback;
-    }
-
-    callback(progress);
-#endif // SYNC_USE_LIBTORRENT
-}
-
-} // namespace openspace
diff --git a/modules/sync/torrentclient.h b/modules/sync/torrentclient.h
deleted file mode 100644
index e633e24fdf..0000000000
--- a/modules/sync/torrentclient.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2019                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
-
-#ifndef __OPENSPACE_MODULE_SYNC___TORRENTCLIENT___H__
-#define __OPENSPACE_MODULE_SYNC___TORRENTCLIENT___H__
-
-#ifdef SYNC_USE_LIBTORRENT
-
-#include <ghoul/misc/exception.h>
-#include <atomic>
-#include <condition_variable>
-#include <functional>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <unordered_map>
-
-#ifdef SYNC_USE_LIBTORRENT
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable : 4265)
-#pragma warning (disable : 4996)
-#endif // _MSC_VER
-
-// libtorrent defines a class with the name 'defer', which messes with out #define of the
-// defer macro in ghoul/misc/defer.h
-#undef defer
-
-#include <libtorrent/torrent_handle.hpp>
-#include <libtorrent/session.hpp>
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif // _MSC_VER
-
-
-#else // SYNC_USE_LIBTORRENT
-// Dummy definition to make TorrentClient compile, these is not actually used if
-// SYNC_USE_LIBTORRENT is FALSE
-namespace libtorrent {
-    using torrent_handle = void*;
-    using session = void*;
-} // namespace libtorrent
-
-#endif // SYNC_USE_LIBTORRENT
-
-namespace openspace {
-
-struct TorrentError : public ghoul::RuntimeError {
-    explicit TorrentError(std::string msg);
-};
-
-class TorrentClient {
-public:
-    struct TorrentProgress {
-        bool finished = false;
-        bool nTotalBytesKnown = false;
-        size_t nTotalBytes = 0;
-        size_t nDownloadedBytes = 0;
-    };
-
-    using TorrentProgressCallback = std::function<void(TorrentProgress)>;
-    using TorrentId = int32_t;
-
-    void initialize();
-    void deinitialize();
-
-    TorrentId addTorrentFile(const std::string& torrentFile,
-        const std::string& destination, TorrentProgressCallback cb);
-
-    TorrentId addMagnetLink(const std::string& magnetLink, const std::string& destination,
-        TorrentProgressCallback cb);
-
-    void removeTorrent(TorrentId id);
-
-private:
-    struct Torrent {
-        TorrentId id;
-        libtorrent::torrent_handle handle;
-        TorrentProgressCallback callback;
-    };
-
-    void notify(TorrentId id);
-    void pollAlerts();
-
-#ifdef SYNC_USE_LIBTORRENT
-    libtorrent::session _session;
-    bool _isInitialized = false;
-    std::atomic_bool _isActive = false;
-#endif // SYNC_USE_LIBTORRENT
-
-    std::thread _torrentThread;
-    std::condition_variable _abortNotifier;
-    std::mutex _abortMutex;
-    std::mutex _mutex;
-
-    std::unordered_map<TorrentId, Torrent> _torrents;
-};
-
-} // namespace openspace
-
-#endif // SYNC_USE_LIBTORRENT
-
-#endif // __OPENSPACE_MODULE_SYNC___TORRENTCLIENT___H__
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index ffe7bd5034..d6a0ae9963 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -426,7 +426,7 @@ RenderableTimeVaryingVolume::Timestep* RenderableTimeVaryingVolume::timestepFrom
 void RenderableTimeVaryingVolume::jumpToTimestep(int target) {
     Timestep* t = timestepFromIndex(target);
     if (t) {
-        global::timeManager.setTimeNextFrame(t->metadata.time);
+        global::timeManager.setTimeNextFrame(Time(t->metadata.time));
     }
 }
 
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index ea64003e33..e5942215ff 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -50,9 +50,6 @@ namespace {
     constexpr const char* KeyValueFunction = "ValueFunction";
     constexpr const char* KeyLowerDomainBound = "LowerDomainBound";
     constexpr const char* KeyUpperDomainBound = "UpperDomainBound";
-
-    constexpr const char* KeyMinValue = "MinValue";
-    constexpr const char* KeyMaxValue = "MaxValue";
 } // namespace
 
 namespace openspace {
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index 1bee321f4a..e3d01f1e8d 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -35,12 +35,6 @@ namespace {
         "All the envelopes used in the transfer function"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo HistogramInfo = {
-        "Histogram",
-        "Histogram",
-        "All the data"
-    };
-
     constexpr openspace::properties::Property::PropertyInfo DataUnitInfo = {
         "DataUnit",
         "DataUnit",
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index 1596a02cb0..3ef6bdce06 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -57,9 +57,9 @@ class BrowserInstance;
 class EventHandler {
 public:
     void initialize();
-    void setBrowser(const CefRefPtr<CefBrowser>& browser);
     void setBrowserInstance(BrowserInstance* browserInstance);
-    void detachBrowser();
+    void resetBrowserInstance();
+
     void touchPressCallback(const double x, const double y);
     void touchReleaseCallback(const double x, const double y);
     bool hasContentCallback(const double, const double);
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index 41b4a2eb0b..be83f58c71 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -30,6 +30,7 @@
 #include <modules/webbrowser/include/webrenderhandler.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/vector/vec2property.h>
+#include <openspace/properties/triggerproperty.h>
 
 #ifdef _MSC_VER
 #pragma warning (push)
@@ -62,9 +63,11 @@ class WebKeyboardHandler;
 class ScreenSpaceBrowser : public ScreenSpaceRenderable {
 public:
     ScreenSpaceBrowser(const ghoul::Dictionary& dictionary);
+    virtual ~ScreenSpaceBrowser() = default;
+
+    bool initializeGL() override;
+    bool deinitializeGL() override;
 
-    bool initialize() override;
-    bool deinitialize() override;
     void render() override;
     void update() override;
     bool isReady() const override;
@@ -72,14 +75,18 @@ public:
 private:
     class ScreenSpaceRenderHandler : public WebRenderHandler {
     public:
-        void draw();
-        void render();
+        void draw() override;
+        void render() override;
 
         void setTexture(GLuint t);
     };
 
+    void bindTexture() override;
+
     properties::StringProperty _url;
     properties::Vec2Property _dimensions;
+    properties::TriggerProperty _reload;
+
     CefRefPtr<ScreenSpaceRenderHandler> _renderHandler;
     CefRefPtr<WebKeyboardHandler> _keyboardHandler;
     std::unique_ptr<BrowserInstance> _browserInstance;
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index 8cd3c96b3f..1231178231 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -361,7 +361,7 @@ void EventHandler::setBrowserInstance(BrowserInstance* browserInstance) {
     _browserInstance = browserInstance;
 }
 
-void EventHandler::detachBrowser() {
+void EventHandler::resetBrowserInstance() {
     _browserInstance = nullptr;
 }
 
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index 21c4e622bf..1c69bb0b4c 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -35,7 +35,6 @@
 
 namespace {
     constexpr const char* KeyIdentifier = "Indentifier";
-    constexpr const char* KeyUrl = "URL";
     constexpr const char* _loggerCat = "ScreenSpaceBrowser";
 
     const openspace::properties::Property::PropertyInfo DimensionsInfo = {
@@ -44,11 +43,17 @@ namespace {
         "Set the dimensions of the web browser windows."
     };
     const openspace::properties::Property::PropertyInfo UrlInfo = {
+        "Url",
         "URL",
-        "url",
         "The URL to load"
     };
 
+    const openspace::properties::Property::PropertyInfo ReloadInfo = {
+        "Reload",
+        "Reload",
+        "Reload the web browser"
+    };
+
 } // namespace
 
 namespace openspace {
@@ -65,6 +70,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _url(UrlInfo)
     , _dimensions(DimensionsInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(3000.f))
+    , _reload(ReloadInfo)
 {
     if (dictionary.hasKey(KeyIdentifier)) {
         setIdentifier(dictionary.value<std::string>(KeyIdentifier));
@@ -74,17 +80,13 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
         ++id;
     }
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyUrl)) {
-        _url = dictionary.value<std::string>(KeyUrl);
+    if (dictionary.hasKeyAndValue<std::string>(UrlInfo.identifier)) {
+        _url = dictionary.value<std::string>(UrlInfo.identifier);
     }
 
     glm::vec2 windowDimensions = global::windowDelegate.currentSubwindowSize();
     _dimensions = windowDimensions;
 
-    _texture = std::make_unique<ghoul::opengl::Texture>(
-        glm::uvec3(windowDimensions, 1.0f)
-    );
-
     _renderHandler = new ScreenSpaceRenderHandler();
     _keyboardHandler = new WebKeyboardHandler();
     _browserInstance = std::make_unique<BrowserInstance>(
@@ -94,9 +96,11 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
 
     _url.onChange([this]() { _isUrlDirty = true; });
     _dimensions.onChange([this]() { _isDimensionsDirty = true; });
+    _reload.onChange([this]() { _browserInstance->reloadBrowser(); });
 
     addProperty(_url);
     addProperty(_dimensions);
+    addProperty(_reload);
 
     WebBrowserModule* webBrowser = global::moduleEngine.module<WebBrowserModule>();
     if (webBrowser) {
@@ -104,17 +108,24 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
     }
 }
 
-bool ScreenSpaceBrowser::initialize() {
-    _originalViewportSize = global::windowDelegate.currentWindowSize();
+bool ScreenSpaceBrowser::initializeGL() {
+    _texture = std::make_unique<ghoul::opengl::Texture>(
+         glm::uvec3(_dimensions.value(), 1.0f)
+    );
+
     _renderHandler->setTexture(*_texture);
 
     createShaders();
 
+    _browserInstance->initialize();
     _browserInstance->loadUrl(_url);
     return isReady();
 }
 
-bool ScreenSpaceBrowser::deinitialize() {
+bool ScreenSpaceBrowser::deinitializeGL() {
+    _renderHandler->setTexture(0);
+    _texture = nullptr;
+
     std::string urlString;
     _url.getStringValue(urlString);
     LDEBUG(fmt::format("Deinitializing ScreenSpaceBrowser: {}", urlString));
@@ -125,11 +136,12 @@ bool ScreenSpaceBrowser::deinitialize() {
     if (webBrowser) {
         webBrowser->removeBrowser(_browserInstance.get());
         _browserInstance.reset();
-        return true;
+    }
+    else {
+        LWARNING("Could not find WebBrowserModule");
     }
 
-    LWARNING("Could not find WebBrowserModule");
-    return false;
+    return ScreenSpaceRenderable::deinitializeGL();
 }
 
 void ScreenSpaceBrowser::render() {
@@ -146,6 +158,8 @@ void ScreenSpaceBrowser::render() {
 }
 
 void ScreenSpaceBrowser::update() {
+    _objectSize = _texture->dimensions();
+
     if (_isUrlDirty) {
         _browserInstance->loadUrl(_url);
         _isUrlDirty = false;
@@ -153,7 +167,6 @@ void ScreenSpaceBrowser::update() {
 
     if (_isDimensionsDirty) {
         _browserInstance->reshape(_dimensions.value());
-        _originalViewportSize = _dimensions.value();
         _isDimensionsDirty = false;
     }
 }
@@ -162,4 +175,8 @@ bool ScreenSpaceBrowser::isReady() const {
     return _shader && _texture;
 }
 
+void ScreenSpaceBrowser::bindTexture() {
+    _texture->bind();
+}
+
 } // namespace openspace
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index 6ccfaefaf5..dc49bd8fa9 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -41,10 +41,11 @@ void WebBrowserApp::OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,
 }
 
 void WebBrowserApp::OnBeforeCommandLineProcessing(const CefString&,
-                                                  CefRefPtr<CefCommandLine>)
+                                                  CefRefPtr<CefCommandLine> commandLine)
 {
 //    command_line->AppendSwitch("disable-gpu");
 //    command_line->AppendSwitch("disable-gpu-compositing");
+    commandLine->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");
 }
 
 } // namespace openspace
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index 555e88d721..204dea11c5 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -78,11 +78,13 @@ void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser>, CefRenderHandler::PaintEle
     // Copy the updated rectangle line by line.
     for (int y = lowerUpdatingRectBound.y; y < upperUpdatingRectBound.y; ++y) {
         int lineOffset = y * w + lowerUpdatingRectBound.x;
+        // Chromium stores image upside down compared to OpenGL, so we flip it:
+        int invLineOffset = (h - y - 1) * w + lowerUpdatingRectBound.x;
         int rectWidth = upperUpdatingRectBound.x - lowerUpdatingRectBound.x;
         std::copy(
             reinterpret_cast<const Pixel*>(buffer) + lineOffset,
             reinterpret_cast<const Pixel*>(buffer) + lineOffset + rectWidth,
-            _browserBuffer.data() + lineOffset
+            _browserBuffer.data() + invLineOffset
         );
     }
 
@@ -123,14 +125,15 @@ void WebRenderHandler::updateTexture() {
             GL_TEXTURE_2D,
             0,
             _lowerDirtyRectBound.x,
-            _lowerDirtyRectBound.y,
+            _browserBufferSize.y - _upperDirtyRectBound.y,
             _upperDirtyRectBound.x - _lowerDirtyRectBound.x,
             _upperDirtyRectBound.y - _lowerDirtyRectBound.y,
             GL_BGRA_EXT,
             GL_UNSIGNED_BYTE,
             reinterpret_cast<char*>(
                 _browserBuffer.data() +
-                _lowerDirtyRectBound.y * _browserBufferSize.x + _lowerDirtyRectBound.x
+                (_browserBufferSize.y - _upperDirtyRectBound.y) *
+                _browserBufferSize.x + _lowerDirtyRectBound.x
             )
         );
 
@@ -148,7 +151,7 @@ bool WebRenderHandler::hasContent(int x, int y) {
     if (_browserBuffer.empty()) {
         return false;
     }
-    int index = x + (_browserBufferSize.x * y);
+    int index = x + _browserBufferSize.x * (_browserBufferSize.y - y - 1);
     index = glm::clamp(index, 0, static_cast<int>(_browserBuffer.size() - 1));
     return _browserBuffer[index].a;
 }
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index c9181fa28c..bf11e5eb34 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -98,7 +98,7 @@ void WebBrowserModule::internalDeinitialize() {
         return;
     }
 
-    _eventHandler.detachBrowser();
+    _eventHandler.resetBrowserInstance();
 
     bool forceBrowserShutdown = true;
     for (BrowserInstance* browser : _browsers) {
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index 47f9ea7672..41a7f4c49f 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -27,6 +27,7 @@
 #include <modules/server/servermodule.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
+#include <openspace/documentation/documentationgenerator.h>
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
@@ -67,11 +68,34 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo
-        WebDirectoryInfo =
+        DirectoriesInfo =
     {
-        "WebDirectory",
-        "Web Directory",
-        "Directory from which to to serve static content",
+        "Directories",
+        "Directories",
+        "Directories from which to to serve static content, as a string list "
+        "with entries expressed as pairs, where every odd is the endpoint name and every "
+        "even is the directory.",
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo
+        DefaultEndpointInfo =
+    {
+        "DefaultEndpoint",
+        "Default Endpoint",
+        "The 'default' endpoint. "
+        "The server will redirect http requests from / to /<DefaultEndpoint>",
+    };
+
+
+    constexpr openspace::properties::Property::PropertyInfo
+        ServedDirectoriesInfo =
+    {
+        "ServedDirectories",
+        "ServedDirectories",
+        "Directories that are currently served. This value is set by the server process, "
+        "as a verification of the actually served directories. For example, an onChange "
+        "callback can be registered to this, to reload browsers when the server is ready."
+        "Manual changes to this property have no effect."
     };
 
     constexpr const char* DefaultAddress = "localhost";
@@ -82,16 +106,20 @@ namespace openspace {
 
 WebGuiModule::WebGuiModule()
     : OpenSpaceModule(WebGuiModule::Name)
-    , _enabled(ServerProcessEnabledInfo, false)
+    , _enabled(ServerProcessEnabledInfo, true)
     , _entryPoint(ServerProcessEntryPointInfo)
-    , _webDirectory(WebDirectoryInfo)
+    , _directories(DirectoriesInfo)
+    , _servedDirectories(ServedDirectoriesInfo)
+    , _defaultEndpoint(DefaultEndpointInfo)
     , _port(PortInfo, DefaultPort)
     , _address(AddressInfo, DefaultAddress)
     , _webSocketInterface(WebSocketInterfaceInfo, "")
 {
     addProperty(_enabled);
     addProperty(_entryPoint);
-    addProperty(_webDirectory);
+    addProperty(_directories);
+    addProperty(_servedDirectories);
+    addProperty(_defaultEndpoint);
     addProperty(_address);
     addProperty(_port);
 }
@@ -104,6 +132,30 @@ std::string  WebGuiModule::address() const {
     return _address;
 }
 
+WebGuiModule::CallbackHandle WebGuiModule::addEndpointChangeCallback(EndpointCallback cb)
+{
+    CallbackHandle handle = _nextCallbackHandle++;
+    _endpointChangeCallbacks.push_back({ handle, std::move(cb) });
+    return handle;
+}
+
+void WebGuiModule::removeEndpointChangeCallback(CallbackHandle handle) {
+    const auto it = std::find_if(
+        _endpointChangeCallbacks.begin(),
+        _endpointChangeCallbacks.end(),
+        [handle](const std::pair<CallbackHandle, EndpointCallback>& cb) {
+            return cb.first == handle;
+        }
+    );
+
+    ghoul_assert(
+        it != _endpointChangeCallbacks.end(),
+        "handle must be a valid callback handle"
+    );
+
+    _endpointChangeCallbacks.erase(it);
+}
+
 void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
     if (configuration.hasValue<int>(PortInfo.identifier)) {
         _port = configuration.value<int>(PortInfo.identifier);
@@ -119,7 +171,7 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
     }
 
     auto startOrStop = [this]() {
-        if (_enabled) {
+        if (_enabled && !_entryPoint.value().empty()) {
             startProcess();
         } else {
             stopProcess();
@@ -135,12 +187,46 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
 
     _enabled.onChange(startOrStop);
     _entryPoint.onChange(restartIfEnabled);
-    _webDirectory.onChange(restartIfEnabled);
+    _directories.onChange(restartIfEnabled);
+    _defaultEndpoint.onChange(restartIfEnabled);
+    _servedDirectories.onChange([this]() {
+        std::unordered_map<std::string, std::string> newEndpoints;
+        std::vector<std::string> list = _servedDirectories.value();
+        for (int i = 0; i < list.size() - 1; i += 2) {
+            newEndpoints[list[i]] = newEndpoints[list[i + 1]];
+        }
+        for (const std::pair<const std::string, std::string>& e : _endpoints) {
+            if (newEndpoints.find(e.first) == newEndpoints.end()) {
+                // This endpoint existed before but does not exist anymore.
+                notifyEndpointListeners(e.first, false);
+            }
+        }
+        for (const std::pair<const std::string, std::string>& e : newEndpoints) {
+            if (_endpoints.find(e.first) == _endpoints.end() ||
+                newEndpoints[e.first] != e.second)
+            {
+                // This endpoint exists now but did not exist before,
+                // or the directory has changed.
+                notifyEndpointListeners(e.first, true);
+            }
+        }
+        _endpoints = newEndpoints;
+    });
     _port.onChange(restartIfEnabled);
     startOrStop();
 }
 
+void WebGuiModule::notifyEndpointListeners(const std::string& endpoint, bool exists) {
+    using K = CallbackHandle;
+    using V = EndpointCallback;
+    for (const std::pair<const K, V>& it : _endpointChangeCallbacks) {
+        it.second(endpoint, exists);
+    }
+}
+
 void WebGuiModule::startProcess() {
+    _endpoints.clear();
+
     ServerModule* serverModule = global::moduleEngine.module<ServerModule>();
     const ServerInterface* serverInterface =
         serverModule->serverInterfaceByIdentifier(_webSocketInterface);
@@ -157,25 +243,55 @@ void WebGuiModule::startProcess() {
     const std::string nodePath = absPath("${MODULE_WEBGUI}/ext/nodejs/node");
 #endif
 
+    std::string formattedDirectories = "[";
+
+    std::vector<std::string> directories = _directories.value();
+    bool first = true;
+
+    for (const std::string& str : directories) {
+        if (!first) {
+            formattedDirectories += ",";
+        }
+        first = false;
+
+        // Escape twice: First json, and then bash (which needs same escape sequences)
+        formattedDirectories += "\\\"" + escapedJson(escapedJson(str)) + "\\\"";
+    }
+    formattedDirectories += "]";
+
+    const std::string defaultEndpoint = _defaultEndpoint.value().empty() ?
+        "" :
+        " --redirect \"" + _defaultEndpoint.value() + "\"";
+
     const std::string command = "\"" + nodePath + "\" "
         + "\"" + absPath(_entryPoint.value()) + "\"" +
-        " --directory \"" + absPath(_webDirectory.value()) + "\"" +
+        " --directories \"" + formattedDirectories + "\"" +
+        defaultEndpoint +
         " --http-port \"" + std::to_string(_port.value()) + "\" " +
         " --ws-address \"" + _address.value() + "\"" +
-        " --ws-port \"" + std::to_string(webSocketPort) + "\"" +
+        " --ws-port " + std::to_string(webSocketPort) +
         " --auto-close --local";
 
     _process = std::make_unique<ghoul::Process>(
         command,
-        _webDirectory.value(),
+        absPath("${BIN}"),
         [](const char* data, size_t n) {
             const std::string str(data, n);
             LDEBUG(fmt::format("Web GUI server output: {}", str));
+        },
+        [](const char* data, size_t n) {
+            const std::string str(data, n);
+            LERROR(fmt::format("Web GUI server error: {}", str));
         }
     );
 }
 
 void WebGuiModule::stopProcess() {
+    for (const auto& e : _endpoints) {
+        notifyEndpointListeners(e.first, false);
+    }
+    _endpoints.clear();
+
     if (_process) {
         _process->kill();
     }
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index 1f721b0193..7419d1b44e 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -28,19 +28,27 @@
 #include <openspace/util/openspacemodule.h>
 
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/stringlistproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <ghoul/misc/process.h>
 #include <memory>
+#include <vector>
+#include <unordered_map>
 
 namespace openspace {
 
 class WebGuiModule : public OpenSpaceModule {
 public:
+    using CallbackHandle = int;
+    using EndpointCallback = std::function<void(const std::string&, bool)>;
+
     static constexpr const char* Name = "WebGui";
     WebGuiModule();
     int port() const;
     std::string address() const;
+    CallbackHandle addEndpointChangeCallback(EndpointCallback cb);
+    void removeEndpointChangeCallback(CallbackHandle);
 
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
@@ -48,15 +56,23 @@ protected:
 private:
     void startProcess();
     void stopProcess();
+    void notifyEndpointListeners(const std::string& endpoint, bool exists);
 
     std::unique_ptr<ghoul::Process> _process;
     properties::BoolProperty _enabled;
     properties::StringProperty _entryPoint;
-    properties::StringProperty _webDirectory;
+    properties::StringListProperty _directories;
+    properties::StringListProperty _servedDirectories;
+    properties::StringProperty _defaultEndpoint;
+
+    std::unordered_map<std::string, std::string> _endpoints;
 
     properties::IntProperty _port;
     properties::StringProperty _address;
     properties::StringProperty _webSocketInterface;
+
+    std::vector<std::pair<CallbackHandle, EndpointCallback>> _endpointChangeCallbacks;
+    int _nextCallbackHandle = 0;
 };
 
 } // namespace openspace
diff --git a/recordings/apollo8 b/recordings/apollo8
deleted file mode 100644
index c9cafbdcaa..0000000000
Binary files a/recordings/apollo8 and /dev/null differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 223d5e4e8d..ddb716d4a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,11 +54,14 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/interaction/navigationhandler_lua.inl
   ${OPENSPACE_BASE_DIR}/src/interaction/mousecamerastates.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/orbitalnavigator.cpp
+  ${OPENSPACE_BASE_DIR}/src/interaction/scriptcamerastates.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/externinteraction.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording_lua.inl
   ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager_lua.inl
+  ${OPENSPACE_BASE_DIR}/src/interaction/websocketinputstate.cpp
+  ${OPENSPACE_BASE_DIR}/src/interaction/websocketcamerastates.cpp
   ${OPENSPACE_BASE_DIR}/src/mission/mission.cpp
   ${OPENSPACE_BASE_DIR}/src/mission/missionmanager.cpp
   ${OPENSPACE_BASE_DIR}/src/mission/missionmanager_lua.inl
@@ -202,7 +205,6 @@ if (APPLE)
     ${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm
   )
 endif ()
-
 set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/json.h
   ${OPENSPACE_BASE_DIR}/include/openspace/documentation/core_registration.h
@@ -236,9 +238,12 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/navigationhandler.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/orbitalnavigator.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/externinteraction.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/scriptcamerastates.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.inl
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/shortcutmanager.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketinputstate.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketcamerastates.h
   ${OPENSPACE_BASE_DIR}/include/openspace/mission/mission.h
   ${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h
   ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelconnection.h
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index 3d7e026b94..1d8de7effb 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -58,6 +58,9 @@ namespace openspace {
 void registerCoreClasses(documentation::DocumentationEngine& engine) {
     engine.addDocumentation(LogFactoryDocumentation());
     engine.addDocumentation(Mission::Documentation());
+    engine.addDocumentation(
+        interaction::NavigationHandler::NavigationState::Documentation()
+    );
     engine.addDocumentation(Renderable::Documentation());
     engine.addDocumentation(Rotation::Documentation());
     engine.addDocumentation(Scale::Documentation());
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index cfd5e5db9c..9f42f6d3c8 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -94,8 +94,6 @@ template <>
 std::string to_string(const openspace::documentation::TestResult::Offense::Reason& value)
 {
     switch (value) {
-        case openspace::documentation::TestResult::Offense::Reason::ExtraKey:
-            return "Extra key";
         case openspace::documentation::TestResult::Offense::Reason::MissingKey:
             return "Missing key";
         case openspace::documentation::TestResult::Offense::Reason::UnknownIdentifier:
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index e27a0f86df..eda76862d9 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -33,6 +33,7 @@
 #include <openspace/engine/windowdelegate.h>
 #include <openspace/interaction/keybindingmanager.h>
 #include <openspace/interaction/joystickinputstate.h>
+#include <openspace/interaction/websocketinputstate.h>
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/interaction/sessionrecording.h>
 #include <openspace/interaction/shortcutmanager.h>
@@ -154,6 +155,11 @@ interaction::JoystickInputStates& gJoystickInputStates() {
     return g;
 }
 
+interaction::WebsocketInputStates& gWebsocketInputStates() {
+    static interaction::WebsocketInputStates g;
+    return g;
+}
+
 interaction::KeybindingManager& gKeybindingManager() {
     static interaction::KeybindingManager g;
     return g;
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 52a268ca12..6c2042961e 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -708,6 +708,10 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
 
     bool loading = true;
     while (loading) {
+        if (_shouldAbortLoading) {
+            global::windowDelegate.terminate();
+            break;
+        }
         _loadingScreen->render();
         _assetManager->update();
 
@@ -719,10 +723,10 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
                 progressInfo.progress = (*it)->progress();
 
                 if ((*it)->nTotalBytesIsKnown()) {
-                    progressInfo.currentSize = static_cast<int>(
+                    progressInfo.currentSize = static_cast<uint64_t>(
                         (*it)->nSynchronizedBytes()
                     );
-                    progressInfo.totalSize = static_cast<int>(
+                    progressInfo.totalSize = static_cast<uint64_t>(
                         (*it)->nTotalBytes()
                     );
                 }
@@ -750,6 +754,10 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
             }
         }
     }
+    if (_shouldAbortLoading) {
+        _loadingScreen = nullptr;
+        return;
+    }
 
     _loadingScreen->setPhase(LoadingScreen::Phase::Initialization);
 
@@ -811,7 +819,6 @@ void OpenSpaceEngine::deinitialize() {
 
     ghoul::logging::LogManager::deinitialize();
 
-    ghoul::deinitialize();
     LTRACE("deinitialize(end)");
 
 
@@ -993,7 +1000,8 @@ void OpenSpaceEngine::preSynchronization() {
 
     global::syncEngine.preSynchronization(SyncEngine::IsMaster(master));
     if (master) {
-        double dt = global::windowDelegate.averageDeltaTime();
+
+        double dt = global::windowDelegate.deltaTime();
 
         if (global::sessionRecording.isSavingFramesDuringPlayback()) {
             dt = global::sessionRecording.fixedDeltaTimeDuringFrameOutput();
@@ -1013,8 +1021,6 @@ void OpenSpaceEngine::preSynchronization() {
         }
 
         global::renderEngine.updateScene();
-        //_navigationHandler->updateCamera(dt);
-
 
         if (_scene) {
             Camera* camera = _scene->camera();
@@ -1186,6 +1192,16 @@ void OpenSpaceEngine::postDraw() {
 }
 
 void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction action) {
+    if (_loadingScreen) {
+        // If the loading screen object exists, we are currently loading and want key
+        // presses to behave differently
+        if (key == Key::Escape) {
+            _shouldAbortLoading = true;
+        }
+
+        return;
+    }
+
     using F = std::function<bool (Key, KeyModifier, KeyAction)>;
     for (const F& func : global::callback::keyboard) {
         const bool isConsumed = func(key, mod, action);
diff --git a/src/interaction/inputstate.cpp b/src/interaction/inputstate.cpp
index 82e2c6e763..69a7bd17de 100644
--- a/src/interaction/inputstate.cpp
+++ b/src/interaction/inputstate.cpp
@@ -26,6 +26,7 @@
 
 #include <openspace/engine/globals.h>
 #include <openspace/interaction/joystickinputstate.h>
+#include <openspace/interaction/websocketinputstate.h>
 #include <ghoul/fmt.h>
 #include <algorithm>
 
@@ -91,10 +92,13 @@ bool InputState::isKeyPressed(std::pair<Key, KeyModifier> keyModPair) const {
 }
 
 bool InputState::isKeyPressed(Key key) const {
-    auto it = std::find_if(_keysDown.begin(), _keysDown.end(),
+    auto it = std::find_if(
+        _keysDown.begin(),
+        _keysDown.end(),
         [key](const std::pair<Key, KeyModifier>& keyModPair) {
-        return key == keyModPair.first;
-    });
+            return key == keyModPair.first;
+        }
+    );
     return it != _keysDown.end();
 }
 
@@ -111,4 +115,24 @@ bool InputState::joystickButton(int i) const {
     return global::joystickInputStates.button(i, JoystickAction::Press);
 }
 
+float InputState::websocketAxis(int i) const {
+    return global::websocketInputStates.axis(i);
+}
+
+bool InputState::websocketButton(int i) const {
+    return global::websocketInputStates.button(i, WebsocketAction::Press);
+}
+
+void InputState::resetWebsockets() {
+    using K = size_t;
+    using V = WebsocketInputState*;
+    for (const std::pair<const K, V>& p : global::websocketInputStates) {
+        p.second->isConnected = false;
+    }
+}
+
+bool InputState::hasWebsocketStates() const {
+    return !global::websocketInputStates.empty();
+}
+
 } // namespace openspace::interaction
diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp
index c9b765a545..387b9dcd8c 100644
--- a/src/interaction/navigationhandler.cpp
+++ b/src/interaction/navigationhandler.cpp
@@ -27,14 +27,17 @@
 #include <openspace/engine/globals.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scripting/lualibrary.h>
-#include <openspace/interaction/orbitalnavigator.h>
-#include <openspace/interaction/keyframenavigator.h>
-#include <openspace/interaction/inputstate.h>
 #include <openspace/network/parallelpeer.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/camera.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/query/query.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/dictionaryluaformatter.h>
+#include <glm/gtx/vector_angle.hpp>
 #include <fstream>
 
 namespace {
@@ -43,7 +46,11 @@ namespace {
     constexpr const char* KeyAnchor = "Anchor";
     constexpr const char* KeyAim = "Aim";
     constexpr const char* KeyPosition = "Position";
-    constexpr const char* KeyRotation = "Rotation";
+    constexpr const char* KeyUp = "Up";
+    constexpr const char* KeyYaw = "Yaw";
+    constexpr const char* KeyPitch = "Pitch";
+    constexpr const char* KeyReferenceFrame = "ReferenceFrame";
+    const double Epsilon = 1E-7;
 
     constexpr const openspace::properties::Property::PropertyInfo KeyFrameInfo = {
         "UseKeyFrameInteraction",
@@ -51,24 +58,101 @@ namespace {
         "If this is set to 'true' the entire interaction is based off key frames rather "
         "than using the mouse interaction."
     };
+
 } // namespace
 
 #include "navigationhandler_lua.inl"
 
 namespace openspace::interaction {
 
+
+ghoul::Dictionary
+openspace::interaction::NavigationHandler::NavigationState::dictionary() const
+{
+    ghoul::Dictionary cameraDict;
+    cameraDict.setValue(KeyPosition, position);
+    cameraDict.setValue(KeyAnchor, anchor);
+
+    if (anchor != referenceFrame) {
+        cameraDict.setValue(KeyReferenceFrame, referenceFrame);
+    }
+    if (!aim.empty()) {
+        cameraDict.setValue(KeyAim, aim);
+    }
+    if (up.has_value()) {
+        cameraDict.setValue(KeyUp, up.value());
+
+        if (std::abs(yaw) > Epsilon) {
+            cameraDict.setValue(KeyYaw, yaw);
+        }
+        if (std::abs(pitch) > Epsilon) {
+            cameraDict.setValue(KeyPitch, pitch);
+        }
+    }
+
+    return cameraDict;
+}
+
+openspace::interaction::NavigationHandler::NavigationState::NavigationState(
+                                                      const ghoul::Dictionary& dictionary)
+{
+    const bool hasAnchor = dictionary.hasValue<std::string>(KeyAnchor);
+    const bool hasPosition = dictionary.hasValue<glm::dvec3>(KeyPosition);
+    if (!hasAnchor || !hasPosition) {
+        throw ghoul::RuntimeError(
+            "Position and Anchor need to be defined for navigation dictionary."
+        );
+    }
+
+    anchor = dictionary.value<std::string>(KeyAnchor);
+    position = dictionary.value<glm::dvec3>(KeyPosition);
+
+    if (dictionary.hasValue<std::string>(KeyReferenceFrame)) {
+        referenceFrame = dictionary.value<std::string>(KeyReferenceFrame);
+    }
+    else {
+        referenceFrame = anchor;
+    }
+    if (dictionary.hasValue<std::string>(KeyAim)) {
+        aim = dictionary.value<std::string>(KeyAim);
+    }
+
+    if (dictionary.hasValue<glm::dvec3>(KeyUp)) {
+        up = dictionary.value<glm::dvec3>(KeyUp);
+
+        if (dictionary.hasValue<double>(KeyYaw)) {
+            yaw = dictionary.value<double>(KeyYaw);
+        }
+        if (dictionary.hasValue<double>(KeyPitch)) {
+            pitch = dictionary.value<double>(KeyPitch);
+        }
+    }
+}
+
+openspace::interaction::NavigationHandler::NavigationState::NavigationState(
+                                                                       std::string anchor,
+                                                                          std::string aim,
+                                                               std::string referenceFrame,
+                                                                      glm::dvec3 position,
+                                                             std::optional<glm::dvec3> up,
+                                                                               double yaw,
+                                                                             double pitch)
+    : anchor(std::move(anchor))
+    , aim(std::move(aim))
+    , referenceFrame(std::move(referenceFrame))
+    , position(std::move(position))
+    , up(std::move(up))
+    , yaw(yaw)
+    , pitch(pitch)
+{}
+
 NavigationHandler::NavigationHandler()
     : properties::PropertyOwner({ "NavigationHandler" })
     , _useKeyFrameInteraction(KeyFrameInfo, false)
 {
-
-    _inputState = std::make_unique<InputState>();
-    _orbitalNavigator = std::make_unique<OrbitalNavigator>();
-    _keyframeNavigator = std::make_unique<KeyframeNavigator>();
-
     // Add the properties
     addProperty(_useKeyFrameInteraction);
-    addPropertySubOwner(*_orbitalNavigator);
+    addPropertySubOwner(_orbitalNavigator);
 }
 
 NavigationHandler::~NavigationHandler() {} // NOLINT
@@ -90,19 +174,25 @@ void NavigationHandler::deinitialize() {
 
 void NavigationHandler::setCamera(Camera* camera) {
     _camera = camera;
-    _orbitalNavigator->setCamera(camera);
+    _orbitalNavigator.setCamera(camera);
 }
 
-const OrbitalNavigator& NavigationHandler::orbitalNavigator() const {
-    return *_orbitalNavigator;
+void NavigationHandler::setNavigationStateNextFrame(
+    NavigationHandler::NavigationState state)
+{
+    _pendingNavigationState = std::move(state);
 }
 
 OrbitalNavigator& NavigationHandler::orbitalNavigator() {
-    return *_orbitalNavigator;
+    return _orbitalNavigator;
 }
 
-KeyframeNavigator& NavigationHandler::keyframeNavigator() const {
-    return *_keyframeNavigator;
+const OrbitalNavigator& NavigationHandler::orbitalNavigator() const {
+    return _orbitalNavigator;
+}
+
+KeyframeNavigator& NavigationHandler::keyframeNavigator() {
+    return _keyframeNavigator;
 }
 
 bool NavigationHandler::isKeyFrameInteractionEnabled() const {
@@ -110,33 +200,93 @@ bool NavigationHandler::isKeyFrameInteractionEnabled() const {
 }
 
 float NavigationHandler::interpolationTime() const {
-    return _orbitalNavigator->retargetInterpolationTime();
+    return _orbitalNavigator.retargetInterpolationTime();
 }
 
 void NavigationHandler::setInterpolationTime(float durationInSeconds) {
-    _orbitalNavigator->setRetargetInterpolationTime(durationInSeconds);
+    _orbitalNavigator.setRetargetInterpolationTime(durationInSeconds);
 }
 
 void NavigationHandler::updateCamera(double deltaTime) {
-    ghoul_assert(_inputState != nullptr, "InputState must not be nullptr");
     ghoul_assert(_camera != nullptr, "Camera must not be nullptr");
 
-    if (_cameraUpdatedFromScript) {
-        _cameraUpdatedFromScript = false;
-    }
-    else {
-        if (!_playbackModeEnabled && _camera) {
-            if (_useKeyFrameInteraction) {
-                _keyframeNavigator->updateCamera(*_camera, _playbackModeEnabled);
-            }
-            else {
-                _orbitalNavigator->updateStatesFromInput(*_inputState, deltaTime);
-                _orbitalNavigator->updateCameraStateFromStates(deltaTime);
-            }
+    if (_pendingNavigationState.has_value()) {
+        applyNavigationState(_pendingNavigationState.value());
+        _orbitalNavigator.resetVelocities();
+        _pendingNavigationState.reset();
+    } else if (!_playbackModeEnabled && _camera) {
+        if (_useKeyFrameInteraction) {
+            _keyframeNavigator.updateCamera(*_camera, _playbackModeEnabled);
+        }
+        else {
+            _orbitalNavigator.updateStatesFromInput(_inputState, deltaTime);
+            _orbitalNavigator.updateCameraStateFromStates(deltaTime);
         }
     }
 }
 
+void NavigationHandler::applyNavigationState(const NavigationHandler::NavigationState& ns)
+{
+    const SceneGraphNode* referenceFrame = sceneGraphNode(ns.referenceFrame);
+    const SceneGraphNode* anchor = sceneGraphNode(ns.anchor);
+
+    if (!anchor) {
+        LERROR(fmt::format(
+            "Could not find scene graph node '{}' used as anchor.", ns.referenceFrame
+        ));
+        return;
+    }
+    if (!ns.aim.empty() && !sceneGraphNode(ns.aim)) {
+        LERROR(fmt::format(
+            "Could not find scene graph node '{}' used as aim.", ns.referenceFrame
+        ));
+        return;
+    }
+    if (!referenceFrame) {
+        LERROR(fmt::format(
+            "Could not find scene graph node '{}' used as reference frame.",
+            ns.referenceFrame)
+        );
+        return;
+    }
+
+    const glm::dvec3 anchorWorldPosition = anchor->worldPosition();
+    const glm::dmat3 referenceFrameTransform = referenceFrame->worldRotationMatrix();
+
+    _orbitalNavigator.setAnchorNode(ns.anchor);
+    _orbitalNavigator.setAimNode(ns.aim);
+
+    const SceneGraphNode* anchorNode = _orbitalNavigator.anchorNode();
+    const SceneGraphNode* aimNode = _orbitalNavigator.aimNode();
+    if (!aimNode) {
+        aimNode = anchorNode;
+    }
+
+    const glm::dvec3 cameraPositionWorld = anchorWorldPosition +
+        glm::dvec3(referenceFrameTransform * glm::dvec4(ns.position, 1.0));
+
+    glm::dvec3 up = ns.up.has_value() ?
+        glm::normalize(referenceFrameTransform * ns.up.value()) :
+        glm::dvec3(0.0, 1.0, 0.0);
+
+    // Construct vectors of a "neutral" view, i.e. when the aim is centered in view.
+    glm::dvec3 neutralView =
+        glm::normalize(aimNode->worldPosition() - cameraPositionWorld);
+
+    glm::dquat neutralCameraRotation = glm::inverse(glm::quat_cast(glm::lookAt(
+        glm::dvec3(0.0),
+        neutralView,
+        up
+    )));
+
+    glm::dquat pitchRotation = glm::angleAxis(ns.pitch, glm::dvec3(1.f, 0.f, 0.f));
+    glm::dquat yawRotation = glm::angleAxis(ns.yaw, glm::dvec3(0.f, -1.f, 0.f));
+
+    _camera->setPositionVec3(cameraPositionWorld);
+    _camera->setRotation(neutralCameraRotation * yawRotation * pitchRotation);
+    _orbitalNavigator.clearPreviousState();
+}
+
 void NavigationHandler::setEnableKeyFrameInteraction() {
     _useKeyFrameInteraction = true;
 }
@@ -150,8 +300,8 @@ void NavigationHandler::triggerPlaybackStart() {
 }
 
 void NavigationHandler::stopPlayback() {
-    _orbitalNavigator->resetVelocities();
-    _orbitalNavigator->resetNodeMovements();
+    _orbitalNavigator.resetVelocities();
+    _orbitalNavigator.resetNodeMovements();
     _playbackModeEnabled = false;
 }
 
@@ -160,131 +310,120 @@ Camera* NavigationHandler::camera() const {
 }
 
 const InputState& NavigationHandler::inputState() const {
-    return *_inputState;
+    return _inputState;
 }
 
 void NavigationHandler::mouseButtonCallback(MouseButton button, MouseAction action) {
-    _inputState->mouseButtonCallback(button, action);
+    _inputState.mouseButtonCallback(button, action);
 }
 
 void NavigationHandler::mousePositionCallback(double x, double y) {
-    _inputState->mousePositionCallback(x, y);
+    _inputState.mousePositionCallback(x, y);
 }
 
 void NavigationHandler::mouseScrollWheelCallback(double pos) {
-    _inputState->mouseScrollWheelCallback(pos);
+    _inputState.mouseScrollWheelCallback(pos);
 }
 
 void NavigationHandler::keyboardCallback(Key key, KeyModifier modifier, KeyAction action)
 {
-    _inputState->keyboardCallback(key, modifier, action);
+    _inputState.keyboardCallback(key, modifier, action);
 }
 
-void NavigationHandler::setCameraStateFromDictionary(const ghoul::Dictionary& cameraDict)
+NavigationHandler::NavigationState NavigationHandler::navigationState(
+                                               const SceneGraphNode& referenceFrame) const
 {
-    bool readSuccessful = true;
+    const SceneGraphNode* anchor = _orbitalNavigator.anchorNode();
+    const SceneGraphNode* aim = _orbitalNavigator.aimNode();
 
-    std::string anchor;
-    std::string aim;
-    glm::dvec3 cameraPosition;
-    glm::dvec4 cameraRotation; // Need to read the quaternion as a vector first.
-
-    readSuccessful &= cameraDict.getValue(KeyAnchor, anchor);
-    readSuccessful &= cameraDict.getValue(KeyPosition, cameraPosition);
-    readSuccessful &= cameraDict.getValue(KeyRotation, cameraRotation);
-    cameraDict.getValue(KeyAim, aim); // Aim is not required
-
-    if (!readSuccessful) {
-        throw ghoul::RuntimeError(
-            "Position, Rotation and Focus need to be defined for camera dictionary."
-        );
+    if (!aim) {
+        aim = anchor;
     }
 
-    // Set state
-    _orbitalNavigator->setAnchorNode(anchor);
-    _orbitalNavigator->setAimNode(aim);
+    const glm::dquat invNeutralRotation = glm::quat_cast(glm::lookAt(
+        glm::dvec3(0.0, 0.0, 0.0),
+        aim->worldPosition() - _camera->positionVec3(),
+        glm::normalize(_camera->lookUpVectorWorldSpace())
+    ));
 
-    _camera->setPositionVec3(cameraPosition);
-    _camera->setRotation(glm::dquat(
-        cameraRotation.x, cameraRotation.y, cameraRotation.z, cameraRotation.w));
+    glm::dquat localRotation = invNeutralRotation * _camera->rotationQuaternion();
+    glm::dvec3 eulerAngles = glm::eulerAngles(localRotation);
+
+    const double pitch = eulerAngles.x;
+    const double yaw = -eulerAngles.y;
+
+    // Need to compensate by redisual roll left in local rotation:
+    const glm::dquat unroll = glm::angleAxis(eulerAngles.z, glm::dvec3(0, 0, 1));
+    const glm::dvec3 neutralUp =
+         glm::inverse(invNeutralRotation) * unroll * _camera->lookUpVectorCameraSpace();
+
+    const glm::dmat3 invReferenceFrameTransform =
+        glm::inverse(referenceFrame.worldRotationMatrix());
+
+    const glm::dvec3 position = invReferenceFrameTransform *
+        (glm::dvec4(_camera->positionVec3() - anchor->worldPosition(), 1.0));
+
+    return NavigationState(
+        _orbitalNavigator.anchorNode()->identifier(),
+        _orbitalNavigator.aimNode() ?
+            _orbitalNavigator.aimNode()->identifier() : "",
+        referenceFrame.identifier(),
+        position,
+        invReferenceFrameTransform * neutralUp, yaw, pitch
+    );
 }
 
-ghoul::Dictionary NavigationHandler::cameraStateDictionary() {
-    glm::dvec3 cameraPosition;
-    glm::dquat quat;
-    glm::dvec4 cameraRotation;
+void NavigationHandler::saveNavigationState(const std::string& filepath,
+                                            const std::string& referenceFrameIdentifier)
+{
+    const SceneGraphNode* referenceFrame = _orbitalNavigator.followingNodeRotation() ?
+        _orbitalNavigator.anchorNode() :
+        sceneGraph()->root();
 
-    cameraPosition = _camera->positionVec3();
-    quat = _camera->rotationQuaternion();
-    cameraRotation = glm::dvec4(quat.w, quat.x, quat.y, quat.z);
-
-    ghoul::Dictionary cameraDict;
-    cameraDict.setValue(KeyPosition, cameraPosition);
-    cameraDict.setValue(KeyRotation, cameraRotation);
-    cameraDict.setValue(KeyAnchor, _orbitalNavigator->anchorNode()->identifier());
-    if (_orbitalNavigator->aimNode()) {
-        cameraDict.setValue(KeyAim, _orbitalNavigator->aimNode()->identifier());
-    }
-
-    return cameraDict;
-}
-
-void NavigationHandler::saveCameraStateToFile(const std::string& filepath) {
-    if (!filepath.empty()) {
-        std::string fullpath = absPath(filepath);
-        LINFO(fmt::format("Saving camera position: {}", filepath));
-
-        ghoul::Dictionary cameraDict = cameraStateDictionary();
-
-        // TODO(abock): Should get the camera state as a dictionary and save the
-        // dictionary to a file in form of a lua state and not use ofstreams here.
-
-        std::ofstream ofs(fullpath.c_str());
-
-        glm::dvec3 p = _camera->positionVec3();
-        glm::dquat q = _camera->rotationQuaternion();
-
-        ofs << "return {" << std::endl;
-        ofs << "    " << KeyAnchor << " = " << "\"" <<
-            _orbitalNavigator->anchorNode()->identifier() << "\""
-            << "," << std::endl;
-
-        if (_orbitalNavigator->aimNode()) {
-            ofs << "    " << KeyAim << " = " << "\"" <<
-                _orbitalNavigator->aimNode()->identifier() << "\""
-                << "," << std::endl;
+    if (!referenceFrameIdentifier.empty()) {
+        referenceFrame = sceneGraphNode(referenceFrameIdentifier);
+        if (!referenceFrame) {
+            LERROR(fmt::format(
+                "Could not find node '{}' to use as reference frame",
+                referenceFrameIdentifier
+            ));
+            return;
         }
+    }
 
-        ofs << "    " << KeyPosition << " = {"
-            << std::to_string(p.x) << ", "
-            << std::to_string(p.y) << ", "
-            << std::to_string(p.z) << "}," << std::endl;
-        ofs << "    " << KeyRotation << " = {"
-            << std::to_string(q.w) << ", "
-            << std::to_string(q.x) << ", "
-            << std::to_string(q.y) << ", "
-            << std::to_string(q.z) << "}," << std::endl;
-        ofs << "}"<< std::endl;
+    if (!filepath.empty()) {
+        std::string absolutePath = absPath(filepath);
+        LINFO(fmt::format("Saving camera position: {}", absolutePath));
 
+        ghoul::Dictionary cameraDict = navigationState(*referenceFrame).dictionary();
+        ghoul::DictionaryLuaFormatter formatter;
+
+        std::ofstream ofs(absolutePath.c_str());
+        ofs << "return " << formatter.format(cameraDict);
         ofs.close();
     }
 }
 
-void NavigationHandler::restoreCameraStateFromFile(const std::string& filepath) {
-    LINFO(fmt::format("Reading camera state from file: {}", filepath));
-    if (!FileSys.fileExists(filepath)) {
-        throw ghoul::FileNotFoundError(filepath, "CameraFilePath");
+void NavigationHandler::loadNavigationState(const std::string& filepath) {
+    const std::string absolutePath = absPath(filepath);
+    LINFO(fmt::format("Reading camera state from file: {}", absolutePath));
+
+    if (!FileSys.fileExists(absolutePath)) {
+        throw ghoul::FileNotFoundError(absolutePath, "NavigationState");
     }
 
-    ghoul::Dictionary cameraDict;
+    ghoul::Dictionary navigationStateDictionary;
     try {
-        ghoul::lua::loadDictionaryFromFile(filepath, cameraDict);
-        setCameraStateFromDictionary(cameraDict);
-        _cameraUpdatedFromScript = true;
+        ghoul::lua::loadDictionaryFromFile(absolutePath, navigationStateDictionary);
+        openspace::documentation::testSpecificationAndThrow(
+            NavigationState::Documentation(),
+            navigationStateDictionary,
+            "NavigationState"
+        );
+        setNavigationStateNextFrame(NavigationState(navigationStateDictionary));
     }
     catch (ghoul::RuntimeError& e) {
-        LWARNING("Unable to set camera position");
-        LWARNING(e.message);
+        LERROR(fmt::format("Unable to set camera position: {}", e.message));
     }
 }
 
@@ -293,7 +432,7 @@ void NavigationHandler::setJoystickAxisMapping(int axis,
                                             JoystickCameraStates::AxisInvert shouldInvert,
                                       JoystickCameraStates::AxisNormalize shouldNormalize)
 {
-    _orbitalNavigator->joystickStates().setAxisMapping(
+    _orbitalNavigator.joystickStates().setAxisMapping(
         axis,
         mapping,
         shouldInvert,
@@ -301,18 +440,32 @@ void NavigationHandler::setJoystickAxisMapping(int axis,
     );
 }
 
+void NavigationHandler::setWebsocketAxisMapping(int axis,
+                                               WebsocketCameraStates::AxisType mapping,
+                                           WebsocketCameraStates::AxisInvert shouldInvert,
+                                     WebsocketCameraStates::AxisNormalize shouldNormalize)
+{
+    _orbitalNavigator.websocketStates().setAxisMapping(
+        axis,
+        mapping,
+        shouldInvert,
+        shouldNormalize
+    );
+}
+
+
 JoystickCameraStates::AxisInformation
 NavigationHandler::joystickAxisMapping(int axis) const
 {
-    return _orbitalNavigator->joystickStates().axisMapping(axis);
+    return _orbitalNavigator.joystickStates().axisMapping(axis);
 }
 
 void NavigationHandler::setJoystickAxisDeadzone(int axis, float deadzone) {
-    _orbitalNavigator->joystickStates().setDeadzone(axis, deadzone);
+    _orbitalNavigator.joystickStates().setDeadzone(axis, deadzone);
 }
 
 float NavigationHandler::joystickAxisDeadzone(int axis) const {
-    return _orbitalNavigator->joystickStates().deadzone(axis);
+    return _orbitalNavigator.joystickStates().deadzone(axis);
 }
 
 void NavigationHandler::bindJoystickButtonCommand(int button, std::string command,
@@ -320,7 +473,7 @@ void NavigationHandler::bindJoystickButtonCommand(int button, std::string comman
                                          JoystickCameraStates::ButtonCommandRemote remote,
                                                   std::string documentation)
 {
-    _orbitalNavigator->joystickStates().bindButtonCommand(
+    _orbitalNavigator.joystickStates().bindButtonCommand(
         button,
         std::move(command),
         action,
@@ -330,11 +483,68 @@ void NavigationHandler::bindJoystickButtonCommand(int button, std::string comman
 }
 
 void NavigationHandler::clearJoystickButtonCommand(int button) {
-    _orbitalNavigator->joystickStates().clearButtonCommand(button);
+    _orbitalNavigator.joystickStates().clearButtonCommand(button);
 }
 
 std::vector<std::string> NavigationHandler::joystickButtonCommand(int button) const {
-    return _orbitalNavigator->joystickStates().buttonCommand(button);
+    return _orbitalNavigator.joystickStates().buttonCommand(button);
+}
+
+documentation::Documentation NavigationHandler::NavigationState::Documentation() {
+    using namespace documentation;
+
+    return {
+        "Navigation State",
+        "core_navigation_state",
+        {
+            {
+                KeyAnchor,
+                new StringVerifier,
+                Optional::No,
+                "The identifier of the anchor node."
+            },
+            {
+                KeyAim,
+                new StringVerifier,
+                Optional::Yes,
+                "The identifier of the aim node, if used."
+            },
+            {
+                KeyReferenceFrame,
+                new StringVerifier,
+                Optional::Yes,
+                "The identifier of the scene graph node to use as reference frame. "
+                "If not specified, this will be the same as the anchor."
+            },
+            {
+                KeyPosition,
+                new DoubleVector3Verifier,
+                Optional::No,
+                "The position of the camera relative to the anchor node, "
+                "expressed in meters in the specified reference frame."
+            },
+            {
+                KeyUp,
+                new DoubleVector3Verifier,
+                Optional::Yes,
+                "The up vector expressed in the coordinate system of the reference frame."
+            },
+            {
+                KeyYaw,
+                new DoubleVerifier,
+                Optional::Yes,
+                "The yaw angle in radians. "
+                "Positive angle means yawing camera to the right."
+            },
+            {
+                KeyPitch,
+                new DoubleVerifier,
+                Optional::Yes,
+                "The pitch angle in radians. "
+                "Positive angle means pitching camera upwards."
+            },
+        }
+    };
 }
 
 scripting::LuaLibrary NavigationHandler::luaLibrary() {
@@ -342,25 +552,33 @@ scripting::LuaLibrary NavigationHandler::luaLibrary() {
         "navigation",
         {
             {
-                "setCameraState",
-                &luascriptfunctions::setCameraState,
+                "setNavigationState",
+                &luascriptfunctions::setNavigationState,
                 {},
-                "object",
-                "Set the camera state"
+                "table",
+                "Set the navigation state. "
+                "The argument must be a valid Navigation State."
             },
             {
-                "saveCameraStateToFile",
-                &luascriptfunctions::saveCameraStateToFile,
+                "saveNavigationState",
+                &luascriptfunctions::saveNavigationState,
                 {},
-                "string",
-                "Save the current camera state to file"
+                "string, [string]",
+                "Save the current navigation state to a file with the path given by the "
+                "first argument. The optoinal second argument is the scene graph node to "
+                "use as reference frame. By default, the reference frame will picked "
+                "based on whether the orbital navigator is currently following the "
+                "anchor node rotation. If it is, the anchor will be chosen as reference "
+                "frame. If not, the reference frame will be set to the scene graph root."
             },
             {
-                "restoreCameraStateFromFile",
-                &luascriptfunctions::restoreCameraStateFromFile,
+                "loadNavigationState",
+                &luascriptfunctions::loadNavigationState,
                 {},
                 "string",
-                "Restore the camera state from file"
+                "Load a navigation state from file. The file should be a lua file "
+                "returning the navigation state as a table formatted as a "
+                "Navigation State, such as the output files of saveNavigationState."
             },
             {
                 "retargetAnchor",
@@ -431,6 +649,41 @@ scripting::LuaLibrary NavigationHandler::luaLibrary() {
                 "int",
                 "Returns the script that is currently bound to be executed when the "
                 "provided button is pressed"
+            },
+            {
+                "addGlobalRotation",
+                &luascriptfunctions::addGlobalRotation,
+                {},
+                "double, double",
+                "Directly adds to the global rotation of the camera"
+            },
+            {
+                "addLocalRotation",
+                &luascriptfunctions::addLocalRotation,
+                {},
+                "double, double",
+                "Directly adds to the local rotation of the camera"
+            },
+            {
+                "addTruckMovement",
+                &luascriptfunctions::addTruckMovement,
+                {},
+                "double, double",
+                "Directly adds to the truck movement of the camera"
+            },
+            {
+                "addLocalRoll",
+                &luascriptfunctions::addLocalRoll,
+                {},
+                "double, double",
+                "Directly adds to the local roll of the camera"
+            },
+            {
+                "addGlobalRoll",
+                &luascriptfunctions::addGlobalRoll,
+                {},
+                "double, double",
+                "Directly adds to the global roll of the camera"
             }
         }
     };
diff --git a/src/interaction/navigationhandler_lua.inl b/src/interaction/navigationhandler_lua.inl
index f2affeeea7..6ca1baec8a 100644
--- a/src/interaction/navigationhandler_lua.inl
+++ b/src/interaction/navigationhandler_lua.inl
@@ -23,11 +23,12 @@
  ****************************************************************************************/
 
 #include <numeric>
+#include <openspace/interaction/scriptcamerastates.h>
 
 namespace openspace::luascriptfunctions {
 
-int restoreCameraStateFromFile(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::restoreCameraStateFromFile");
+int loadNavigationState(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::loadNavigationState");
 
     const std::string& cameraStateFilePath = ghoul::lua::value<std::string>(
         L,
@@ -39,27 +40,32 @@ int restoreCameraStateFromFile(lua_State* L) {
         return ghoul::lua::luaError(L, "filepath string is empty");
     }
 
-    global::navigationHandler.restoreCameraStateFromFile(cameraStateFilePath);
+    global::navigationHandler.loadNavigationState(cameraStateFilePath);
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
     return 0;
 }
 
-int setCameraState(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::setCameraState");
+int setNavigationState(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::setNavigationState");
 
-    try {
-        ghoul::Dictionary dictionary;
-        ghoul::lua::luaDictionaryFromState(L, dictionary);
-        global::navigationHandler.setCameraStateFromDictionary(dictionary);
-    } catch (const ghoul::RuntimeError& e) {
+    ghoul::Dictionary navigationStateDictionary;
+    ghoul::lua::luaDictionaryFromState(L, navigationStateDictionary);
+
+    openspace::documentation::TestResult r = openspace::documentation::testSpecification(
+        interaction::NavigationHandler::NavigationState::Documentation(),
+        navigationStateDictionary
+    );
+
+    if (!r.success) {
         lua_settop(L, 0);
         return ghoul::lua::luaError(
-            L,
-            fmt::format("Could not set camera state: {}", e.what())
+            L, fmt::format("Could not set camera state: {}", ghoul::to_string(r))
         );
     }
 
+    global::navigationHandler.setNavigationStateNextFrame(navigationStateDictionary);
+
     // @CLEANUP:  When luaDictionaryFromState doesn't leak space anymore, remove the next
     //            line ---abock(2018-02-15)
     lua_settop(L, 0);
@@ -67,21 +73,27 @@ int setCameraState(lua_State* L) {
     return 0;
 }
 
-int saveCameraStateToFile(lua_State* L) {
-    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::saveCameraStateToFile");
-
-    const std::string& cameraStateFilePath = ghoul::lua::value<std::string>(
+int saveNavigationState(lua_State* L) {
+    const int n = ghoul::lua::checkArgumentsAndThrow(
         L,
-        1,
-        ghoul::lua::PopValue::Yes
+        { 1, 2 },
+        "lua::saveNavigationState"
     );
 
+    const std::string& cameraStateFilePath = ghoul::lua::value<std::string>(L, 1);
+
+    std::string referenceFrame = "";
+    if (n > 1) {
+        referenceFrame = ghoul::lua::value<std::string>(L, 2);
+    }
+
     if (cameraStateFilePath.empty()) {
         return ghoul::lua::luaError(L, "filepath string is empty");
     }
 
-    global::navigationHandler.saveCameraStateToFile(cameraStateFilePath);
+    global::navigationHandler.saveNavigationState(cameraStateFilePath, referenceFrame);
 
+    lua_settop(L, 0);
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
     return 0;
 }
@@ -236,4 +248,74 @@ int joystickButton(lua_State* L) {
     return 1;
 }
 
+int addGlobalRotation(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::addGlobalRotation");
+
+    const double v1 = ghoul::lua::value<double>(L, 1, ghoul::lua::PopValue::No);
+    const double v2 = ghoul::lua::value<double>(L, 2, ghoul::lua::PopValue::No);
+
+    global::navigationHandler.orbitalNavigator().scriptStates().addGlobalRotation(
+        glm::dvec2(v1, v2)
+    );
+
+    lua_settop(L, 0);
+    return 0;
+}
+
+int addLocalRotation(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::addLocalRotation");
+
+    const double v1 = ghoul::lua::value<double>(L, 1, ghoul::lua::PopValue::No);
+    const double v2 = ghoul::lua::value<double>(L, 2, ghoul::lua::PopValue::No);
+
+    global::navigationHandler.orbitalNavigator().scriptStates().addLocalRotation(
+        glm::dvec2(v1, v2)
+    );
+
+    lua_settop(L, 0);
+    return 0;
+}
+
+int addTruckMovement(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::addTruckMovement");
+
+    const double v1 = ghoul::lua::value<double>(L, 1, ghoul::lua::PopValue::No);
+    const double v2 = ghoul::lua::value<double>(L, 2, ghoul::lua::PopValue::No);
+
+    global::navigationHandler.orbitalNavigator().scriptStates().addTruckMovement(
+        glm::dvec2(v1, v2)
+    );
+
+    lua_settop(L, 0);
+    return 0;
+}
+
+int addLocalRoll(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::addLocalRoll");
+
+    const double v1 = ghoul::lua::value<double>(L, 1, ghoul::lua::PopValue::No);
+    const double v2 = ghoul::lua::value<double>(L, 2, ghoul::lua::PopValue::No);
+
+    global::navigationHandler.orbitalNavigator().scriptStates().addLocalRoll(
+        glm::dvec2(v1, v2)
+    );
+
+    lua_settop(L, 0);
+    return 0;
+}
+
+int addGlobalRoll(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::addGlobalRoll");
+
+    const double v1 = ghoul::lua::value<double>(L, 1, ghoul::lua::PopValue::No);
+    const double v2 = ghoul::lua::value<double>(L, 2, ghoul::lua::PopValue::No);
+
+    global::navigationHandler.orbitalNavigator().scriptStates().addGlobalRoll(
+        glm::dvec2(v1, v2)
+    );
+
+    lua_settop(L, 0);
+    return 0;
+}
+
 } // namespace openspace::luascriptfunctions
diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp
index a1ae0da15b..3acb05c013 100644
--- a/src/interaction/orbitalnavigator.cpp
+++ b/src/interaction/orbitalnavigator.cpp
@@ -109,6 +109,13 @@ namespace {
         "the sensitivity is the less impact a joystick motion will have."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo WebsocketSensitivityInfo = {
+        "WebsocketSensitivity",
+        "Websocket Sensitivity",
+        "Determines the sensitivity of the camera motion thorugh a websocket. The lower "
+        "the sensitivity is the less impact a webstick motion will have."
+    };
+
     constexpr openspace::properties::Property::PropertyInfo FrictionInfo = {
         "Friction",
         "Friction Factor",
@@ -205,6 +212,7 @@ OrbitalNavigator::OrbitalNavigator()
     , _minimumAllowedDistance(MinimumDistanceInfo, 10.0f, 0.0f, 10000.f)
     , _mouseSensitivity(MouseSensitivityInfo, 15.0f, 1.0f, 50.f)
     , _joystickSensitivity(JoystickSensitivityInfo, 10.0f, 1.0f, 50.f)
+    , _websocketSensitivity(WebsocketSensitivityInfo, 10.0f, 1.0f, 50.f)
     , _useAdaptiveStereoscopicDepth(UseAdaptiveStereoscopicDepthInfo, true)
     , _stereoscopicDepthOfFocusSurface(StereoscopicDepthOfFocusSurfaceInfo, 8, 0.25, 100)
     , _staticViewScaleExponent(StaticViewScaleExponentInfo, 0.f, -30, 10)
@@ -213,6 +221,7 @@ OrbitalNavigator::OrbitalNavigator()
     , _followRotationInterpolationTime(FollowRotationInterpTimeInfo, 1.0, 0.0, 10.0)
     , _mouseStates(_mouseSensitivity * 0.0001, 1 / (_friction.friction + 0.0000001))
     , _joystickStates(_joystickSensitivity * 0.1, 1 / (_friction.friction + 0.0000001))
+    , _websocketStates(_websocketSensitivity, 1 / (_friction.friction + 0.0000001))
 {
 
     _anchor.onChange([this]() {
@@ -290,26 +299,34 @@ OrbitalNavigator::OrbitalNavigator()
     _friction.roll.onChange([&]() {
         _mouseStates.setRotationalFriction(_friction.roll);
         _joystickStates.setRotationalFriction(_friction.roll);
+        _websocketStates.setRotationalFriction(_friction.roll);
     });
     _friction.rotational.onChange([&]() {
         _mouseStates.setHorizontalFriction(_friction.rotational);
         _joystickStates.setHorizontalFriction(_friction.rotational);
+        _websocketStates.setHorizontalFriction(_friction.rotational);
     });
     _friction.zoom.onChange([&]() {
         _mouseStates.setVerticalFriction(_friction.zoom);
         _joystickStates.setVerticalFriction(_friction.zoom);
+        _websocketStates.setVerticalFriction(_friction.zoom);
     });
     _friction.friction.onChange([&]() {
         _mouseStates.setVelocityScaleFactor(1 / (_friction.friction + 0.0000001));
         _joystickStates.setVelocityScaleFactor(1 / (_friction.friction + 0.0000001));
+        _websocketStates.setVelocityScaleFactor(1 / (_friction.friction + 0.0000001));
     });
 
     _mouseSensitivity.onChange([&]() {
         _mouseStates.setSensitivity(_mouseSensitivity * pow(10.0, -4));
     });
     _joystickSensitivity.onChange([&]() {
-        _joystickStates.setSensitivity(_joystickSensitivity * pow(10.0, -4));
+        _joystickStates.setSensitivity(_joystickSensitivity * 0.1);
     });
+    _websocketSensitivity.onChange([&]() {
+        _websocketStates.setSensitivity(_websocketSensitivity);
+    });
+
 
     addPropertySubOwner(_friction);
 
@@ -331,6 +348,7 @@ OrbitalNavigator::OrbitalNavigator()
 
     addProperty(_mouseSensitivity);
     addProperty(_joystickSensitivity);
+    addProperty(_websocketSensitivity);
 }
 
 glm::dvec3 OrbitalNavigator::anchorNodeToCameraVector() const {
@@ -348,6 +366,7 @@ glm::quat OrbitalNavigator::anchorNodeToCameraRotation() const {
 void OrbitalNavigator::resetVelocities() {
     _mouseStates.resetVelocities();
     _joystickStates.resetVelocities();
+    _scriptStates.resetVelocities();
 }
 
 void OrbitalNavigator::updateStatesFromInput(const InputState& inputState,
@@ -355,6 +374,8 @@ void OrbitalNavigator::updateStatesFromInput(const InputState& inputState,
 {
     _mouseStates.updateStateFromInput(inputState, deltaTime);
     _joystickStates.updateStateFromInput(inputState, deltaTime);
+    _websocketStates.updateStateFromInput(inputState, deltaTime);
+    _scriptStates.updateStateFromInput(inputState, deltaTime);
 }
 
 void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
@@ -365,20 +386,26 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
 
     const glm::dvec3 anchorPos = _anchorNode->worldPosition();
     const glm::dvec3 prevCameraPosition = _camera->positionVec3();
-    const glm::dvec3 anchorDisplacement = anchorPos - _previousAnchorNodePosition;
+    const glm::dvec3 anchorDisplacement = _previousAnchorNodePosition.has_value() ?
+        (anchorPos - _previousAnchorNodePosition.value()) :
+        glm::dvec3(0.0);
 
     CameraPose pose = {
         _camera->positionVec3() + anchorDisplacement,
         _camera->rotationQuaternion()
     };
 
-    if (_aimNode && _aimNode != _anchorNode) {
+    const bool hasPreviousPositions =
+        _previousAnchorNodePosition.has_value() &&
+        _previousAimNodePosition.has_value();
+
+    if (_aimNode && _aimNode != _anchorNode && hasPreviousPositions) {
         const glm::dvec3 aimPos = _aimNode->worldPosition();
         const glm::dvec3 cameraToAnchor =
-            _previousAnchorNodePosition - prevCameraPosition;
+            _previousAnchorNodePosition.value() - prevCameraPosition;
 
         Displacement anchorToAim = {
-            _previousAimNodePosition - _previousAnchorNodePosition,
+            _previousAimNodePosition.value() - _previousAnchorNodePosition.value(),
             aimPos - anchorPos
         };
 
@@ -413,8 +440,9 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
     glm::dquat anchorRotation =
         glm::quat_cast(_anchorNode->worldRotationMatrix());
 
-    glm::dquat anchorNodeRotationDiff =
-        _previousAnchorNodeRotation * glm::inverse(anchorRotation);
+    glm::dquat anchorNodeRotationDiff = _previousAnchorNodeRotation.has_value() ?
+        _previousAnchorNodeRotation.value() * glm::inverse(anchorRotation) :
+        glm::dquat();
 
     _previousAnchorNodeRotation = anchorRotation;
 
@@ -563,11 +591,17 @@ void OrbitalNavigator::setAnchorNode(const SceneGraphNode* anchorNode) {
     _anchorNode = anchorNode;
 
     if (_anchorNode) {
-        _previousAnchorNodePosition = _anchorNode->worldPosition();
-        _previousAnchorNodeRotation = glm::quat_cast(_anchorNode->worldRotationMatrix());
+        _previousAnchorNodePosition.reset();
+        _previousAnchorNodeRotation.reset();
     }
 }
 
+void OrbitalNavigator::clearPreviousState() {
+    _previousAnchorNodePosition.reset();
+    _previousAnchorNodeRotation.reset();
+    _previousAimNodePosition.reset();
+}
+
 void OrbitalNavigator::setAimNode(const SceneGraphNode* aimNode) {
     _retargetAimInterpolator.end();
     _aimNode = aimNode;
@@ -652,6 +686,9 @@ void OrbitalNavigator::setRetargetInterpolationTime(float durationInSeconds) {
 }
 
 bool OrbitalNavigator::followingNodeRotation() const {
+    if (_aimNode != nullptr && _aimNode != _anchorNode) {
+        return false;
+    }
     return _followRotationInterpolator.value() >= 1.0;
 }
 
@@ -855,7 +892,9 @@ glm::dquat OrbitalNavigator::roll(double deltaTime,
 {
     const glm::dquat mouseRollQuat = glm::angleAxis(
         _mouseStates.localRollVelocity().x * deltaTime +
-        _joystickStates.localRollVelocity().x * deltaTime,
+        _joystickStates.localRollVelocity().x * deltaTime +
+        _websocketStates.localRollVelocity().x * deltaTime +
+        _scriptStates.localRollVelocity().x * deltaTime,
         glm::dvec3(0.0, 0.0, 1.0)
     );
     return localCameraRotation * mouseRollQuat;
@@ -876,8 +915,20 @@ glm::dquat OrbitalNavigator::rotateLocally(double deltaTime,
         0.0
     ) * deltaTime);
 
+    const glm::dquat websocketRotationDiff = glm::dquat(glm::dvec3(
+        _websocketStates.localRotationVelocity().y,
+        _websocketStates.localRotationVelocity().x,
+        0.0
+    ) * deltaTime);
 
-    return localCameraRotation * joystickRotationDiff * mouseRotationDiff;
+    const glm::dquat scriptRotationDiff = glm::dquat(glm::dvec3(
+        _scriptStates.localRotationVelocity().y,
+        _scriptStates.localRotationVelocity().x,
+        0.0
+    ) * deltaTime);
+
+    return localCameraRotation * joystickRotationDiff * mouseRotationDiff *
+           websocketRotationDiff * scriptRotationDiff;
 }
 glm::dquat OrbitalNavigator::interpolateLocalRotation(double deltaTime,
     const glm::dquat& localCameraRotation)
@@ -1045,19 +1096,31 @@ glm::dvec3 OrbitalNavigator::translateHorizontally(double deltaTime,
     const glm::dquat mouseRotationDiffCamSpace = glm::dquat(glm::dvec3(
         -_mouseStates.globalRotationVelocity().y * deltaTime,
         -_mouseStates.globalRotationVelocity().x * deltaTime,
-        0) * speedScale);
+        0.0) * speedScale);
 
     const glm::dquat joystickRotationDiffCamSpace = glm::dquat(glm::dvec3(
         -_joystickStates.globalRotationVelocity().y * deltaTime,
         -_joystickStates.globalRotationVelocity().x * deltaTime,
+        0.0) * speedScale
+    );
+
+    const glm::dquat scriptRotationDiffCamSpace = glm::dquat(glm::dvec3(
+        -_scriptStates.globalRotationVelocity().y * deltaTime,
+        -_scriptStates.globalRotationVelocity().x * deltaTime,
+        0.0) * speedScale
+    );
+
+    const glm::dquat websocketRotationDiffCamSpace = glm::dquat(glm::dvec3(
+        -_websocketStates.globalRotationVelocity().y * deltaTime,
+        -_websocketStates.globalRotationVelocity().x * deltaTime,
         0) * speedScale
     );
 
     // Transform to world space
     const glm::dquat rotationDiffWorldSpace = globalCameraRotation *
-                                        joystickRotationDiffCamSpace *
-                                        mouseRotationDiffCamSpace *
-                                        glm::inverse(globalCameraRotation);
+        joystickRotationDiffCamSpace * mouseRotationDiffCamSpace *
+        websocketRotationDiffCamSpace * scriptRotationDiffCamSpace *
+        glm::inverse(globalCameraRotation);
 
     // Rotate and find the difference vector
     const glm::dvec3 rotationDiffVec3 =
@@ -1118,7 +1181,9 @@ glm::dvec3 OrbitalNavigator::translateVertically(double deltaTime,
     const glm::dvec3 actualSurfaceToCamera = posDiff - centerToActualSurface;
 
     const double totalVelocity = _joystickStates.truckMovementVelocity().y +
-                                 _mouseStates.truckMovementVelocity().y;
+                                 _mouseStates.truckMovementVelocity().y +
+                                 _websocketStates.truckMovementVelocity().y +
+                                 _scriptStates.truckMovementVelocity().y;
 
     return cameraPosition - actualSurfaceToCamera * totalVelocity * deltaTime;
 }
@@ -1137,7 +1202,9 @@ glm::dquat OrbitalNavigator::rotateHorizontally(double deltaTime,
 
     const glm::dquat mouseCameraRollRotation = glm::angleAxis(
         _mouseStates.globalRollVelocity().x * deltaTime +
-        _joystickStates.globalRollVelocity().x * deltaTime,
+        _joystickStates.globalRollVelocity().x * deltaTime +
+        _websocketStates.globalRollVelocity().x * deltaTime +
+        _scriptStates.globalRollVelocity().x * deltaTime,
         directionFromSurfaceToCamera
     );
     return mouseCameraRollRotation * globalCameraRotation;
@@ -1219,4 +1286,24 @@ JoystickCameraStates& OrbitalNavigator::joystickStates() {
     return _joystickStates;
 }
 
+const JoystickCameraStates& OrbitalNavigator::joystickStates() const {
+    return _joystickStates;
+}
+
+WebsocketCameraStates& OrbitalNavigator::websocketStates() {
+    return _websocketStates;
+}
+
+const WebsocketCameraStates& OrbitalNavigator::websocketStates() const {
+    return _websocketStates;
+}
+
+ScriptCameraStates& OrbitalNavigator::scriptStates() {
+    return _scriptStates;
+}
+
+const ScriptCameraStates& OrbitalNavigator::scriptStates() const {
+    return _scriptStates;
+}
+
 } // namespace openspace::interaction
diff --git a/src/interaction/scriptcamerastates.cpp b/src/interaction/scriptcamerastates.cpp
new file mode 100644
index 0000000000..ef018796d1
--- /dev/null
+++ b/src/interaction/scriptcamerastates.cpp
@@ -0,0 +1,118 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/interaction/scriptcamerastates.h>
+
+#include <openspace/interaction/inputstate.h>
+
+namespace {
+    const double SENSITIVITY_ADJUSTMENT_INCREASE = 8.0;
+    const double SENSITIVITY_ADJUSTMENT_DECREASE = 0.5;
+}
+
+namespace openspace::interaction {
+
+ScriptCameraStates::ScriptCameraStates() : CameraInteractionStates(1.0, 1.0) {}
+
+void ScriptCameraStates::updateStateFromInput(const InputState& inputState,
+                                             double deltaTime)
+{
+    if (_localRotation != glm::dvec2(0.0)) {
+        _localRotationState.velocity.set(
+            _localRotation * _sensitivity,
+            deltaTime
+        );
+        _localRotation = glm::dvec2(0.0);
+    }
+    else {
+        _localRotationState.velocity.decelerate(deltaTime);
+    }
+
+    if (_globalRotation != glm::dvec2(0.0)) {
+        _globalRotationState.velocity.set(
+            _globalRotation * _sensitivity,
+            deltaTime
+        );
+        _globalRotation = glm::dvec2(0.0);
+    }
+    else {
+        _globalRotationState.velocity.decelerate(deltaTime);
+    }
+
+    if (_truckMovement != glm::dvec2(0.0)) {
+        _truckMovementState.velocity.set(
+            _truckMovement * _sensitivity,
+            deltaTime
+        );
+        _truckMovement = glm::dvec2(0.0);
+    }
+    else {
+        _truckMovementState.velocity.decelerate(deltaTime);
+    }
+
+    if (_localRoll != glm::dvec2(0.0)) {
+        _localRollState.velocity.set(
+            _localRoll * _sensitivity,
+            deltaTime
+        );
+        _localRoll = glm::dvec2(0.0);
+    }
+    else {
+        _localRollState.velocity.decelerate(deltaTime);
+    }
+
+    if (_globalRoll != glm::dvec2(0.0)) {
+        _globalRollState.velocity.set(
+            _globalRoll * _sensitivity,
+            deltaTime
+        );
+        _globalRoll = glm::dvec2(0.0);
+    }
+    else {
+        _globalRollState.velocity.decelerate(deltaTime);
+    }
+}
+
+void ScriptCameraStates::addLocalRotation(const glm::dvec2& delta) {
+    _localRotation += delta;
+}
+
+void ScriptCameraStates::addGlobalRotation(const glm::dvec2& delta) {
+    _globalRotation += delta;
+}
+
+void ScriptCameraStates::addTruckMovement(const glm::dvec2& delta) {
+    _truckMovement += delta;
+}
+
+void ScriptCameraStates::addLocalRoll(const glm::dvec2& delta) {
+    _localRoll += delta;
+}
+
+void ScriptCameraStates::addGlobalRoll(const glm::dvec2& delta) {
+    _globalRoll += delta;
+}
+
+
+} // namespace openspace::interaction
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 89b3707e89..b46206e6d7 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -848,7 +848,7 @@ void SessionRecording::playbackCamera() {
         pbFrame.followFocusNodeRotation = (rotationFollowing == "F");
     }
     if (_setSimulationTimeWithNextCameraKeyframe) {
-        global::timeManager.setTimeNextFrame(timeSim);
+        global::timeManager.setTimeNextFrame(Time(timeSim));
         _setSimulationTimeWithNextCameraKeyframe = false;
         _saveRenderingCurrentRecordedTime = timeRec;
     }
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index de51a9fee7..f1762ced24 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -31,6 +31,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/timemanager.h>
+#include <ghoul/fmt.h>
 
 using namespace openspace;
 
@@ -44,8 +45,8 @@ using namespace openspace;
 #import <Foundation/Foundation.h>
 
 static NSString* pauseResultId = @"com.openspaceproject.pause_resume";
-static NSString* showFullGuiId = @"com.openspaceproject.show_full_gui";
-static NSString* showSimpleGuiId = @"com.openspaceproject.show_simple_gui";
+static NSString* hideGuiId = @"com.openspaceproject.hide_gui";
+static NSString* hideOnScreenTextId = @"com.openspaceproject.hide_onscreen";
 NSArray* focusIdentifiers;
 
 
@@ -55,8 +56,8 @@ NSArray* focusIdentifiers;
         makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier;
     - (void)pauseResumeButtonAction:(id)sender;
     - (void)focusObjectAction:(id)sender;
-    - (void)fullGuiButtonAction:(id)sender;
-    - (void)simpleGuiButtonAction:(id)sender;
+    - (void)hideTextAction:(id)sender;
+    - (void)hideGuiAction:(id)sender;
 @end
 
 @implementation TouchBarDelegate
@@ -66,7 +67,7 @@ NSArray* focusIdentifiers;
 
         touchBar.customizationIdentifier = @"com.openspaceproject.main_touch_bar";
 
-        NSArray* objs = [@[showSimpleGuiId, showFullGuiId,
+        NSArray* objs = [@[hideGuiId, hideOnScreenTextId,
             NSTouchBarItemIdentifierFixedSpaceSmall, pauseResultId,
             NSTouchBarItemIdentifierFlexibleSpace]
             arrayByAddingObjectsFromArray: focusIdentifiers];
@@ -85,8 +86,6 @@ NSArray* focusIdentifiers;
     - (NSTouchBarItem *)touchBar:(NSTouchBar *)touchBar
                         makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
     {
-        // @TODO(abock):  Potential memory leak here by returning an alloc?
-
         // Remove the unused variable warning
         (void)touchBar;
 
@@ -112,38 +111,38 @@ NSArray* focusIdentifiers;
             return [touchBarItem autorelease];
         }
 
-        if ([identifier isEqualToString:showFullGuiId]) {
+        if ([identifier isEqualToString:hideOnScreenTextId]) {
             NSButton* button = [NSButton 
-                buttonWithTitle:@"Full GUI"
-                target:self action:@selector(fullGuiButtonAction:)
+                buttonWithTitle:@"Toggle Text"
+                target:self action:@selector(hideTextAction:)
             ];
 
             NSCustomTouchBarItem* touchBarItem = [
                 [NSCustomTouchBarItem alloc]
-                initWithIdentifier:showFullGuiId
+                initWithIdentifier:hideOnScreenTextId
             ];
             touchBarItem.view = button;
             touchBarItem.customizationLabel = NSLocalizedString(
-                @"Toggles the full GUI",
+                @"Toogles on-screen text",
                 @""
             );
 
             return [touchBarItem autorelease];
         }
 
-        if ([identifier isEqualToString:showSimpleGuiId]) {
+        if ([identifier isEqualToString:hideGuiId]) {
             NSButton* button = [NSButton
-                buttonWithTitle:@"Simple GUI"
-                target:self action:@selector(simpleGuiButtonAction:)
+                buttonWithTitle:@"Toggle GUI"
+                target:self action:@selector(hideGuiAction:)
             ];
 
             NSCustomTouchBarItem* touchBarItem = [
                 [NSCustomTouchBarItem alloc]
-                initWithIdentifier:showSimpleGuiId
+                initWithIdentifier:hideGuiId
             ];
             touchBarItem.view = button;
             touchBarItem.customizationLabel = NSLocalizedString(
-                @"Toggles the simple GUI",
+                @"Toggles the main GUI",
                 @""
             );
 
@@ -188,63 +187,40 @@ NSArray* focusIdentifiers;
 
         NSString* title = [button title];
 
+        std::string str = fmt::format(
+            "openspace.setPropertyValueSingle('{}', '{}');\
+             openspace.setPropertyValueSingle('{}', '');\
+             openspace.setPropertyValueSingle('{}', '');",
+             "NavigationHandler.OrbitalNavigator.Anchor", std::string([title UTF8String]),
+             "NavigationHandler.OrbitalNavigator.Aim",
+             "NavigationHandler.OrbitalNavigator.RetargetAnchor"
+        );
         global::scriptEngine.queueScript(
-            "openspace.setPropertyValue('NavigationHandler.Origin', '" +
-            std::string([title UTF8String]) + "');",
+            str,
             scripting::ScriptEngine::RemoteScripting::Yes
         );
     }
 
-    - (void)fullGuiButtonAction:(id)sender {
+    - (void)hideTextAction:(id)sender {
         // Remove unused variable warning
         (void)sender;
+
         global::scriptEngine.queueScript(
-            "local b = openspace.getPropertyValue(\
-                'Modules.ImGUI.Main.Enabled'\
-            );\
-            openspace.setPropertyValueSingle(\
-                'Modules.ImGUI.Main.Enabled',\
-                not b\
-            );\
-            openspace.setPropertyValueSingle(\
-                'Modules.ImGUI.Main.IsHidden',\
-                b\
-            );",
+            "local isEnabled = openspace.getPropertyValue('Dashboard.IsEnabled');\
+             openspace.setPropertyValueSingle('Dashboard.IsEnabled', not isEnabled);\
+             openspace.setPropertyValueSingle('RenderEngine.ShowLog', not isEnabled);\
+             openspace.setPropertyValueSingle('RenderEngine.ShowVersion', not isEnabled);\
+             openspace.setPropertyValueSingle('RenderEngine.ShowCamera', not isEnabled)",
             scripting::ScriptEngine::RemoteScripting::No
         );
     }
 
-    - (void)simpleGuiButtonAction:(id)sender {
+    - (void)hideGuiAction:(id)sender {
         // Remove unused variable warning
         (void)sender;
         global::scriptEngine.queueScript(
-"local b = openspace.getPropertyValue('Modules.ImGUI.Main.FeaturedProperties.Enabled');\n\
-local c = openspace.getPropertyValue('Modules.ImGUI.Main.IsHidden');\n\
-openspace.setPropertyValue('Modules.ImGUI.*.Enabled', false);\n\
-if b and c then\n\
-    -- This can happen if the main properties window is enabled, the main gui\n\
-    -- is enabled and then closed again. So the main properties window is\n\
-    -- enabled, but also all windows are hidden\n\
-    openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', false);\n\
-    openspace.setPropertyValueSingle(\n\
-        'Modules.ImGUI.Main.FeaturedProperties.Enabled',\n\
-        true\n\
-    );\n\
-    openspace.setPropertyValueSingle(\n\
-        'Modules.ImGUI.Main.SpaceTime.Enabled',\n\
-        true\n\
-    );\n\
-else\n\
-    openspace.setPropertyValueSingle(\n\
-        'Modules.ImGUI.Main.FeaturedProperties.Enabled',\n\
-        not b\n\
-    );\n\
-    openspace.setPropertyValueSingle(\n\
-        'Modules.ImGUI.Main.SpaceTime.Enabled',\n\
-        not b\n\
-    );\n\
-    openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', b);\n\
-end",
+            "local isEnabled = openspace.getPropertyValue('Modules.CefWebGui.Visible');\
+            openspace.setPropertyValueSingle('Modules.CefWebGui.Visible', not isEnabled);",
             scripting::ScriptEngine::RemoteScripting::No
         );
     }
@@ -266,19 +242,18 @@ void showTouchbar() {
         [NSApplication sharedApplication].automaticCustomizeTouchBarMenuItemEnabled = YES;
     }
     
-    std::vector<SceneGraphNode*> nodes =
-        global::renderEngine.scene()->allSceneGraphNodes();
+    std::vector<SceneGraphNode*> ns = global::renderEngine.scene()->allSceneGraphNodes();
 
     std::sort(
-        nodes.begin(),
-        nodes.end(),
+        ns.begin(),
+        ns.end(),
         [](SceneGraphNode* lhs, SceneGraphNode* rhs) {
             return lhs->guiName() < rhs->guiName();
         }
     );
 
     NSMutableArray* ids = [[NSMutableArray alloc] init];
-    for (SceneGraphNode* n : nodes) {
+    for (SceneGraphNode* n : ns) {
         const std::vector<std::string>& tags = n->tags();
         auto it = std::find(tags.begin(), tags.end(), "GUI.Interesting");
         if (it != tags.end()) {
diff --git a/src/interaction/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp
new file mode 100644
index 0000000000..9c6b27a223
--- /dev/null
+++ b/src/interaction/websocketcamerastates.cpp
@@ -0,0 +1,260 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/interaction/websocketcamerastates.h>
+
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/interaction/inputstate.h>
+#include <openspace/scripting/scriptengine.h>
+#include <ghoul/misc/stringconversion.h>
+#include <utility>
+
+namespace openspace::interaction {
+
+WebsocketCameraStates::WebsocketCameraStates(double sensitivity, double velocityScaleFactor)
+    : CameraInteractionStates(sensitivity, velocityScaleFactor)
+{}
+
+void WebsocketCameraStates::updateStateFromInput(const InputState& inputState,
+                                                double deltaTime)
+{
+    std::pair<bool, glm::dvec2> globalRotation = { false, glm::dvec2(0.0) };
+    std::pair<bool, double> zoom = { false, 0.0 };
+    std::pair<bool, glm::dvec2> localRoll = { false, glm::dvec2(0.0) };
+    std::pair<bool, glm::dvec2> globalRoll = { false, glm::dvec2(0.0) };
+    std::pair<bool, glm::dvec2> localRotation = { false, glm::dvec2(0.0) };
+
+    if (inputState.hasWebsocketStates()) {
+        for (int i = 0; i < WebsocketInputState::MaxAxes; ++i) {
+            AxisInformation t = _axisMapping[i];
+            if (t.type == AxisType::None) {
+                continue;
+            }
+
+            float value = inputState.websocketAxis(i);
+            bool hasValue = abs(value) > t.deadzone;
+
+            if (!hasValue) {
+                value = 0.f;
+            }
+
+            if (t.normalize) {
+                value = (value + 1.f) / 2.f;
+            }
+
+            if (t.invert) {
+                value *= -1.f;
+            }
+
+            value = static_cast<float>(value * _sensitivity);
+
+            switch (t.type) {
+                case AxisType::None:
+                    break;
+                case AxisType::OrbitX:
+                    globalRotation.first = hasValue || globalRotation.first;
+                    globalRotation.second.x = value;
+                    break;
+                case AxisType::OrbitY:
+                    globalRotation.first = hasValue || globalRotation.first;
+                    globalRotation.second.y = value;
+                    break;
+                case AxisType::ZoomIn:
+                    zoom.first = hasValue || zoom.first;
+                    zoom.second += value;
+                    break;
+                case AxisType::ZoomOut:
+                    zoom.first = hasValue || zoom.first;
+                    zoom.second -= value;
+                    break;
+                case AxisType::LocalRollX:
+                    localRoll.first = hasValue || localRoll.first;
+                    localRoll.second.x = value;
+                    break;
+                case AxisType::LocalRollY:
+                    localRoll.first = hasValue || localRoll.first;
+                    localRoll.second.y = value;
+                    break;
+                case AxisType::GlobalRollX:
+                    globalRoll.first = hasValue || globalRoll.first;
+                    globalRoll.second.x = value;
+                    break;
+                case AxisType::GlobalRollY:
+                    globalRoll.first = hasValue || globalRoll.first;
+                    globalRoll.second.y = value;
+                    break;
+                case AxisType::PanX:
+                    localRotation.first = hasValue || localRotation.first;
+                    localRotation.second.x = value;
+                    break;
+                case AxisType::PanY:
+                    localRotation.first = hasValue || localRotation.first;
+                    localRotation.second.y = value;
+                    break;
+            }
+        }
+    }
+    
+    if (globalRotation.first) {
+        _globalRotationState.velocity.set(globalRotation.second, deltaTime);
+    }
+    else {
+        _globalRotationState.velocity.decelerate(deltaTime);
+    }
+
+    if (zoom.first) {
+        _truckMovementState.velocity.set(glm::dvec2(zoom.second), deltaTime);
+    }
+    else {
+        _truckMovementState.velocity.decelerate(deltaTime);
+    }
+
+    if (localRoll.first) {
+        _localRollState.velocity.set(localRoll.second, deltaTime);
+    }
+    else {
+        _localRollState.velocity.decelerate(deltaTime);
+    }
+
+    if (globalRoll.first) {
+        _globalRollState.velocity.set(globalRoll.second, deltaTime);
+    }
+    else {
+        _globalRollState.velocity.decelerate(deltaTime);
+    }
+
+    if (localRotation.first) {
+        _localRotationState.velocity.set(localRotation.second, deltaTime);
+    }
+    else {
+        _localRotationState.velocity.decelerate(deltaTime);
+    }
+
+}
+
+void WebsocketCameraStates::setAxisMapping(int axis, AxisType mapping,
+                                          AxisInvert shouldInvert,
+                                          AxisNormalize shouldNormalize)
+{
+    ghoul_assert(axis < WebsocketInputState::MaxAxes, "axis must be < MaxAxes");
+
+    _axisMapping[axis].type = mapping;
+    _axisMapping[axis].invert = shouldInvert;
+    _axisMapping[axis].normalize = shouldNormalize;
+}
+
+WebsocketCameraStates::AxisInformation WebsocketCameraStates::axisMapping(int axis) const {
+    return _axisMapping[axis];
+}
+
+void WebsocketCameraStates::setDeadzone(int axis, float deadzone) {
+    _axisMapping[axis].deadzone = deadzone;
+}
+
+float WebsocketCameraStates::deadzone(int axis) const {
+    return _axisMapping[axis].deadzone;
+}
+
+void WebsocketCameraStates::bindButtonCommand(int button, std::string command,
+                                             WebsocketAction action,
+                                             ButtonCommandRemote remote,
+                                             std::string documentation)
+{
+    _buttonMapping.insert({
+        button,
+        { std::move(command), action, remote, std::move(documentation) }
+    });
+}
+
+void WebsocketCameraStates::clearButtonCommand(int button) {
+    for (auto it = _buttonMapping.begin(); it != _buttonMapping.end();) {
+        // If the current iterator is the button that we are looking for, delete it
+        // (std::multimap::erase will return the iterator to the next element for us)
+        if (it->first == button) {
+            it = _buttonMapping.erase(it);
+        }
+        else {
+            ++it;
+        }
+    }
+}
+
+std::vector<std::string> WebsocketCameraStates::buttonCommand(int button) const {
+    std::vector<std::string> result;
+    auto itRange = _buttonMapping.equal_range(button);
+    for (auto it = itRange.first; it != itRange.second; ++it) {
+        result.push_back(it->second.command);
+    }
+    return result;
+}
+
+
+} // namespace openspace::interaction
+
+namespace ghoul {
+
+template <>
+std::string to_string(const openspace::interaction::WebsocketCameraStates::AxisType& type)
+{
+    using T = openspace::interaction::WebsocketCameraStates::AxisType;
+    switch (type) {
+        case T::None:        return "None";
+        case T::OrbitX:      return "Orbit X";
+        case T::OrbitY:      return "Orbit Y";
+        case T::ZoomIn:      return "Zoom In";
+        case T::ZoomOut:     return "Zoom Out";
+        case T::LocalRollX:  return "LocalRoll X";
+        case T::LocalRollY:  return "LocalRoll Y";
+        case T::GlobalRollX: return "GlobalRoll X";
+        case T::GlobalRollY: return "GlobalRoll Y";
+        case T::PanX:        return "Pan X";
+        case T::PanY:        return "Pan Y";
+        default:             return "";
+    }
+}
+
+template <>
+openspace::interaction::WebsocketCameraStates::AxisType from_string(
+                                                                const std::string& string)
+{
+    using T = openspace::interaction::WebsocketCameraStates::AxisType;
+
+    static const std::map<std::string, T> Map = {
+        { "None",         T::None },
+        { "Orbit X",      T::OrbitX },
+        { "Orbit Y",      T::OrbitY },
+        { "Zoom In",      T::ZoomIn },
+        { "Zoom Out",     T::ZoomOut },
+        { "LocalRoll X",  T::LocalRollX },
+        { "LocalRoll Y",  T::LocalRollY },
+        { "GlobalRoll X", T::GlobalRollX },
+        { "GlobalRoll Y", T::GlobalRollY },
+        { "Pan X",        T::PanX },
+        { "Pan Y",        T::PanY }
+    };
+
+    return Map.at(string);
+}
+
+} // namespace ghoul
diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp
new file mode 100644
index 0000000000..e49989147c
--- /dev/null
+++ b/src/interaction/websocketinputstate.cpp
@@ -0,0 +1,97 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2019                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <openspace/interaction/websocketinputstate.h>
+
+#include <ghoul/misc/invariants.h>
+#include <ghoul/misc/stringconversion.h>
+#include <map>
+#include <numeric>
+
+namespace openspace::interaction {
+
+float WebsocketInputStates::axis(int axis) const {
+    ghoul_precondition(axis >= 0, "axis must be 0 or positive");
+
+    float res = std::accumulate(
+        begin(),
+        end(),
+        0.f,
+        [axis](float value, const std::pair<const size_t, const WebsocketInputState *> state) {
+            if (state.second->isConnected) {
+                value += state.second->axes[axis];
+            }
+            return value;
+        }
+    );
+
+    // If multiple websockets are connected, we might get values outside the -1,1 range by
+    // summing them up
+    return std::clamp(res, -1.f, 1.f);
+}
+
+bool WebsocketInputStates::button(int button, WebsocketAction action) const {
+    ghoul_precondition(button >= 0, "button must be 0 or positive");
+
+    bool res = std::any_of(
+        begin(),
+        end(),
+        [button, action](const std::pair<const size_t, const WebsocketInputState *> state) {
+            return state.second->isConnected ?
+                ( state.second->buttons[button] == action )
+                : false;
+        }
+    );
+    return res;
+}
+
+} // namespace openspace::interaction
+
+namespace ghoul {
+
+template <>
+std::string to_string(const openspace::interaction::WebsocketAction& action) {
+    switch (action) {
+        case openspace::interaction::WebsocketAction::Idle:    return "Idle";
+        case openspace::interaction::WebsocketAction::Press:   return "Press";
+        case openspace::interaction::WebsocketAction::Repeat:  return "Repeat";
+        case openspace::interaction::WebsocketAction::Release: return "Release";
+        default:                                              return "";
+    }
+}
+
+template <>
+openspace::interaction::WebsocketAction from_string(const std::string& string) {
+    static const std::map<std::string, openspace::interaction::WebsocketAction> Map = {
+        { "Idle",    openspace::interaction::WebsocketAction::Idle },
+        { "Press",   openspace::interaction::WebsocketAction::Press },
+        { "Repeat",  openspace::interaction::WebsocketAction::Repeat },
+        { "Release", openspace::interaction::WebsocketAction::Release }
+    };
+
+    return Map.at(string);
+
+}
+
+} // namespace ghoul
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index cef58ee498..684680b279 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -325,7 +325,7 @@ void ParallelPeer::dataMessageReceived(const std::vector<char>& message)
                 TimeKeyframeData timeKeyframeData;
                 timeKeyframeData.delta = kfMessage._dt;
                 timeKeyframeData.pause = kfMessage._paused;
-                timeKeyframeData.time = kfMessage._time;
+                timeKeyframeData.time = Time(kfMessage._time);
                 timeKeyframeData.jump = kfMessage._requiresTimeJump;
 
                 const double kfTimestamp = convertTimestamp(kfMessage._timestamp);
diff --git a/src/openspace.cpp b/src/openspace.cpp
index 439608d025..343b49c480 100644
--- a/src/openspace.cpp
+++ b/src/openspace.cpp
@@ -29,7 +29,7 @@ namespace openspace {
 std::string licenseText() {
     return "OpenSpace\n\
 \n\
-Copyright (c) 2014-2018\n\
+Copyright (c) 2014-2019\n\
 \n\
 Permission is hereby granted, free of charge, to any person obtaining a copy of this\n\
 software and associated documentation files (the \"Software\"), to deal in the Software\n\
diff --git a/src/performance/performancemanager.cpp b/src/performance/performancemanager.cpp
index e4075bf055..6694af0fca 100644
--- a/src/performance/performancemanager.cpp
+++ b/src/performance/performancemanager.cpp
@@ -62,7 +62,6 @@ namespace openspace::performance {
 // The ghoul::SharedData block addressed by OpenSpacePerformanceMeasurementSharedData
 // will only get allocated once and contains the total number of allocated shared memory
 // blocks alongside a list of names of these blocks
-//
 
 void PerformanceManager::CreateGlobalSharedMemory() {
     static_assert(
@@ -70,6 +69,8 @@ void PerformanceManager::CreateGlobalSharedMemory() {
         "The global memory struct does not fit the allocated global memory space"
     );
 
+    ghoul::SharedMemory::remove(GlobalSharedMemoryName);
+
     if (ghoul::SharedMemory::exists(GlobalSharedMemoryName)) {
         ghoul::SharedMemory sharedMemory(GlobalSharedMemoryName);
         sharedMemory.acquireLock();
diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl
index a6544c6af6..3157fa3d01 100644
--- a/src/rendering/dashboard_lua.inl
+++ b/src/rendering/dashboard_lua.inl
@@ -48,7 +48,13 @@ int addDashboardItem(lua_State* L) {
         }
         lua_settop(L, 0);
 
-        global::dashboard.addDashboardItem(DashboardItem::createFromDictionary(d));
+        try {
+            global::dashboard.addDashboardItem(DashboardItem::createFromDictionary(d));
+        }
+        catch (const ghoul::RuntimeError& e) {
+            LERRORC("addDashboardItem", e.what());
+            return ghoul::lua::luaError(L, "Error adding dashboard item");
+        }
 
         ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
         return 0;
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index c4e2c9b50d..7a876ef8ab 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -440,11 +440,7 @@ void LoadingScreen::render() {
                     if (info.totalSize < 1024 * 1024) { // 1MB
                         text = fmt::format(
                             "{} ({}%)\n{}/{} {}",
-                            text,
-                            p,
-                            info.currentSize,
-                            info.totalSize,
-                            "bytes"
+                            text, p, info.currentSize, info.totalSize, "bytes"
                         );
                     }
                     else {
@@ -453,11 +449,7 @@ void LoadingScreen::render() {
 
                         text = fmt::format(
                             "{} ({}%)\n{:.3f}/{:.3f} {}",
-                            text,
-                            p,
-                            curr,
-                            total,
-                            "MB"
+                            text, p, curr, total, "MB"
                         );
                     }
                 }
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index c2b9505bc1..58f99450a0 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -144,11 +144,20 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo ShowFrameNumberInfo = {
-        "ShowFrameNumber",
-        "Show Frame Number",
-        "If this value is enabled, the current frame number is rendered into the window."
+        "ShowFrameInformation",
+        "Show Frame Information",
+        "If this value is enabled, the current frame number and frame times are rendered "
+        "into the window."
     };
 
+#ifdef OPENSPACE_WITH_INSTRUMENTATION
+    constexpr openspace::properties::Property::PropertyInfo SaveFrameInfo = {
+        "SaveFrameInformation",
+        "Save Frame Information",
+        "Saves the frame information to disk"
+    };
+#endif // OPENSPACE_WITH_INSTRUMENTATION
+
     constexpr openspace::properties::Property::PropertyInfo DisableMasterInfo = {
         "DisableMasterRendering",
         "Disable Master Rendering",
@@ -239,13 +248,17 @@ RenderEngine::RenderEngine()
     , _showCameraInfo(ShowCameraInfo, true)
     , _takeScreenshot(TakeScreenshotInfo)
     , _applyWarping(ApplyWarpingInfo, false)
-    , _showFrameNumber(ShowFrameNumberInfo, false)
+    , _showFrameInformation(ShowFrameNumberInfo, false)
+#ifdef OPENSPACE_WITH_INSTRUMENTATION
+    , _saveFrameInformation(SaveFrameInfo, false)
+#endif // OPENSPACE_WITH_INSTRUMENTATION
     , _disableMasterRendering(DisableMasterInfo, false)
     , _globalBlackOutFactor(GlobalBlackoutFactorInfo, 1.f, 0.f, 1.f)
     , _nAaSamples(AaSamplesInfo, 4, 1, 8)
     , _hdrExposure(HDRExposureInfo, 0.4f, 0.01f, 10.0f)
     , _hdrBackground(BackgroundExposureInfo, 2.8f, 0.01f, 10.0f)
     , _gamma(GammaInfo, 2.2f, 0.01f, 10.0f)
+    , _horizFieldOfView(HorizFieldOfViewInfo, 80.f, 1.f, 179.0f)
     , _globalRotation(
         GlobalRotationInfo,
         glm::vec3(0.f),
@@ -264,7 +277,6 @@ RenderEngine::RenderEngine()
         glm::vec3(-glm::pi<float>()),
         glm::vec3(glm::pi<float>())
     )
-    , _horizFieldOfView(HorizFieldOfViewInfo, 80.f, 1.f, 179.0f)
 {
     _doPerformanceMeasurements.onChange([this](){
         global::performanceManager.setEnabled(_doPerformanceMeasurements);
@@ -317,7 +329,15 @@ RenderEngine::RenderEngine()
     _takeScreenshot.onChange([this](){ _shouldTakeScreenshot = true; });
     addProperty(_takeScreenshot);
 
-    addProperty(_showFrameNumber);
+    addProperty(_showFrameInformation);
+#ifdef OPENSPACE_WITH_INSTRUMENTATION
+    _saveFrameInformation.onChange([&]() {
+        if (_saveFrameInformation) {
+            _frameInfo.lastSavedFrame = frameNumber();
+        }
+    });
+    addProperty(_saveFrameInformation);
+#endif // OPENSPACE_WITH_INSTRUMENTATION
 
     addProperty(_globalRotation);
     addProperty(_screenSpaceRotation);
@@ -415,12 +435,12 @@ void RenderEngine::initializeGL() {
     // development
     global::windowDelegate.setNearFarClippingPlane(0.001f, 1000.f);
 
-    //Set horizontal FOV value with whatever the field of view (in degrees) is of the
+    // Set horizontal FOV value with whatever the field of view (in degrees) is of the
     // initialized window
     _horizFieldOfView = static_cast<float>(global::windowDelegate.getHorizFieldOfView());
 
-    constexpr const float FontSizeBig = 50.f;
-    _fontBig = global::fontManager.font(KeyFontMono, FontSizeBig);
+    constexpr const float FontSizeFrameinfo = 32.f;
+    _fontFrameInfo = global::fontManager.font(KeyFontMono, FontSizeFrameinfo);
     constexpr const float FontSizeTime = 15.f;
     _fontDate = global::fontManager.font(KeyFontMono, FontSizeTime);
     constexpr const float FontSizeMono = 10.f;
@@ -582,13 +602,18 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         );
     }
 
-    if (_showFrameNumber) {
+    if (_showFrameInformation) {
         glm::vec2 penPosition = glm::vec2(
             fontResolution().x / 2 - 50,
             fontResolution().y / 3
         );
 
-        RenderFont(*_fontBig, penPosition, std::to_string(_frameNumber));
+        std::string fn = std::to_string(_frameNumber);
+        std::string dt = std::to_string(global::windowDelegate.deltaTime());
+        std::string avgDt = std::to_string(global::windowDelegate.averageDeltaTime());
+
+        std::string res = "Frame: " + fn + '\n' + "Dt: " + dt + '\n' + "Avg Dt: " + avgDt;
+        RenderFont(*_fontFrameInfo, penPosition, res);
     }
 
     ++_frameNumber;
@@ -794,6 +819,35 @@ void RenderEngine::postDraw() {
             scene()->allSceneGraphNodes()
         );
     }
+
+#ifdef OPENSPACE_WITH_INSTRUMENTATION
+    if (_saveFrameInformation) {
+        _frameInfo.frames.push_back({
+            frameNumber(),
+            global::windowDelegate.deltaTime(),
+            global::windowDelegate.averageDeltaTime()
+        });
+    }
+
+    const uint16_t next = _frameInfo.lastSavedFrame + _frameInfo.saveEveryNthFrame;
+    const bool shouldSave = _saveFrameInformation && frameNumber() >= next;
+    if (shouldSave) {
+        std::string filename = fmt::format(
+            "_inst_renderengine_{}_{}.txt",
+            _frameInfo.lastSavedFrame, _frameInfo.saveEveryNthFrame
+        );
+        std::ofstream file(absPath("${BIN}/" + filename));
+        for (const FrameInfo& i : _frameInfo.frames) {
+            std::string line = fmt::format(
+                "{}\t{}\t{}", i.iFrame, i.deltaTime, i.avgDeltaTime
+            );
+            file << line << '\n';
+        }
+
+        _frameInfo.frames.clear();
+        _frameInfo.lastSavedFrame = frameNumber();
+    }
+#endif // OPENSPACE_WITH_INSTRUMENTATION
 }
 
 Scene* RenderEngine::scene() {
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 98a2c4519f..d8aa117073 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -42,8 +42,8 @@ namespace {
     constexpr const char* KeyType = "Type";
     constexpr const char* KeyTag = "Tag";
 
-    constexpr const std::array<const char*, 5> UniformNames = {
-        "OcclusionDepth", "Alpha", "ModelTransform", "ViewProjectionMatrix", "texture1"
+    constexpr const std::array<const char*, 4> UniformNames = {
+        "Alpha", "ModelTransform", "ViewProjectionMatrix", "texture1"
     };
 
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
@@ -451,7 +451,6 @@ bool ScreenSpaceRenderable::initialize() {
 }
 
 bool ScreenSpaceRenderable::initializeGL() {
-    _originalViewportSize = global::windowDelegate.currentWindowResolution();
     createShaders();
     return isReady();
 }
@@ -523,15 +522,9 @@ glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
     float textureRatio =
         static_cast<float>(_objectSize.y) / static_cast<float>(_objectSize.x);
 
-    float scalingRatioX = _originalViewportSize.x / resolution.x;
-    float scalingRatioY = _originalViewportSize.y / resolution.y;
     glm::mat4 scale = glm::scale(
         glm::mat4(1.f),
-        glm::vec3(
-            _scale * scalingRatioX,
-            _scale * scalingRatioY * textureRatio,
-            1.f
-        )
+        glm::vec3(_scale, _scale * textureRatio, 1.f)
     );
 
     // Simulate orthographic projection by distance to plane.
@@ -614,9 +607,8 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
     unbindTexture();
 }
 
-void ScreenSpaceRenderable::bindTexture() {}
-
-void ScreenSpaceRenderable::unbindTexture() {}
+void ScreenSpaceRenderable::unbindTexture() {
+}
 
 
 } // namespace openspace
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 8fce29ad62..914242cf9a 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -374,14 +374,14 @@ void SceneGraphNode::update(const UpdateData& data) {
     }
     UpdateData newUpdateData = data;
 
-    _worldRotationCached = calculateWorldRotation();
-    _worldScaleCached = calculateWorldScale();
     // Assumes _worldRotationCached and _worldScaleCached have been calculated for parent
     _worldPositionCached = calculateWorldPosition();
+    _worldRotationCached = calculateWorldRotation();
+    _worldScaleCached = calculateWorldScale();
 
-    newUpdateData.modelTransform.translation = worldPosition();
-    newUpdateData.modelTransform.rotation = worldRotationMatrix();
-    newUpdateData.modelTransform.scale = worldScale();
+    newUpdateData.modelTransform.translation = _worldPositionCached;
+    newUpdateData.modelTransform.rotation = _worldRotationCached;
+    newUpdateData.modelTransform.scale = _worldScaleCached;
 
     glm::dmat4 translation = glm::translate(
         glm::dmat4(1.0),
@@ -655,7 +655,7 @@ bool SceneGraphNode::hasGuiHintHidden() const {
 glm::dvec3 SceneGraphNode::calculateWorldPosition() const {
     // recursive up the hierarchy if there are parents available
     if (_parent) {
-        const glm::dvec3 wp = _parent->calculateWorldPosition();
+        const glm::dvec3 wp = _parent->worldPosition();
         const glm::dmat3 wrot = _parent->worldRotationMatrix();
         const double ws = _parent->worldScale();
         const glm::dvec3 p = position();
@@ -684,7 +684,7 @@ bool SceneGraphNode::isTimeFrameActive(const Time& time) const {
 glm::dmat3 SceneGraphNode::calculateWorldRotation() const {
     // recursive up the hierarchy if there are parents available
     if (_parent) {
-        return _parent->calculateWorldRotation() * rotationMatrix();
+        return _parent->worldRotationMatrix() * rotationMatrix();
     }
     else {
         return rotationMatrix();
@@ -694,7 +694,7 @@ glm::dmat3 SceneGraphNode::calculateWorldRotation() const {
 double SceneGraphNode::calculateWorldScale() const {
     // recursive up the hierarchy if there are parents available
     if (_parent) {
-        return _parent->calculateWorldScale() * scale();
+        return _parent->worldScale() * scale();
     }
     else {
         return scale();
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 9a197065e8..ac0115367e 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -333,12 +333,12 @@ int time_setTime(lua_State* L) {
     if (nArguments == 1) {
         if (isNumber) {
             double value = lua_tonumber(L, 1);
-            global::timeManager.setTimeNextFrame(value);
+            global::timeManager.setTimeNextFrame(Time(value));
             return 0;
         }
         if (isString) {
             const char* time = lua_tostring(L, 1);
-            global::timeManager.setTimeNextFrame(Time::convertTime(time));
+            global::timeManager.setTimeNextFrame(Time(Time::convertTime(time)));
             return 0;
         }
         ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -424,7 +424,7 @@ int time_interpolateTime(lua_State* L) {
             global::timeManager.interpolateTime(targetTime, duration);
         }
         else {
-            global::timeManager.setTimeNextFrame(targetTime);
+            global::timeManager.setTimeNextFrame(Time(targetTime));
         }
     }
     return 0;
@@ -486,7 +486,7 @@ int time_interpolateTimeRelative(lua_State* L) {
         }
         else {
             global::timeManager.setTimeNextFrame(
-                global::timeManager.time().j2000Seconds() + delta
+                Time(global::timeManager.time().j2000Seconds() + delta)
             );
         }
     }
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index 4f31a86f23..d8e920d2a7 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -109,7 +109,7 @@ void TimeManager::interpolateTime(double targetTime, double durationSeconds) {
     const bool pause = isPaused();
 
     const TimeKeyframeData current = { time(), deltaTime(), false, false };
-    const TimeKeyframeData next = { targetTime, targetDeltaTime(), pause, false };
+    const TimeKeyframeData next = { Time(targetTime), targetDeltaTime(), pause, false };
 
     clearKeyframes();
     addKeyframe(now, current);
@@ -138,7 +138,7 @@ void TimeManager::preSynchronization(double dt) {
     if (newTime != _lastTime) {
         using K = const CallbackHandle;
         using V = TimeChangeCallback;
-        for (const std::pair<const K, V>& it : _timeChangeCallbacks) {
+        for (const std::pair<K, V>& it : _timeChangeCallbacks) {
             it.second();
         }
     }
@@ -148,14 +148,14 @@ void TimeManager::preSynchronization(double dt) {
     {
         using K = const CallbackHandle;
         using V = TimeChangeCallback;
-        for (const std::pair<const K, V>& it : _deltaTimeChangeCallbacks) {
+        for (const std::pair<K, V>& it : _deltaTimeChangeCallbacks) {
             it.second();
         }
     }
     if (_timelineChanged) {
         using K = const CallbackHandle;
         using V = TimeChangeCallback;
-        for (const std::pair<const K, V>& it : _timelineChangeCallbacks) {
+        for (const std::pair<K, V>& it : _timelineChangeCallbacks) {
             it.second();
         }
     }
@@ -193,12 +193,12 @@ TimeKeyframeData TimeManager::interpolate(double applicationTime) {
     } else if (hasPastKeyframes) {
         // Extrapolate based on last past keyframe
         const double deltaApplicationTime = applicationTime - lastPastKeyframe->timestamp;
-        Time predictedTime = {
+        Time predictedTime(
             lastPastKeyframe->data.time.j2000Seconds() +
             deltaApplicationTime *
                 (lastPastKeyframe->data.pause ? 0.0 : lastPastKeyframe->data.delta)
-        };
-        return TimeKeyframeData{
+        );
+        return TimeKeyframeData {
             predictedTime,
             lastPastKeyframe->data.delta,
             false,
@@ -206,7 +206,7 @@ TimeKeyframeData TimeManager::interpolate(double applicationTime) {
         };
     }
     // As the last option, fall back on the current time.
-    return TimeKeyframeData{ _currentTime, _targetDeltaTime, _timePaused, false };
+    return TimeKeyframeData { _currentTime, _targetDeltaTime, _timePaused, false };
 }
 
 void TimeManager::progressTime(double dt) {
@@ -230,7 +230,7 @@ void TimeManager::progressTime(double dt) {
 
         using K = const CallbackHandle;
         using V = TimeChangeCallback;
-        for (const std::pair<const K, V>& it : _timeJumpCallbacks) {
+        for (const std::pair<K, V>& it : _timeJumpCallbacks) {
             it.second();
         }
         return;
@@ -316,7 +316,7 @@ TimeKeyframeData TimeManager::interpolate(const Keyframe<TimeKeyframeData>& past
         deltaAppTime;
 
     TimeKeyframeData data {
-        interpolatedTime,
+        Time(interpolatedTime),
         interpolatedDeltaTime,
         past.data.pause,
         past.data.jump
@@ -532,9 +532,9 @@ void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolation
     }
 
     const double now = global::windowDelegate.applicationTime();
-
-    Time newTime = time().j2000Seconds() +
-        (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration;
+    Time newTime(
+        time().j2000Seconds() + (_deltaTime + newDeltaTime) * 0.5 * interpolationDuration
+    );
 
     TimeKeyframeData currentKeyframe = { time(), _deltaTime, false, false };
     TimeKeyframeData futureKeyframe = { newTime, newDeltaTime, false, false };
@@ -556,8 +556,9 @@ void TimeManager::interpolatePause(bool pause, double interpolationDuration) {
 
     const double now = global::windowDelegate.applicationTime();
     double targetDelta = pause ? 0.0 : _targetDeltaTime;
-    Time newTime = time().j2000Seconds() +
-        (_deltaTime + targetDelta) * 0.5 * interpolationDuration;
+    Time newTime(
+        time().j2000Seconds() + (_deltaTime + targetDelta) * 0.5 * interpolationDuration
+    );
 
     TimeKeyframeData currentKeyframe = { time(), _deltaTime, false, false };
     TimeKeyframeData futureKeyframe = { newTime, _targetDeltaTime, pause, false };