diff --git a/.gitignore b/.gitignore
index cb1b3319c5..475ebd7f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,12 @@ install_manifest.txt
 .cproject
 .project
 shaders/ABuffer/constants.hglsl
-ScriptLog.txt
+*.idea/
+.vs/
+.build-vs/
+*.dir
+cmake-build-*
+x64/
 customization.lua
 COMMIT.md
 screenshots
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f8b955a6f..d83fc0f5c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,6 +79,18 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+# See if working directory is clean or not
+execute_process(
+  COMMAND git diff-index --quiet HEAD --
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  RESULT_VARIABLE OPENSPACE_GIT_STATUS_RETURN
+)
+if (NOT OPENSPACE_GIT_STATUS_RETURN EQUAL 0) 
+    set(OPENSPACE_GIT_STATUS "uncomitted changes")
+else()
+    set(OPENSPACE_GIT_STATUS "")
+endif()
+
 option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
 
 include(src/CMakeLists.txt)
diff --git a/Jenkinsfile b/Jenkinsfile
index fa4e137cfe..9150da5bef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,7 +54,7 @@ stage('Build') {
                         cd build
                         cmake -G "Visual Studio 15 2017 Win64" .. ''' +
                         flags + ''' ..
-                        msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /p:Configuration=Debug
+                        msbuild.exe OpenSpace.sln /nologo /verbosity:minimal /p:Configuration=Debug /target:OpenSpace
                     '''
                 }
             }
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index dbd5dae9e6..c2be5d7a5f 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -22,11 +22,10 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################
 
-include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake) 
+include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
 
-
 #####
 # OpenVR
 #####
@@ -34,9 +33,9 @@ option(OPENSPACE_OPENVR_SUPPORT "Build OpenSpace application with OpenVR support
 
 if (OPENSPACE_OPENVR_SUPPORT)
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSPACE_EXT_DIR}/sgct/cmake/modules/")
-    
+
     find_package(OpenVR REQUIRED)
-    
+
     set(SGCT_OPENVR_DEFINITIONS OPENVR_SUPPORT)
 
     if (NOT SGCT_OPENVR_INCLUDE_DIRECTORY)
@@ -111,6 +110,38 @@ target_compile_definitions(OpenSpace PRIVATE
     ${SPOUT_DEFINITIONS}
 )
 
+
+# Web Browser and Web gui
+# Why not put these in the module's path? Because they do not have access to the
+# target as of July 2017, which is needed.
+if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
+    # wanted by CEF
+    set(CMAKE_BUILD_TYPE Debug CACHE INTERNAL "CMAKE_BUILD_TYPE")
+    
+    if (WIN32)
+        set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
+    endif ()
+
+    # Add the CEF binary distribution's cmake/ directory to the module path and
+    # find CEF to initialize it properly.
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake")
+    include(webbrowser_helpers)
+
+    set_cef_targets("${CEF_ROOT}" OpenSpace)
+    run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}")
+elseif (OPENSPACE_MODULE_WEBBROWSER)
+    message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.")
+endif ()
+
+if (OPENSPACE_MODULE_WEBGUI AND WEBGUI_MODULE_PATH)
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBGUI_MODULE_PATH}/cmake")
+    include(webgui_helpers)
+    build_webgui_source(OpenSpace)
+elseif(OPENSPACE_MODULE_WEBGUI)
+    message(WARNING "WebGui is configured to be included, but the web source could not be found. Try configuring CMake again.")
+endif()
+# End Web Browser and Web gui
+
 if (MSVC)
     # This library is used for being able to output the callstack if an exception escapes
     target_link_libraries(OpenSpace Dbghelp.lib)
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 6d61c9663d..8586b6d98e 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -106,7 +106,7 @@ LONG WINAPI generateMiniDump(EXCEPTION_POINTERS* exceptionPointers) {
 
     LINFO(fmt::format("Creating dump file: {}", dumpFile));
 
-    HANDLE hDumpFile = CreateFile(
+    HANDLE hDumpFile = CreateFileA(
         dumpFile.c_str(),
         GENERIC_READ | GENERIC_WRITE,
         FILE_SHARE_WRITE | FILE_SHARE_READ,
diff --git a/apps/Wormhole/CMakeLists.txt b/apps/Wormhole/CMakeLists.txt
new file mode 100644
index 0000000000..9fc9569a31
--- /dev/null
+++ b/apps/Wormhole/CMakeLists.txt
@@ -0,0 +1,45 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2018                                                                #
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/application_definition.cmake)
+
+set_source_files_properties(
+    ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
+    PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
+)
+
+set(MACOSX_BUNDLE_ICON_FILE openspace.icns)
+
+create_new_application(
+    Wormhole
+    MACOSX_BUNDLE
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/openspace.rc
+    ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
+)
+
+target_link_libraries(
+    Wormhole
+    libOpenSpace
+)
diff --git a/apps/Wormhole/include.cmake b/apps/Wormhole/include.cmake
new file mode 100644
index 0000000000..7ac26b6f4f
--- /dev/null
+++ b/apps/Wormhole/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_APPLICATION ON)
diff --git a/apps/Wormhole/main.cpp b/apps/Wormhole/main.cpp
new file mode 100644
index 0000000000..a688f80a13
--- /dev/null
+++ b/apps/Wormhole/main.cpp
@@ -0,0 +1,141 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * 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 <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 <ghoul/cmdparser/commandlineparser.h>
+#include <ghoul/cmdparser/singlecommand.h>
+
+#include <openspace/engine/wrapper/windowwrapper.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 <iomanip>
+#include <ios>
+
+namespace {
+    const std::string _loggerCat = "Wormhole";
+}
+
+int main(int argc, char** argv) {
+    using namespace openspace;
+
+    std::vector<std::string> arguments(argv, argv + argc);
+
+    ghoul::cmdparser::CommandlineParser commandlineParser(
+        "Wormhole",
+        ghoul::cmdparser::CommandlineParser::AllowUnknownCommands::Yes
+    );
+
+    std::stringstream defaultPassword;
+    defaultPassword << std::hex << std::setfill('0') << std::setw(6) << 
+        (std::hash<size_t>{}(
+            std::chrono::system_clock::now().time_since_epoch().count()
+        ) % 0xffffff);
+
+    std::stringstream defaultChangeHostPassword;
+    defaultChangeHostPassword << std::hex << std::setfill('0') << std::setw(6) <<
+        (std::hash<size_t>{}(
+            std::chrono::system_clock::now().time_since_epoch().count() + 1
+        ) % 0xffffff);
+
+    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 = "";
+    commandlineParser.addCommand(
+        std::make_unique<ghoul::cmdparser::SingleCommand<std::string>>(
+            password,
+            "--password",
+            "-l",
+            "Sets the password to use"
+            )
+    );
+
+    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 == "") {
+        password = defaultPassword.str();
+    }
+    if (changeHostPassword == "") {
+        changeHostPassword = defaultChangeHostPassword.str();
+    }
+
+    LINFO(fmt::format("Connection password: {}", password));
+    LINFO(fmt::format("Host password: {}", changeHostPassword));
+
+    int port = 25001;
+
+    if (portString != "") {
+        try {
+            port = std::stoi(portString);
+        }
+        catch (...) {
+            LERROR(fmt::format("Invalid port: {}", portString));
+        }
+    }
+
+    ParallelServer server;
+    server.start(port, password, changeHostPassword);
+    server.setDefaultHostAddress("127.0.0.1");
+    LINFO(fmt::format("Server listening to port {}", port));
+
+    while (std::cin.get() != 'q') {}
+
+    server.stop();
+    LINFO("Server stopped");
+
+    return 0;
+};
diff --git a/apps/Wormhole/openspace.icns b/apps/Wormhole/openspace.icns
new file mode 100644
index 0000000000..a6e08b0a54
Binary files /dev/null and b/apps/Wormhole/openspace.icns differ
diff --git a/apps/Wormhole/openspace.ico b/apps/Wormhole/openspace.ico
new file mode 100644
index 0000000000..38f7eb88a8
Binary files /dev/null and b/apps/Wormhole/openspace.ico differ
diff --git a/apps/Wormhole/openspace.png b/apps/Wormhole/openspace.png
new file mode 100644
index 0000000000..1e5f26b087
Binary files /dev/null and b/apps/Wormhole/openspace.png differ
diff --git a/apps/Wormhole/openspace.rc b/apps/Wormhole/openspace.rc
new file mode 100644
index 0000000000..86a250bb5d
--- /dev/null
+++ b/apps/Wormhole/openspace.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "openspace.ico"
\ No newline at end of file
diff --git a/data/assets/dawn.scene b/data/assets/dawn.scene
index 55f91b8b88..7af21ba55f 100644
--- a/data/assets/dawn.scene
+++ b/data/assets/dawn.scene
@@ -37,7 +37,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = DawnAsset.Dawn.Name,
+        Focus = DawnAsset.Dawn.Identifier,
         Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
         Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
     })
diff --git a/data/assets/default.scene b/data/assets/default.scene
index b32bf5da5c..4d43bd51f7 100644
--- a/data/assets/default.scene
+++ b/data/assets/default.scene
@@ -9,7 +9,6 @@ asset.require('scene/solarsystem/planets')
 asset.require('scene/solarsystem/planets/mars/moons/phobos')
 asset.require('scene/solarsystem/planets/mars/moons/deimos')
 assetHelper.requestAll(asset, 'scene/digitaluniverse')
-
 -- Load default key bindings applicable to most scenes
 asset.require('util/default_keybindings')
 
@@ -37,10 +36,9 @@ local Keybindings = {
         Key = "g",
         Command = propertyHelper.invert('Scene.MilkyWay.renderable.Enabled') ..
                   propertyHelper.invert('Scene.Stars.renderable.Enabled') ..
-                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.NightLayers.Earth at Night 2012.Enabled') ..
-                  propertyHelper.invert('Scene.Earth.RenderableGlobe.PerformShading') ..
-                  propertyHelper.invert('Scene.Mars.RenderableGlobe.PerformShading') ..
-                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Atmosphere') ..
+                  propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.NightLayers.Earth_at_Night_2012.Enabled') ..
+                  propertyHelper.invert('Scene.EarthAtmosphere.renderable.Enabled') ..
+                  propertyHelper.invert('Scene.MarsAtmosphere.renderable.Enabled') ..
                   propertyHelper.invert('Scene.Earth.RenderableGlobe.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
                   propertyHelper.invert('Scene.Moon.RenderableGlobe.Enabled') ..
                   propertyHelper.invert('Scene.Sun.renderable.Enabled'),
@@ -72,7 +70,6 @@ asset.onInitialize(function ()
         "Earth", "Mars", "Moon"
     })
 
-
     openspace.addVirtualProperty(
         "BoolProperty",
         "Show Trails",
@@ -84,7 +81,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = earthAsset.Earth.Name,
+        Focus = earthAsset.Earth.Identifier,
         Position = { 0, 0, 0 },
         Rotation = { 0.758797, 0.221490, -0.605693, -0.091135 },
     })
diff --git a/data/assets/examples/renderableplaneimageonline.asset b/data/assets/examples/renderableplaneimageonline.asset
index fd48f1d35f..a4ac8f9831 100644
--- a/data/assets/examples/renderableplaneimageonline.asset
+++ b/data/assets/examples/renderableplaneimageonline.asset
@@ -6,8 +6,8 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 local RenderablePlaneImageOnline = {
-    Name = "RenderablePlaneImageOnline",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "RenderablePlaneImageOnline",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderablePlaneImageOnline",
         Size = 3.0E11,
@@ -15,7 +15,9 @@ local RenderablePlaneImageOnline = {
         Billboard = true,
         URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg"
     },
-    GuiPath = "/Examples"
+    GUI = {
+        Path = "/Examples"
+    }
 }
 
 
diff --git a/data/assets/examples/screenspacespout.asset b/data/assets/examples/screenspacespout.asset
index 54cc619cd5..54319351f8 100644
--- a/data/assets/examples/screenspacespout.asset
+++ b/data/assets/examples/screenspacespout.asset
@@ -6,15 +6,17 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
 
 
 local Spout = {
-    Name = "Spouty",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Spouty",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderablePlaneSpout",
         Size = 3.0E11,
         Origin = "Center",
         Billboard = true
     },
-    GuiPath = "/Examples"
+    GUI = {
+        Path = "/Examples"
+    }
 }
 
 
diff --git a/data/assets/examples/urlsynchronization.asset b/data/assets/examples/urlsynchronization.asset
index cc7e4b1a7c..630eb4762b 100644
--- a/data/assets/examples/urlsynchronization.asset
+++ b/data/assets/examples/urlsynchronization.asset
@@ -3,15 +3,15 @@
 local assetHelper = asset.require("util/asset_helper")
 
 asset.syncedResource({
-    Type = "UrlSynchronization",
     Name = "Example Single",
+    Type = "UrlSynchronization",
     Identifier = "example_single",
     Url = "http://celestrak.com/NORAD/elements/geo.txt"
 })
 
 asset.syncedResource({
-    Type = "UrlSynchronization",
     Name = "Example Multiple",
+    Type = "UrlSynchronization",
     Identifier = "example_multiple",
     Url = {
         "http://celestrak.com/NORAD/elements/stations.txt",
@@ -20,14 +20,23 @@ asset.syncedResource({
 })
 
 asset.syncedResource({
-    Type = "UrlSynchronization",
     Name = "Example Large",
+    Type = "UrlSynchronization",
     Identifier = "example_large",
-    Url = "http://ipv4.download.thinkbroadband.com/100MB.zip"
+    Url = "http://ipv4.download.thinkbroadband.com/100MB.zip",
+    Override = true
 })
 
 asset.syncedResource({
+    Name = "Example Medium",
     Type = "UrlSynchronization",
+    Identifier = "example_medium",
+    Url = "http://ipv4.download.thinkbroadband.com/5MB.zip",
+    Override = true
+})
+
+asset.syncedResource({
     Name = "Example No ident",
+    Type = "UrlSynchronization",
     Url = "http://ipv4.download.thinkbroadband.com/5MB.zip"
 })
diff --git a/data/assets/juno.scene b/data/assets/juno.scene
index f42cd27d5d..353af80afd 100644
--- a/data/assets/juno.scene
+++ b/data/assets/juno.scene
@@ -40,7 +40,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = junoAsset.Juno.Name,
+        Focus = junoAsset.Juno.Identifier,
         Position = { 1837386367.601345, -389860693812.834839, 714830404470.398926 },
         Rotation = { -0.336540, 0.711402, -0.099212, 0.608937 },
     })
diff --git a/data/assets/newhorizons.scene b/data/assets/newhorizons.scene
index 3b109a3a34..af40f70ee0 100644
--- a/data/assets/newhorizons.scene
+++ b/data/assets/newhorizons.scene
@@ -101,7 +101,7 @@ local Keybindings = {
     },
     {
         Key = "l",
-        Command = propertyHelper.invert('Scene.Labels.renderable.Enabled'),
+        Command = propertyHelper.fadeInOut('Scene.Labels.renderable.Opacity', 2.0),
         Documentation = "Toggles the visibility of the labels for the New Horizons instruments.",
         Local = false
     },
@@ -177,7 +177,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = NewHorizonsAsset.NewHorizons.Name,
+        Focus = NewHorizonsAsset.NewHorizons.Identifier,
         Position = { 4662120063743.592773, 1263245003503.724854, -955413856565.788086 },
         Rotation = { 0.683224, -0.165934, 0.701234, 0.118073 },
     })
diff --git a/data/assets/osirisrex.scene b/data/assets/osirisrex.scene
index 98a30d82b0..2a41142844 100644
--- a/data/assets/osirisrex.scene
+++ b/data/assets/osirisrex.scene
@@ -124,7 +124,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = OsirisRexAsset.OsirisRex.Name,
+        Focus = OsirisRexAsset.OsirisRex.Identifier,
         Position = { 26974590199.661884, 76314608558.908020, -127086452897.101791 },
         Rotation = { 0.729548, -0.126024, 0.416827, 0.527382 },
     })
diff --git a/data/assets/rosetta.scene b/data/assets/rosetta.scene
index b4fe3750e1..612ad671ef 100644
--- a/data/assets/rosetta.scene
+++ b/data/assets/rosetta.scene
@@ -126,7 +126,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = Comet67PAsset.Comet67P.Name,
+        Focus = Comet67PAsset.Comet67P.Identifier,
         Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
         Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
     })
diff --git a/data/assets/scene/digitaluniverse/2dF.asset b/data/assets/scene/digitaluniverse/2dF.asset
index 7d3860220c..b7dac60fe2 100644
--- a/data/assets/scene/digitaluniverse/2dF.asset
+++ b/data/assets/scene/digitaluniverse/2dF.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "2dF Galaxies",
+    Identifier = "2dF",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -31,7 +31,10 @@ local object = {
         Unit = "Mpc",
         ScaleFactor = 508.0
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "2dF Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/2mass.asset b/data/assets/scene/digitaluniverse/2mass.asset
index f0587ce522..3247753ba5 100644
--- a/data/assets/scene/digitaluniverse/2mass.asset
+++ b/data/assets/scene/digitaluniverse/2mass.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "2MASS Galaxies",
+    Identifier = "2MASS",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -31,7 +31,10 @@ local object = {
         Unit = "Mpc",
         ScaleFactor = 508.0
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "2MASS Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index 020e1941c8..f5a80d2e3e 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "6dF Galaxies",
+    Identifier = "6dF",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -30,7 +30,10 @@ local object = {
         ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
         Unit = "Mpc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "6dF Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/abell.asset b/data/assets/scene/digitaluniverse/abell.asset
index 6dbddbd01c..187ca33fb8 100644
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Abell Galaxy Clusters",
+    Identifier = "Abell",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -38,7 +38,10 @@ local object = {
             0.0,              0.0,            0.0,           1.0
         }
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Abell Galaxy Clusters",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/alternatestarlabels.asset b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
index 2c074e0bee..f96a2c20dc 100644
--- a/data/assets/scene/digitaluniverse/alternatestarlabels.asset
+++ b/data/assets/scene/digitaluniverse/alternatestarlabels.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Stars Labels - Alternate",
+    Identifier = "StarLabelsAlternate",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -23,7 +23,10 @@ local object = {
         TextMinSize = 6.0,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Name = "Stars Labels - Alternate",
+        Path = "/Milky Way/Stars"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index 85f10e6393..5ca7b769ef 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -17,49 +17,57 @@ local speck = asset.syncedResource({
 })
 
 local wmap = {
-    Name = "Wilkinson Microwave Anisotropy Probe (WMAP)",
+    Identifier = "WMAP",
     Renderable = {
         Type = "RenderableSphere",
         Enabled = false,
         Size = 3975.41417036064E23,
         Segments = 80,
-        Alpha = 0.5,
+        Opacity = 0.5,
         Texture = textures .. "/wmap_ilc_7yr_v4_200uK_RGB_sos.png",
         Orientation = "Inside/Outside",
         FadeInThreshould = 8E26
 
     },
-    GuiPath = "/Universe/Cosmic Microwave Background"
+    GUI = {
+        Name = "Wilkinson Microwave Anisotropy Probe (WMAP)",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
 }
 
 local cbe = {
-    Name = "Cosmic Background Explorer",
+    Identifier = "CBE",
     Renderable = {
         Type = "RenderableSphere",
         Enabled = false,
         Size = 3975.41417036064E23,
         Segments = 80,
-        Alpha = 0.5,
+        Opacity = 0.5,
         Texture = textures .. "/COBErect.png",
         Orientation = "Inside/Outside",
         FadeInThreshould = 8E26
     },
-    GuiPath = "/Universe/Cosmic Microwave Background"
+    GUI = {
+        Name = "Cosmic Background Explorer",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
 }
 
 local planck = {
-    Name = "Planck",
+    Identifier = "Planck",
     Renderable = {
         Type = "RenderableSphere",
         Enabled = false,
         Size = 3975.41417036064E23,
         Segments = 80,
-        Alpha = 0.3,
+        Opacity = 0.3,
         Texture = textures .. "/cmb4k.jpg",
         Orientation = "Inside/Outside",
         FadeInThreshould = 8E26
     },
-    GuiPath = "/Universe/Cosmic Microwave Background"
+    GUI = {
+        Path = "/Universe/Cosmic Microwave Background"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/clusters.asset b/data/assets/scene/digitaluniverse/clusters.asset
index d6c588a1f9..6c7794eb13 100644
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Galaxy Cluster Labels",
+    Identifier = "GalaxyClusterLabels",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -23,7 +23,10 @@ local object = {
         TextMinSize = 8.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Galaxy Cluster Labels",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/constellationbounds.asset b/data/assets/scene/digitaluniverse/constellationbounds.asset
index b2a81000b7..35dd792e2c 100644
--- a/data/assets/scene/digitaluniverse/constellationbounds.asset
+++ b/data/assets/scene/digitaluniverse/constellationbounds.asset
@@ -15,7 +15,7 @@ local zodiacs = {
 }
 
 local object = {
-    Name = "Constellation Bounds",
+    Identifier = "ConstellationBounds",
     Renderable = {
         Type = "RenderableConstellationBounds",
         Enabled = false,
@@ -34,7 +34,10 @@ local object = {
             Scale = 10e17
         }
     },
-    GuiPath = "/Milky Way/Constellations"
+    GUI = {
+        Name = "Constellation Bounds",
+        Path = "/Milky Way/Constellations"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/constellations.asset b/data/assets/scene/digitaluniverse/constellations.asset
index 8b60862ad8..0b18a7e549 100644
--- a/data/assets/scene/digitaluniverse/constellations.asset
+++ b/data/assets/scene/digitaluniverse/constellations.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local constellationsExtragalactic = {
-    Name = "Constellations (Extragalactic)",
+    Identifier = "ConstellationsExtragalactic",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -26,11 +26,14 @@ local constellationsExtragalactic = {
         MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
         Unit = "Mpc"
     },
-    GuiPath = "/Milky Way/Constellations"
+    GUI = {
+        Name = "Constellations (Extragalactic)",
+        Path = "/Milky Way/Constellations"
+    }
 }
 
 local constellations = {
-    Name = "Constellations",
+    Identifier = "Constellations",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -46,7 +49,9 @@ local constellations = {
         MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Constellations"
+    GUI = {
+        Path = "/Milky Way/Constellations"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index 4ec32c416a..d0e4bf6e18 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Dwarfs",
+    Identifier = "Dwarfs",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -32,7 +32,9 @@ local object = {
         ScaleFactor = 360,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Brown Dwarfs"
+    GUI = {
+        Path = "/Milky Way/Brown Dwarfs"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 28fd66a121..a482e8674d 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Exoplanets",
+    Identifier = "Exoplanets",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -34,7 +34,9 @@ local object = {
         TextMinSize = 10.0,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Exoplanets"
+    GUI = {
+        Path = "/Milky Way/Exoplanets"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/globularclusters.asset b/data/assets/scene/digitaluniverse/globularclusters.asset
index bd367c4453..95e0505682 100644
--- a/data/assets/scene/digitaluniverse/globularclusters.asset
+++ b/data/assets/scene/digitaluniverse/globularclusters.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Globular Clusters",
+    Identifier = "GlobularClusters",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 10.0,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Globular Clusters"
+    GUI = {
+        Name = "Globular Clusters",
+        Path = "/Milky Way/Globular Clusters"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 05e44b5dfd..50f6319833 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local ecliptic = {
-    Name = "Ecliptic Sphere",
+    Identifier = "EclipticSphere",
     Parent = transforms.SolarSystemBarycenter.Name,
     Renderable = {
         Type = "RenderableSphericalGrid",
@@ -23,11 +23,14 @@ local ecliptic = {
                        -0.09647644,  0.8622859,  0.4971472   , 0.0,
                         0.0       ,  0.0      ,  0.0         , 1.0 }
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Ecliptic Sphere",
+        Path = "/Other/Grids"
+    }
 }
 
 local eclipticLabels = {
-    Name = "Ecliptic Sphere Labels",
+    Identifier = "EclipticSphereLabels",
     Parent = transforms.SolarSystemBarycenter.Name,
     Renderable = {
         Type = "RenderableBillboardsCloud",
@@ -46,11 +49,14 @@ local eclipticLabels = {
             0.0,          0.0,        0.0,          1.0
         }
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Ecliptic Sphere Labels",
+        Path = "/Other/Grids"
+    }
 }
 
 local equatorial = {
-    Name = "Equatorial Sphere",
+    Identifier = "EquatorialSphere",
     Parent = transforms.SolarSystemBarycenter.Name,
     Renderable = {
         Type = "RenderableSphericalGrid",
@@ -63,11 +69,14 @@ local equatorial = {
                        -0.483835  ,  0.7469823,  0.4559838, 0.0,
                         0.0       ,  0.0      ,  0.0      , 1.0 },
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Equatorial Sphere",
+        Path = "/Other/Grids"
+    }
 }
 
 local equatorialLabels = {
-    Name = "Equatorial Sphere Labels",
+    Identifier = "EquatorialSphereLabels",
     Parent = transforms.SolarSystemBarycenter.Name,
     Renderable = {
         Type = "RenderableBillboardsCloud",
@@ -86,11 +95,14 @@ local equatorialLabels = {
             0.0,          0.0,        0.0,          1.0
         }
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Equatorial Sphere Labels",
+        Path = "/Other/Grids"
+    }
 }
 
 local galactic = {
-    Name = "Galactic Sphere",
+    Identifier = "GalacticSphere",
     Parent = transforms.SolarSystemBarycenter.Name,
     Renderable = {
         Type = "RenderableSphericalGrid",
@@ -99,11 +111,14 @@ local galactic = {
         Radius = 9.46377307652E18;
         GridColor = { 0.0, 0.6, 0.6, 0.6}
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Galactic Sphere",
+        Path = "/Other/Grids"
+    }
 }
 
 local galacticLabels = {
-    Name = "Galactic Sphere Labels",
+    Identifier = "GalacticSphereLabels",
     Parent = transforms.SolarSystemBarycenter.Name,
     Renderable = {
         Type = "RenderableBillboardsCloud",
@@ -116,11 +131,14 @@ local galacticLabels = {
         TextMinSize = 5.0,
         Unit = "pc"
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "Galactic Sphere Labels",
+        Path = "/Other/Grids"
+    }
 }
 
 local plane100kly = {
-    Name = "100kly Grid",
+    Identifier = "100klyGrid",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -135,11 +153,14 @@ local plane100kly = {
         TextMinSize = 7.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "100kly Grid",
+        Path = "/Other/Grids"
+    }
 }
 
 local plane1Mly = {
-    Name = "1Mly Grid",
+    Identifier = "1MlyGrid",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -154,11 +175,14 @@ local plane1Mly = {
         TextMinSize = 7.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "1Mly Grid",
+        Path = "/Other/Grids"
+    }
 }
 
 local plane10Mly = {
-    Name = "10Mly Grid",
+    Identifier = "10MlyGrid",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -173,11 +197,14 @@ local plane10Mly = {
         TextMinSize = 7.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "10Mly Grid",
+        Path = "/Other/Grids"
+    }
 }
 
 local plane100Mly = {
-    Name = "100Mly Grid",
+    Identifier = "100MlyGrid",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -192,11 +219,14 @@ local plane100Mly = {
         TextMinSize = 7.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "100Mly Grid",
+        Path = "/Other/Grids"
+    }
 }
 
 local plane20Gly = {
-    Name = "20Gly Grid",
+    Identifier = "20GlyGrid",
     Renderable = {
         Type = "RenderableDUMeshes",
         Enabled = false,
@@ -211,7 +241,10 @@ local plane20Gly = {
         TextMinSize = 7.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Other/Grids"
+    GUI = {
+        Name = "20Gly Grid",
+        Path = "/Other/Grids"
+    }
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, {
diff --git a/data/assets/scene/digitaluniverse/groups.asset b/data/assets/scene/digitaluniverse/groups.asset
index 7a4d5dd1d1..95e63c03d0 100644
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Nearby Galaxy Groups",
+    Identifier = "NearbyGalaxyGroups",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -23,7 +23,10 @@ local object = {
         TextMinSize = 8.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Nearby Galaxy Groups",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/h2regions.asset b/data/assets/scene/digitaluniverse/h2regions.asset
index e053b562ef..61f756ef37 100644
--- a/data/assets/scene/digitaluniverse/h2regions.asset
+++ b/data/assets/scene/digitaluniverse/h2regions.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "HII Regions",
+    Identifier = "HIIRegions",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 2.0,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/HII"
+    GUI = {
+        Name = "HII Regions",
+        Path = "/Milky Way/HII"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset
index d482232f4f..a6c9d28cdc 100644
--- a/data/assets/scene/digitaluniverse/kepler.asset
+++ b/data/assets/scene/digitaluniverse/kepler.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Kepler Planetary Candidates",
+    Identifier = "KeplerPlanetaryCandidates",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -28,7 +28,10 @@ local object = {
         Texture = textures .. "/halo.png",
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Exoplanets"
+    GUI = {
+        Name = "Kepler Planetary Candidates",
+        Path = "/Milky Way/Exoplanets"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/localdwarfs.asset b/data/assets/scene/digitaluniverse/localdwarfs.asset
index 28a1934575..ba1354bb43 100644
--- a/data/assets/scene/digitaluniverse/localdwarfs.asset
+++ b/data/assets/scene/digitaluniverse/localdwarfs.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Local Dwarf Galaxies",
+    Identifier = "LocalDwarfGalaxies",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 7.3,
         Unit = "Mpc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Local Dwarf Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/milkyway.asset b/data/assets/scene/digitaluniverse/milkyway.asset
index a55dca6ede..1d745cc3a2 100644
--- a/data/assets/scene/digitaluniverse/milkyway.asset
+++ b/data/assets/scene/digitaluniverse/milkyway.asset
@@ -24,21 +24,24 @@ local planeSpeck = asset.syncedResource({
 })
 
 local sphere = {
-    Name = "MilkyWay",
+    Identifier = "MilkyWay",
     Renderable = {
         Type = "RenderableSphere",
         Size = 9.2E20,
         Segments = 40,
-        Alpha = 0.4,
+        Opacity = 0.4,
         Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg",
         Orientation = "Inside/Outside",
         FadeOutThreshould = 0.25
     },
-    GuiPath = "/Milky Way/Milky Way"
+    GUI = {
+        Name = "Milky Way",
+        Path = "/Milky Way/Milky Way"
+    }
 }
 
 local plane = {
-    Name = "Milky Way Galaxy Image",
+    Identifier = "MilkyWayGalaxyImage",
     Parent = "Root",
     Renderable = {
         Type = "RenderablePlanesCloud",
@@ -56,7 +59,10 @@ local plane = {
         PlaneMinSize = 5.0,
         Unit = "pc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Milky Way Galaxy Image",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/obassociations.asset b/data/assets/scene/digitaluniverse/obassociations.asset
index ed73e33a3d..4de911b1d5 100644
--- a/data/assets/scene/digitaluniverse/obassociations.asset
+++ b/data/assets/scene/digitaluniverse/obassociations.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "OB Associations",
+    Identifier = "OBAssociations",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 5.76,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/OB Associations"
+    GUI = {
+        Name = "OB Associations",
+        Path = "/Milky Way/OB Associations"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/openclusters.asset b/data/assets/scene/digitaluniverse/openclusters.asset
index f46bb39b33..8bd27ec145 100644
--- a/data/assets/scene/digitaluniverse/openclusters.asset
+++ b/data/assets/scene/digitaluniverse/openclusters.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Open Star Clusters",
+    Identifier = "OpenStarClusters",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 4.5,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Open Clusters"
+    GUI = {
+        Name = "Open Star Clusters",
+        Path = "/Milky Way/Open Clusters"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/planetarynebulae.asset b/data/assets/scene/digitaluniverse/planetarynebulae.asset
index df68d19c1b..f4f55b1b9c 100644
--- a/data/assets/scene/digitaluniverse/planetarynebulae.asset
+++ b/data/assets/scene/digitaluniverse/planetarynebulae.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Planetary Nebulae",
+    Identifier = "PlanetaryNebulae",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 4.5,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Planetary Nebulae"
+    GUI = {
+        Name = "Planetary Nebulae",
+        Path = "/Milky Way/Planetary Nebulae"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/pulsars.asset b/data/assets/scene/digitaluniverse/pulsars.asset
index e91df77306..0eb50d72d0 100644
--- a/data/assets/scene/digitaluniverse/pulsars.asset
+++ b/data/assets/scene/digitaluniverse/pulsars.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Pulsars",
+    Identifier = "Pulsars",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,9 @@ local object = {
         TextMinSize = 4.5,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Pulsars"
+    GUI = {
+        Path = "/Milky Way/Pulsars"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/quasars.asset b/data/assets/scene/digitaluniverse/quasars.asset
index 0db00a9a5f..63020c882c 100644
--- a/data/assets/scene/digitaluniverse/quasars.asset
+++ b/data/assets/scene/digitaluniverse/quasars.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Quasars",
+    Identifier = "Quasars",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -32,7 +32,9 @@ local object = {
         BillboardMaxSize = 30.0,
         BillboardMinSize = 0.0,
     },
-    GuiPath = "/Universe/Quasars"
+    GUI = {
+        Path = "/Universe/Quasars"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/sdss.asset b/data/assets/scene/digitaluniverse/sdss.asset
index 086f53d01b..bf3df4dba7 100644
--- a/data/assets/scene/digitaluniverse/sdss.asset
+++ b/data/assets/scene/digitaluniverse/sdss.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Sloan Digital Sky Survey",
+    Identifier = "SloanDigitalSkySurvey",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -38,7 +38,10 @@ local object = {
         TextMinSize = 10.0,
         TextMaxSize = 50.0
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Sloan Digital Sky Survey",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/starlabels.asset b/data/assets/scene/digitaluniverse/starlabels.asset
index 01fecdbf42..14a536635d 100644
--- a/data/assets/scene/digitaluniverse/starlabels.asset
+++ b/data/assets/scene/digitaluniverse/starlabels.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Stars Labels",
+    Identifier = "StarsLabels",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -24,7 +24,10 @@ local object = {
         TextMaxSize = 50.0,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Name = "Stars Labels",
+        Path = "/Milky Way/Stars"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 939667f169..89bcc82991 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -24,14 +24,16 @@ local colorLUT = asset.syncedResource({
 })
 
 local object = {
-    Name = "Stars",
+    Identifier = "Stars",
     Renderable = {
         Type = "RenderableStars",
         File = speck .. "/stars.speck",
         Texture = textures .. "/halo.png",
         ColorMap = colorLUT .. "/colorbv.cmap"
     },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Path = "/Milky Way/Stars"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/superclusters.asset b/data/assets/scene/digitaluniverse/superclusters.asset
index ec293afce4..cd8afe87fd 100644
--- a/data/assets/scene/digitaluniverse/superclusters.asset
+++ b/data/assets/scene/digitaluniverse/superclusters.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Galaxy Superclusters",
+    Identifier = "GalaxySuperclusters",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -32,7 +32,10 @@ local object = {
         TextMinSize = 8.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Galaxy Superclusters",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/supernovaremnants.asset b/data/assets/scene/digitaluniverse/supernovaremnants.asset
index a0b5592ec8..a010f4e6fa 100644
--- a/data/assets/scene/digitaluniverse/supernovaremnants.asset
+++ b/data/assets/scene/digitaluniverse/supernovaremnants.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Supernova Remnants",
+    Identifier = "SupernovaRemnants",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -33,7 +33,10 @@ local object = {
         TextMinSize = 8.0,
         Unit = "pc"
     },
-    GuiPath = "/Milky Way/Supernova Remnants"
+    GUI = {
+        Name = "Supernova Remnants",
+        Path = "/Milky Way/Supernova Remnants"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index b598194b8b..b1ae788a5d 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -17,7 +17,7 @@ local speck = asset.syncedResource({
 })
 
 local tullyPoints = {
-    Name = "Tully Galaxies",
+    Identifier = "TullyGalaxies",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -46,11 +46,14 @@ local tullyPoints = {
         BillboardMaxSize = 50.0,
         BillboardMinSize = 0.0,
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Tully Galaxies",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 local tullyImages = {
-    Name = "Tully Galaxies Images",
+    Identifier = "TullyGalaxiesImages",
     Renderable = {
         Type = "RenderablePlanesCloud",
         Enabled = false,
@@ -72,7 +75,10 @@ local tullyImages = {
         FadeInDistances = {0.05, 0.1},
         PlaneMinSize = 5.0
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Name = "Tully Galaxies Images",
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/digitaluniverse/voids.asset b/data/assets/scene/digitaluniverse/voids.asset
index f269e46be6..605e2c8a97 100644
--- a/data/assets/scene/digitaluniverse/voids.asset
+++ b/data/assets/scene/digitaluniverse/voids.asset
@@ -10,7 +10,7 @@ local speck = asset.syncedResource({
 })
 
 local object = {
-    Name = "Voids",
+    Identifier = "Voids",
     Renderable = {
         Type = "RenderableBillboardsCloud",
         Enabled = false,
@@ -22,7 +22,9 @@ local object = {
         TextMinSize = 8.0,
         Unit = "Mpc"
     },
-    GuiPath = "/Universe/Galaxies"
+    GUI = {
+        Path = "/Universe/Galaxies"
+    }
 }
 
 
diff --git a/data/assets/scene/milkyway/milkyway/eso.asset b/data/assets/scene/milkyway/milkyway/eso.asset
index cb77f1f655..dcfd30c43b 100644
--- a/data/assets/scene/milkyway/milkyway/eso.asset
+++ b/data/assets/scene/milkyway/milkyway/eso.asset
@@ -10,17 +10,20 @@ local textures = asset.syncedResource({
 })
 
 local object = {
-    Name = "MilkyWay (ESO)",
+    Identifier = "MilkyWay-ESO",
     Renderable = {
         Type = "RenderableSphere",
         Size = 9.2E20,
         Segments = 40,
-        Alpha = 0.4,
+        Opacity = 0.4,
         Texture = textures .. "/eso0932a_blend.png",
         Orientation = "Inside/Outside",
         FadeOutThreshould = 0.01
     },
-    GuiPath = "/Milky Way/Milky Way"
+    GUI = {
+        Name = "Milky Way (ESO)",
+        Path = "/Milky Way/Milky Way"
+    }
 }
 
 
diff --git a/data/assets/scene/milkyway/stars/denver.asset b/data/assets/scene/milkyway/stars/denver.asset
index 8d9e059b4d..86fc3ff621 100644
--- a/data/assets/scene/milkyway/stars/denver.asset
+++ b/data/assets/scene/milkyway/stars/denver.asset
@@ -24,14 +24,17 @@ local colorLUT = asset.syncedResource({
 })
 
 local object = {
-    Name = "Stars (Denver)",
+    Identifier = "Stars-Denver",
     Renderable = {
         Type = "RenderableStars",
         File = speck .. "/denver_stars.speck",
         Texture = textures .. "/halo.png",
         ColorMap = colorLUT .. "/denver_colorbv.cmap"
     },
-    GuiPath = "/Milky Way/Stars"
+    GUI = {
+        Name = "Stars (Denver)",
+        Path = "/Milky Way/Stars"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/dawn/ceres.asset b/data/assets/scene/solarsystem/missions/dawn/ceres.asset
index 8b4d3dea86..119e42b728 100644
--- a/data/assets/scene/solarsystem/missions/dawn/ceres.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/ceres.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })
 
 local Ceres = {
-    Name = "Ceres",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Ceres",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -50,7 +50,9 @@ local Ceres = {
             }
         }
     },
-    GuiPath = "/Solar System/Dwarf Planets/Ceres"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Ceres"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
index 0451842e0a..1c7ab5f19e 100644
--- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset
@@ -617,8 +617,8 @@ local KernelFiles = {
 }
 
 local Dawn = {
-    Name = "Dawn",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Dawn",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -642,13 +642,15 @@ local Dawn = {
         },
         ColorTexture = textures .. "/gray.png"
     },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Path = "/Solar System/Missions/Dawn"
+    }
 }
 
 -- Dawn Solar Array module 1
 local DawnSolarArray1 = {
-    Name = "DawnSolar1",
-    Parent = Dawn.Name,
+    Identifier = "DawnSolar1",
+    Parent = Dawn.Identifier,
     Transformation = {
         Rotation = {
             Type = "SpiceRotation",
@@ -665,13 +667,16 @@ local DawnSolarArray1 = {
         },
         ColorTexture = textures .. "/gray.png"
     },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Solar 1",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }
 
 -- Dawn Solar Array module 2
 local DawnSolarArray2 = {
-    Name = "DawnSolar2",
-    Parent = Dawn.Name,
+    Identifier = "DawnSolar2",
+    Parent = Dawn.Identifier,
     Transformation = {
         Rotation = {
             Type = "SpiceRotation",
@@ -688,12 +693,15 @@ local DawnSolarArray2 = {
         },
         ColorTexture = textures .. "/gray.png"
     },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Solar 2",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }
 
 local DawnTrail = {
-    Name = "DawnTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "DawnTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -711,13 +719,16 @@ local DawnTrail = {
         EnableFade = false,
         Rendering = "Lines+Points"
     },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Trail",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }
 
 -- DawnFov 1
 local DawnFramingCamera1 = {
-    Name = "Dawn_framing_camera_1",
-    Parent = Dawn.Name,
+    Identifier = "Dawn_framing_camera_1",
+    Parent = Dawn.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "DAWN",
@@ -730,12 +741,15 @@ local DawnFramingCamera1 = {
         },
         PotentialTargets = { "VESTA", "CERES" }
     },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Framing Camera 1",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }
 
 local DawnFramingCamera2 = {
-    Name = "Dawn_framing_camera_2",
-    Parent = Dawn.Name,
+    Identifier = "Dawn_framing_camera_2",
+    Parent = Dawn.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "DAWN",
@@ -748,7 +762,10 @@ local DawnFramingCamera2 = {
         },
         PotentialTargets = { "VESTA", "CERES" }
     },
-    GuiPath = "/Solar System/Missions/Dawn"
+    GUI = {
+        Name = "Dawn Framing Camera 2",
+        Path = "/Solar System/Missions/Dawn"
+    }
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, {
diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
index c2789191d7..2279c520a4 100644
--- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset
+++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset
@@ -25,8 +25,8 @@ local models = asset.syncedResource({
 })
 
 local Vesta = {
-    Name = "Vesta",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "Vesta",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -108,12 +108,14 @@ local Vesta = {
             PotentialTargets = { "VESTA" }
         }
     },
-    GuiPath = "/Solar System/Asteroid Belt/Vesta"
+    GUI = {
+        Path = "/Solar System/Asteroid Belt/Vesta"
+    }
 }
 
 local VestaTrail = {
-    Name = "VestaTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "VestaTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -127,7 +129,10 @@ local VestaTrail = {
         Period = 1325.0,
         Resolution = 3600 * 24
     },
-    GuiPath = "/Solar System/Asteroid Belt/Vesta"
+    GUI = {
+        Name = "Vesta Trail",
+        Path = "/Solar System/Asteroid Belt/Vesta"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset
index 13ecb3e085..8919a2235d 100644
--- a/data/assets/scene/solarsystem/missions/juno/juno.asset
+++ b/data/assets/scene/solarsystem/missions/juno/juno.asset
@@ -136,8 +136,8 @@ local RotationMatrix = {
 }
 
 local Juno = {
-    Name = "Juno",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Juno",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -161,12 +161,14 @@ local Juno = {
         ColorTexture =  textures .. "/gray.png",
         ModelTransform = RotationMatrix
     },
-    GuiName = "/Solar System/Missions/Juno"
+    GUI = {
+        Path = "/Solar System/Missions/Juno"
+    }
 }
 
 local JunoTrail = {
-    Name = "JunoTrail",
-    Parent = "JupiterBarycenter",
+    Identifier = "JunoTrail",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -180,7 +182,10 @@ local JunoTrail = {
         EndTime = "2016 DEC 13",
         SampleInterval = 2
     },
-    GuiName = "/Solar System/Missions/Juno"
+    GUI = {
+        Name = "Juno Trail",
+        Path = "/Solar System/Missions/Juno"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
index 66439faaa4..cbfb0391b7 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset
@@ -15,8 +15,8 @@ local textures = asset.syncedResource({
 local charonRadius = 6.035E5
 
 local Charon = {
-    Name = "Charon",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Charon",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -66,12 +66,14 @@ local Charon = {
             }
         }
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local CharonText = {
-    Name = "CharonText",
-    Parent = Charon.Name,
+    Identifier = "CharonText",
+    Parent = Charon.Identifier,
     Transform = {
         Translation = {
             Type = "StaticTranslation",
@@ -86,12 +88,15 @@ local CharonText = {
         Texture = textures .. "/Charon-Text.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Charon Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local CharonShadow = {
-    Name = "CharonShadow",
-    Parent = Charon.Name,
+    Identifier = "CharonShadow",
+    Parent = Charon.Identifier,
     Renderable = {
         Type = "RenderableShadowCylinder",
         TerminatorType = "PENUMBRAL",
@@ -101,12 +106,15 @@ local CharonShadow = {
         BodyFrame = "IAU_CHARON",
         Aberration = "NONE"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Charon Shadow",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local CharonTrail = {
-    Name = "CharonTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "CharonTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -118,7 +126,10 @@ local CharonTrail = {
         Period = 6.38725,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Charon Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
index 88f4827ff2..182639b9ad 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/fov.asset
@@ -9,8 +9,8 @@ local AliceOffset = {   -7.9, -1.7,  8.3  }
 local RexOffset   = {      0,    0,    0  }
 
 local Lorri = {
-    Name = "NH_LORRI",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_LORRI",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -32,12 +32,15 @@ local Lorri = {
             Position = LorriOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "LORRI",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphLeisa = {
-    Name = "NH_RALPH_LEISA",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_LEISA",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -59,12 +62,15 @@ local RalphLeisa = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH LEISA",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicPan1 = {
-    Name = "NH_RALPH_MVIC_PAN1",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_PAN1",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -86,12 +92,15 @@ local RalphMvicPan1 = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC PAN 1",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicPan2 = {
-    Name = "NH_RALPH_MVIC_PAN2",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_PAN2",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -113,12 +122,15 @@ local RalphMvicPan2 = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC PAN 2",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicRed = {
-    Name = "NH_RALPH_MVIC_RED",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_RED",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -140,12 +152,15 @@ local RalphMvicRed = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC RED",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicBlue = {
-    Name = "NH_RALPH_MVIC_BLUE",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_BLUE",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -167,12 +182,15 @@ local RalphMvicBlue = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC BLUE",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicFt = {
-    Name = "NH_RALPH_MVIC_FT",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_FT",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -194,12 +212,15 @@ local RalphMvicFt = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC FT",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicMethane = {
-    Name = "NH_RALPH_MVIC_METHANE",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_METHANE",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -221,12 +242,15 @@ local RalphMvicMethane = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC METHANE",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local RalphMvicNir = {
-    Name = "NH_RALPH_MVIC_NIR",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_RALPH_MVIC_NIR",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -248,12 +272,15 @@ local RalphMvicNir = {
             Position = RalphOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "RALPH MVIC NIR",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local AliceAirglow = {
-    Name = "NH_ALICE_AIRGLOW",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_ALICE_AIRGLOW",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -276,12 +303,15 @@ local AliceAirglow = {
             Position = AliceOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "ALICE AIRGLOW",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local AliceSoc = {
-    Name = "NH_ALICE_SOC",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_ALICE_SOC",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "NEW HORIZONS",
@@ -303,12 +333,15 @@ local AliceSoc = {
             Position = AliceOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "ALICE SOC",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 local Rex = {
-    Name = "NH_REX",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NH_REX",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type  = "RenderableCrawlingLine",
         Source = "NH_REX",
@@ -333,7 +366,10 @@ local Rex = {
             Position = RexOffset
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "REX",
+        Path = "/Solar System/Missions/New Horizons/Instruments"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset
index 3e84d77c43..3f5b5da8cb 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })
 
 local Hydra = {
-    Name = "Hydra",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Hydra",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -34,12 +34,14 @@ local Hydra = {
         },
         ColorTexture = textures .. "/gray.jpg"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local HydraText = {
-    Name = "HydraText",
-    Parent = Hydra.Name,
+    Identifier = "HydraText",
+    Parent = Hydra.Identifier,
     Transform = {
         Translation = {
             Type = "StaticTranslation",
@@ -54,12 +56,15 @@ local HydraText = {
         Texture = textures .. "/Hydra-Text.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Hydra Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local HydraTrail = {
-    Name = "HydraTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "HydraTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -71,7 +76,10 @@ local HydraTrail = {
         Period = 38.20177,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Hydra Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset
index 07298e75b2..e5929a7e7f 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })
 
 local Kerberos = {
-    Name = "Kerberos",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Kerberos",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -38,12 +38,14 @@ local Kerberos = {
         },
         ColorTexture = textures .. "/gray.jpg"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local KerberosText = {
-    Name = "KerberosText",
-    Parent = Kerberos.Name,
+    Identifier = "KerberosText",
+    Parent = Kerberos.Identifier,
     Transform = {
         Translation = {
             Type = "StaticTranslation",
@@ -57,12 +59,15 @@ local KerberosText = {
         Billboard = true,
         Texture = textures .. "/Kerberos-Text.png"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Kerberos Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local KerberosTrail = {
-    Name = "KerberosTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "KerberosTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -74,7 +79,10 @@ local KerberosTrail = {
         Period = 32.16756,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Kerberos Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
index e3b1cdcac0..bd3978f255 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset
@@ -9,8 +9,8 @@ local textures = NewHorizonsModel.NewHorizonsTextures
 local models = NewHorizonsModel.NewHorizonsModels
 
 local Labels = {
-    Name = "Labels",
-    Parent = NewHorizonsModel.NewHorizons.Name,
+    Identifier = "Labels",
+    Parent = NewHorizonsModel.NewHorizons.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "NEW HORIZONS",
@@ -20,7 +20,9 @@ local Labels = {
         }, 
         ColorTexture =  textures .. "/labels.png"
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
index d4286a54db..7b7444e60b 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset
@@ -18,8 +18,8 @@ local models = asset.syncedResource({
 })
 
 local NewHorizons = {
-    Name = "NewHorizons",
-    Parent = transforms.NewHorizonsPosition.Name,
+    Identifier = "NewHorizons",
+    Parent = transforms.NewHorizonsPosition.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "NEW HORIZONS",
@@ -29,7 +29,10 @@ local NewHorizons = {
         }, 
         ColorTexture = textures .. "/NHTexture.jpg"
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "New Horizons",
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset
index be2baf9b8c..20494361e5 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })
 
 local Nix = {
-    Name = "Nix",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Nix",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -24,6 +24,7 @@ local Nix = {
     },
     Renderable = {
         Type = "RenderablePlanet",
+        Body = "NIX",
         Geometry = {
             Type = "SimpleSphere",
             Radius = 0.45E5,
@@ -31,12 +32,14 @@ local Nix = {
         },
         ColorTexture = textures .. "/gray.jpg",
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local NixText = {
-    Name = "NixText",
-    Parent = Nix.Name,
+    Identifier = "NixText",
+    Parent = Nix.Identifier,
     Renderable = {
         Type = "RenderablePlaneImageLocal",
         Size = 10^6.3,
@@ -45,12 +48,15 @@ local NixText = {
         Texture = textures .. "/Nix-Text.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Nix Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local NixTrail = {
-    Name = "NixTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "NixTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -62,7 +68,10 @@ local NixTrail = {
         Period = 24.85463,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Nix Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
index 868e379234..953866302a 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset
@@ -36,8 +36,8 @@ local images = asset.syncedResource({
 local plutoRadius = 1.173E6
 
 local Pluto = {
-    Name = "Pluto",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Pluto",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -178,12 +178,14 @@ local Pluto = {
             }
         }
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local PlutoBarycenterLabel = {
-    Name = "PlutoBarycenterLabel",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "PlutoBarycenterLabel",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderablePlaneImageLocal",
         Billboard = true,
@@ -191,12 +193,15 @@ local PlutoBarycenterLabel = {
         Texture = encounterTextures .. "/barycenter.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Barycenter Label",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local PlutoText = {
-    Name = "PlutoText",
-    Parent = Pluto.Name,
+    Identifier = "PlutoText",
+    Parent = Pluto.Identifier,
     Transform = {
         Translation = {
             Type = "StaticTranslation",
@@ -211,12 +216,15 @@ local PlutoText = {
         Texture = encounterTextures .. "/Pluto-Text.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local PlutoShadow = {
-    Name = "PlutoShadow",
-    Parent = Pluto.Name,
+    Identifier = "PlutoShadow",
+    Parent = Pluto.Identifier,
     Renderable = {
         Type = "RenderableShadowCylinder",
         TerminatorType = "PENUMBRAL", 
@@ -226,12 +234,15 @@ local PlutoShadow = {
         BodyFrame = "IAU_PLUTO",
         Aberration = "NONE",
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Shadow",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local PlutoTrailBarycentric = {
-    Name = "PlutoBarycentricTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "PlutoBarycentricTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -243,12 +254,15 @@ local PlutoTrailBarycentric = {
         Period = 6.38723,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Barycenteric Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local PlutoTrail = {
-    Name = "PlutoTrail",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "PlutoTrail",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Enabled = false,
@@ -263,7 +277,10 @@ local PlutoTrail = {
         Period = 160 * 365.242,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset
index 4d29b3e179..56ed5b9c62 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset
@@ -12,8 +12,8 @@ local textures = asset.syncedResource({
 })
 
 local Styx = {
-    Name = "Styx",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "Styx",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -33,12 +33,14 @@ local Styx = {
         },
         ColorTexture = textures .. "/gray.jpg"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local StyxText = {
-    Name = "StyxText",
-    Parent = Styx.Name,
+    Identifier = "StyxText",
+    Parent = Styx.Identifier,
     Transform = {
         Translation = {
             Type = "StaticTranslation",
@@ -53,12 +55,15 @@ local StyxText = {
         Texture = textures .. "/Styx-Text.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Styx Text",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local StyxTrail = {
-    Name = "StyxTrail",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "StyxTrail",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -70,7 +75,10 @@ local StyxTrail = {
         Period = 20.16155,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Styx Trail",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
index e28ec88c72..a51e11f073 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/trail.asset
@@ -4,8 +4,8 @@ local transforms = asset.require('./transforms')
 
 
 local TrailAtPluto = {
-    Name = "NewHorizonsTrailPluto",
-    Parent = transforms.PlutoBarycenter.Name,
+    Identifier = "NewHorizonsTrailPluto",
+    Parent = transforms.PlutoBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -23,7 +23,10 @@ local TrailAtPluto = {
         EnableFade = false,
         Rendering = "Lines+Points"
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "New Horizons Trail Pluto",
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
index bae78af35f..26c54961f6 100644
--- a/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/newhorizons/transforms.asset
@@ -5,8 +5,8 @@ local kernels = asset.require('./kernels')
 
 
 local PlutoBarycenter = {
-    Name = "PlutoBarycenter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "PlutoBarycenter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -15,12 +15,15 @@ local PlutoBarycenter = {
             Kernels = kernels.PlutoKernels
         },
     },
-    GuiPath = "/Solar System/Dwarf Planets/Pluto"
+    GUI = {
+        Name = "Pluto Barycenter",
+        Path = "/Solar System/Dwarf Planets/Pluto"
+    }
 }
 
 local NewHorizonsPosition = {
-    Name = "NewHorizonsPosition",
-    Parent = PlutoBarycenter.Name,
+    Identifier = "NewHorizonsPosition",
+    Parent = PlutoBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -34,7 +37,10 @@ local NewHorizonsPosition = {
             DestinationFrame = "GALACTIC"
         }
     },
-    GuiPath = "/Solar System/Missions/New Horizons"
+    GUI = {
+        Name = "New Horizons Position",
+        Path = "/Solar System/Missions/New Horizons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
index ee833916e2..a935cc6fcf 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
@@ -22,10 +22,10 @@ local BENNU_BODY = "2101955"
 
 
 local Bennu = {
-    Name = "Bennu",
-    Parent = transforms.BennuBarycenter.Name,
-    Transform = 
-{        Rotation = {
+    Identifier = "Bennu",
+    Parent = transforms.BennuBarycenter.Identifier,
+    Transform = {
+        Rotation = {
             Type = "SpiceRotation",
             SourceFrame = "IAU_BENNU",
             DestinationFrame = "GALACTIC"
@@ -84,12 +84,14 @@ local Bennu = {
             }
         }
     },
-    GuiPath = "/Solar System/Asteroid"
+    GUI = {
+        Path = "/Solar System/Asteroid"
+    }
 }
 
 local BennuTrail = {
-    Name = "BennuTrail",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "BennuTrail",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -102,7 +104,10 @@ local BennuTrail = {
         EndTime = "2023 MAY 31 00:00:00.000",
         SampleInterval = 3600
     },
-    GuiPath = "/Solar System/Asteroid"
+    GUI = {
+        Name = "Bennu Trail",
+        Path = "/Solar System/Asteroid"
+    }
 
 }
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
index b32b59482b..bc611bbf75 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset
@@ -184,8 +184,8 @@ for i = 0, #CaseDependentKernels do
 end
 
 local OsirisRex = {
-    Name = "OsirisRex",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "OsirisRex",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -208,12 +208,15 @@ local OsirisRex = {
         },
         ColorTexture = textures .. "/osirisTex.png"
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }
 
 local PolyCam = {
-    Name = "ORX_OCAMS_POLYCAM",
-    Parent = OsirisRex.Name,
+    Identifier = "ORX_OCAMS_POLYCAM",
+    Parent = OsirisRex.Identifier,
     Transform = {
         Translation = {
             Type = "StaticTranslation",
@@ -234,12 +237,15 @@ local PolyCam = {
         }, 
         ColorTexture = textures .. "/osirisTex.png"
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OCAMS POLYCAM",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }
 
 local Rexis = {
-    Name = "ORX_REXIS",
-    Parent = OsirisRex.Name,
+    Identifier = "ORX_REXIS",
+    Parent = OsirisRex.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "OSIRIS-REX",
@@ -260,12 +266,15 @@ local Rexis = {
             DestinationFrame = "ORX_SPACECRAFT"
         },
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "REXIS",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }
 
 local PolyCamFov = {
-    Name = "POLYCAM FOV",
-    Parent = PolyCam.Name,
+    Identifier = "POLYCAM FOV",
+    Parent = PolyCam.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "OSIRIS-REX",
@@ -278,12 +287,15 @@ local PolyCamFov = {
         },
         PotentialTargets = { BENNU_BODY }
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "POLYCAM FOV",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }
 
 local RexisFov = {
-    Name = "REXIS FOV",
-    Parent = Rexis.Name,
+    Identifier = "REXIS FOV",
+    Parent = Rexis.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "OSIRIS-REX",
@@ -299,7 +311,10 @@ local RexisFov = {
             [BENNU_BODY] = "IAU_BENNU"
         }
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "REXIS FOV",
+        Path = "/Solar System/Missions/OSIRIS REx/Instruments"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
index 147d918cfe..9c331e2000 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/script_schedule.asset
@@ -14,5 +14,5 @@ end)
 
 
 asset.onDeinitialize(function ()
-	openspace.scriptScheduler.clear()
+    openspace.scriptScheduler.clear()
 end)
\ No newline at end of file
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
index e1ca69219a..b156ee96c6 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/trail.asset
@@ -8,8 +8,8 @@ local earthTransforms = asset.require('scene/solarsystem/planets/earth/transform
 local BENNU_BODY = "2101955"
 
 local OsirisRexTrailEarth = {
-    Name = "OsirisRexTrailEarth",
-    Parent = earthTransforms.EarthIAU.Name,
+    Identifier = "OsirisRexTrailEarth",
+    Parent = earthTransforms.EarthIAU.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -23,12 +23,15 @@ local OsirisRexTrailEarth = {
         EndTime = "2016 SEP 9 00:05:00",
         SampleInterval = 60
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx Trail Earth",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }
 
 local OsirisRexTrailSolarSystem = {
-    Name = "OsirisRexTrailSolarSystem",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "OsirisRexTrailSolarSystem",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -41,12 +44,15 @@ local OsirisRexTrailSolarSystem = {
         EndTime = "2023 SEP 24 12:00:00",
         SampleInterval = 3600
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx Trail Solar System",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }
 
 local OsirisRexTrailBennu = {
-    Name = "OsirisRexTrailBennu",
-    Parent = transforms.BennuBarycenter.Name,
+    Identifier = "OsirisRexTrailBennu",
+    Parent = transforms.BennuBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -59,7 +65,10 @@ local OsirisRexTrailBennu = {
         EndTime = "2023 SEP 24 12:00:00",
         SampleInterval = 3600
     },
-    GuiPath = "/Solar System/Missions/OSIRIS REx"
+    GUI = {
+        Name = "OSIRIS REx Trail Bennu",
+        Path = "/Solar System/Missions/OSIRIS REx"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
index 3fe681ae4d..e464ab5e20 100644
--- a/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
+++ b/data/assets/scene/solarsystem/missions/osirisrex/transforms.asset
@@ -6,14 +6,18 @@ local transforms = asset.require('scene/solarsystem/sun/transforms')
 local BENNU_BODY = "2101955"
 
 local BennuBarycenter = {
-    Name = "BennuBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "BennuBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
             Target = BENNU_BODY,
             Observer = "SUN"
         }
+    },
+    GUI = {
+        Name = "Bennu Barycenter",
+        Path = "/Solar System/Missions/OSIRIS REx"
     }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
index 7ebb619172..65739cd7f0 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset
@@ -32,8 +32,8 @@ local imagesTorrent = asset.syncedResource({
 }) .. "/rosettaimages"
 
 local Barycenter = {
-    Name = "67PBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name, 
+    Identifier = "67PBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -41,12 +41,15 @@ local Barycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    GUI = {
+        Name = "67P Barycenter",
+        Path = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    }
 }
 
 local Comet67P = {
-    Name = "67P",
-    Parent = Barycenter.Name,
+    Identifier = "67P",
+    Parent = Barycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -108,12 +111,15 @@ local Comet67P = {
 
         BoundingSphereRadius = 5000.0
     },
-    GuiPath = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    GUI = {
+        Name = "67P Churymov-Gerasimenko",
+        Path = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    }
 }
 
 local Trail67P = {
-    Name = "67PTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "67PTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -126,7 +132,10 @@ local Trail67P = {
         EndTime = "2017 JAN 01 00:00:00.000",
         SampleInterval = 3600
     },
-    GuiPath = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    GUI = {
+        Name = "67P Trail",
+        Path = "/Solar System/Comets/67P Churymov-Gerasimenko"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
index 85a1d50498..1d61cf68bc 100644
--- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
+++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
@@ -82,8 +82,8 @@ local RotationMatrix = {
 }
 
 local Rosetta = {
-    Name = "Rosetta",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Rosetta",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -97,12 +97,14 @@ local Rosetta = {
             DestinationFrame = "GALACTIC"
         }
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaModel = {
-    Name = "RosettaModel",
-    Parent = Rosetta.Name,
+    Identifier = "RosettaModel",
+    Parent = Rosetta.Identifier,
     Transform = {
         Scale = {
             Type = "StaticScale",
@@ -110,12 +112,15 @@ local RosettaModel = {
             Scale = 0.01
         }
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaBlackFoil = {
-    Name = "Rosetta_black_foil",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_black_foil",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -126,12 +131,15 @@ local RosettaBlackFoil = {
         ColorTexture = textures .. "/foil_silver_ramp.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Black Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaBlackParts = {
-    Name = "Rosetta_black_parts",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_black_parts",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -142,12 +150,15 @@ local RosettaBlackParts = {
         ColorTexture = textures .. "/foil_silver_ramp.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Black Parts",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaDish = {
-    Name = "Rosetta_dish",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_dish",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -158,12 +169,15 @@ local RosettaDish = {
         ColorTexture = textures .. "/dish_AO.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Dish",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaParts = {
-    Name = "Rosetta_parts",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_parts",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -174,12 +188,15 @@ local RosettaParts = {
         ColorTexture = textures .. "/parts2_AO.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Parts",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaSilverFoil = {
-    Name = "Rosetta_silver_foil",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_silver_foil",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -190,12 +207,15 @@ local RosettaSilverFoil = {
         ColorTexture = textures .. "/foil_silver_ramp.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Silver Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaVents = {
-    Name = "Rosetta_vents",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_vents",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -206,12 +226,15 @@ local RosettaVents = {
         ColorTexture = textures .. "/tex_01.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Vents",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaWingA = {
-    Name = "Rosetta_wing_a",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_wing_a",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -222,12 +245,15 @@ local RosettaWingA = {
         ColorTexture = textures .. "/tex_01.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Wing A",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaWingB = {
-    Name = "Rosetta_wing_b",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_wing_b",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -238,12 +264,15 @@ local RosettaWingB = {
         ColorTexture = textures .. "/tex_01.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Wing B",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaYellowFoil = {
-    Name = "Rosetta_yellow_foil",
-    Parent = RosettaModel.Name,
+    Identifier = "Rosetta_yellow_foil",
+    Parent = RosettaModel.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -254,12 +283,15 @@ local RosettaYellowFoil = {
         ColorTexture = textures .. "/foil_gold_ramp.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Model Part Yellow Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local Philae = {
-    Name = "Philae",
-    Parent = transforms.Barycenter.Name,
+    Identifier = "Philae",
+    Parent = transforms.Barycenter.Identifier,
     -- This should need a transform, but currently the model is intrinsically
     -- translated
     Transform = {
@@ -280,12 +312,15 @@ local Philae = {
             Scale = 0.01
         }
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local PhilaeFoil = {
-    Name = "Philae_foil",
-    Parent = Philae.Name,
+    Identifier = "Philae_foil",
+    Parent = Philae.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -296,12 +331,15 @@ local PhilaeFoil = {
         ColorTexture = textures .. "/foil_silver_ramp.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Part Foil",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local PhilaeLids = {
-    Name = "Philae_lids",
-    Parent = Philae.Name,
+    Identifier = "Philae_lids",
+    Parent = Philae.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -312,12 +350,15 @@ local PhilaeLids = {
         ColorTexture = textures .. "/parts2_AO.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Part Lids",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local PhilaeParts = {
-    Name = "Philae_parts",
-    Parent = Philae.Name,
+    Identifier = "Philae_parts",
+    Parent = Philae.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -328,12 +369,15 @@ local PhilaeParts = {
         ColorTexture = textures .. "/foil_silver_ramp.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Part Parts",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local PhilaeSolarPanels = {
-    Name = "Philae_solarp",
-    Parent = Philae.Name,
+    Identifier = "Philae_solarp",
+    Parent = Philae.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Body = "ROSETTA",
@@ -344,18 +388,23 @@ local PhilaeSolarPanels = {
         ColorTexture = textures .. "/tex_01.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Model Parts Solar Panels",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local NavCam = {
-    Name = "NAVCAM",
-    Parent = Rosetta.Name,
-    GuiPath = "/Solar System/Missions/Rosetta"
+    Identifier = "NAVCAM",
+    Parent = Rosetta.Identifier,
+    GUI = {
+        Path = "/Solar System/Missions/Rosetta/Instruments"
+    }
 }
 
 local NavCamFov = {
-    Name = "NAVCAM FOV",
-    Parent = NavCam.Name,
+    Identifier = "NAVCAM_FOV",
+    Parent = NavCam.Identifier,
     Renderable = {
         Type  = "RenderableFov",
         Body  = "ROSETTA",
@@ -371,12 +420,15 @@ local NavCamFov = {
             ["CHURYUMOV-GERASIMENKO"] = "67P/C-G_CK"
         }
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "NAVCAM FOV",
+        Path = "/Solar System/Missions/Rosetta/Instruments"
+    }
 }
 
 local ImagePlane = {
-    Name = "ImagePlaneRosetta",
-    Parent = transforms.Comet67P.Name,
+    Identifier = "ImagePlaneRosetta",
+    Parent = transforms.Comet67P.Identifier,
     Renderable = {
         Type = "RenderablePlaneProjection",
         Frame = "67P/C-G_CK",
@@ -386,12 +438,15 @@ local ImagePlane = {
         Moving = false,
         Texture = textures .. "/defaultProj.png"
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Image Plane",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local RosettaCometTrail = {
-    Name = "RosettaCometTrail",
-    Parent = transforms.Barycenter.Name,
+    Identifier = "RosettaCometTrail",
+    Parent = transforms.Barycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -404,12 +459,15 @@ local RosettaCometTrail = {
         EndTime = "2016 SEP 30 12:00:00",
         SampleInterval = 3600
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Rosetta Comet Trail",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 local PhilaeTrail = {
-    Name = "PhilaeTrail",
-    Parent = transforms.Barycenter.Name,
+    Identifier = "PhilaeTrail",
+    Parent = transforms.Barycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -422,7 +480,10 @@ local PhilaeTrail = {
         EndTime = "2014 NOV 12 17:00:00",
         SampleInterval = 2
     },
-    GuiPath = "/Solar System/Missions/Rosetta"
+    GUI = {
+        Name = "Philae Trail",
+        Path = "/Solar System/Missions/Rosetta"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
index 0e72159101..5d8e2392c0 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset
@@ -35,8 +35,8 @@ local RotationMatrix = {
 }
 
 local Voyager1 = {
-    Name = "Voyager 1",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -50,12 +50,15 @@ local Voyager1 = {
             DestinationFrame = "GALACTIC"
         }
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 local Voyager1Main = {
-    Name = "Voyager 1 Main",
-    Parent = Voyager1.Name,
+    Identifier = "Voyager_1_Main",
+    Parent = Voyager1.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Geometry = {
@@ -65,12 +68,15 @@ local Voyager1Main = {
         ColorTexture = models .. "/voyager-main.jpg",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Main",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 local Voyager1Antenna = {
-    Name = "Voyager 1 Antanna",
-    Parent = Voyager1.Name,
+    Identifier = "Voyager_1_Antanna",
+    Parent = Voyager1.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Geometry = {
@@ -80,15 +86,18 @@ local Voyager1Antenna = {
         ColorTexture = models .. "/voyager-antenna.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Antanna",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
     -- The trails are organized as follows.  The cruise phases can be resolved in relatively
     -- low resolution since they are just straight lines
     -- The encounter phases should be much higher resolution or otherwise artifacts would appear
 local VoyagerTrailCruiseEarthJupiter = {
-    Name = "Voyager 1 Trail Cruise Earth-Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Cruise_Earth_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -102,12 +111,15 @@ local VoyagerTrailCruiseEarthJupiter = {
         EndTime = "1979 MAR 04",
         SampleInterval = 545 * 2  -- 545 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Cruise Earth-Jupiter",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 local VoyagerTrailEncounterJupiter = {
-    Name = "Voyager 1 Trail Encounter Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Encounter_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -122,12 +134,15 @@ local VoyagerTrailEncounterJupiter = {
         EndTime = "1979 MAR 09",
         SampleInterval = 100
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Encounter Jupiter",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 local VoyagerTrailCruiseJupiterSaturn = {
-    Name = "Voyager 1 Trail Cruise Jupiter-Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Cruise_Jupiter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -142,12 +157,15 @@ local VoyagerTrailCruiseJupiterSaturn = {
         EndTime = "1980 NOV 11",
         SampleInterval = 618 * 2  -- 618 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Cruise Jupiter-Saturn",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 local VoyagerTrailEncounterSaturn = {
-    Name = "Voyager 1 Trail Encounter Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Encounter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -162,12 +180,15 @@ local VoyagerTrailEncounterSaturn = {
         EndTime = "1980 NOV 16",
         SampleInterval = 100
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Encounter Saturn",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 local VoyagerTrailCruiseSaturnInf = {
-    Name = "Voyager 1 Trail Cruise Saturn-Inf",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_1_Trail_Cruise_Saturn_Inf",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -182,7 +203,10 @@ local VoyagerTrailCruiseSaturnInf = {
         EndTime = "2021 JAN 01",
         SampleInterval = 14656 * 2  -- 14656 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 1"
+    GUI = {
+        Name = "Voyager 1 Trail Cruise Saturn-Inf",
+        Path = "/Solar System/Missions/Voyager 1"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
index 7d8b94a965..192ed5b95a 100644
--- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset
@@ -37,8 +37,8 @@ local RotationMatrix = {
 }
 
 local Voyager2 = {
-    Name = "Voyager 2",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -52,12 +52,15 @@ local Voyager2 = {
             DestinationFrame = "GALACTIC"
         }
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local Voyager2Main = {
-    Name = "Voyager 2 Main",
-    Parent = Voyager2.Name,
+    Identifier = "Voyager_2_Main",
+    Parent = Voyager2.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Geometry = {
@@ -67,12 +70,15 @@ local Voyager2Main = {
         ColorTexture = models .. "/voyager-main.jpg",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Main",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local Voyager2Antenna = {
-    Name = "Voyager 2 Antanna",
-    Parent = Voyager2.Name,
+    Identifier = "Voyager_2_Antanna",
+    Parent = Voyager2.Identifier,
     Renderable = {
         Type = "RenderableModel",
         Geometry = {
@@ -82,15 +88,18 @@ local Voyager2Antenna = {
         ColorTexture = models .. "/voyager-antenna.png",
         ModelTransform = RotationMatrix
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Antanna",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
     -- The trails are organized as follows.  The cruise phases can be resolved in relatively
     -- low resolution since they are just straight lines
     -- The encounter phases should be much higher resolution or otherwise artifacts would appear
 local VoyagerTrailCruiseEarthJupiter = {
-    Name = "Voyager 2 Trail Cruise Earth-Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Earth_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -104,12 +113,15 @@ local VoyagerTrailCruiseEarthJupiter = {
         EndTime = "1979 JUL 06",
         SampleInterval = 669 * 2  -- 669 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Earth-Jupiter",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailEncounterJupiter = {
-    Name = "Voyager 2 Trail Encounter Jupiter",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Jupiter",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -124,12 +136,15 @@ local VoyagerTrailEncounterJupiter = {
         EndTime = "1979 JUL 15",
         SampleInterval = 100
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Jupiter",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailCruiseJupiterSaturn = {
-    Name = "Voyager 2 Trail Cruise Jupiter-Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Jupiter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -144,12 +159,15 @@ local VoyagerTrailCruiseJupiterSaturn = {
         EndTime = "1981 AUG 23",
         SampleInterval = 770 * 2  -- 770 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Jupiter-Saturn",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailEncounterSaturn = {
-    Name = "Voyager 2 Trail Encounter Saturn",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Saturn",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -164,12 +182,15 @@ local VoyagerTrailEncounterSaturn = {
         EndTime = "1981 AUG 30",
         SampleInterval = 100
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Saturn",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailSaturnUranus = {
-    Name = "Voyager 2 Trail Cruise Saturn-Uranus",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Saturn_Uranus",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -184,12 +205,15 @@ local VoyagerTrailSaturnUranus = {
         EndTime = "1986 JAN 22",
         SampleInterval = 1971  * 2  -- 1971 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Saturn-Uranus",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailEncounterUranus = {
-    Name = "Voyager 2 Trail Encounter Uranus",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Uranus",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -204,12 +228,15 @@ local VoyagerTrailEncounterUranus = {
         EndTime = "1986 JAN 27",
         SampleInterval = 100
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Uranus",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailCruiseUranusNeptune = {
-    Name = "Voyager 2 Trail Cruise Uranus-Neptune",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Uranus_Neptune",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -224,12 +251,15 @@ local VoyagerTrailCruiseUranusNeptune = {
         EndTime = "1989 AUG 24",
         SampleInterval = 1305  * 2  -- 1305 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Uranus-Neptune",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailEncounterNeptune = {
-    Name = "Voyager 2 Trail Encounter Neptune",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Encounter_Neptune",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -244,12 +274,15 @@ local VoyagerTrailEncounterNeptune = {
         EndTime = "1989 AUG 26",
         SampleInterval = 100
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Encounter Neptune",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 local VoyagerTrailCruiseNeptuneInf = {
-    Name = "Voyager 2 Trail Cruise Neptune-Inf",
-    Parent = sunTransforms.SolarSystemBarycenter.Name,
+    Identifier = "Voyager_2_Trail_Cruise_Neptune_Inf",
+    Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
         Translation = {
@@ -264,7 +297,10 @@ local VoyagerTrailCruiseNeptuneInf = {
         EndTime = "2021 JAN 01",
         SampleInterval = 11451 * 2  -- 11451 is the number of days between the Start and End time
     },
-    GuiPath = "/Solar System/Missions/Voyager 2"
+    GUI = {
+        Name = "Voyager 2 Trail Cruise Neptune-Inf",
+        Path = "/Solar System/Missions/Voyager 2"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
index b13c8f677b..641e3a0759 100644
--- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
@@ -6,28 +6,28 @@ local assetHelper = asset.require('util/asset_helper')
 -- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 }
 local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }
 local Atmosphere = {
-    Name = "EarthAtmosphere",
-    Parent = transforms.Earth.Name,
+    Identifier = "EarthAtmosphere",
+    Parent = transforms.Earth.Identifier,
     Renderable = {
         Type = "RenderableAtmosphere",
         Atmosphere = {
-          -- Atmosphere radius in Km
-          AtmosphereRadius = 6447.0,
-          PlanetRadius    = 6377.0,
-          PlanetAverageGroundReflectance = 0.1,
-          GroundRadianceEmittion = 0.6,
-          Rayleigh = {
-            Coefficients = {
-              -- Wavelengths are given in 10^-9m
-              Wavelengths = { 680, 550, 440 },
-              -- Reflection coefficients are given in km^-1
-              Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 },
-              -- In Rayleigh scattering, the coefficients of absorption and scattering are the same.
+            -- Atmosphere radius in Km
+            AtmosphereRadius = 6447.0,
+            PlanetRadius    = 6377.0,
+            PlanetAverageGroundReflectance = 0.1,
+            GroundRadianceEmittion = 0.6,
+            Rayleigh = {
+              Coefficients = {
+                -- Wavelengths are given in 10^-9m
+                Wavelengths = { 680, 550, 440 },
+                -- Reflection coefficients are given in km^-1
+                Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 },
+                -- In Rayleigh scattering, the coefficients of absorption and scattering are the same.
+              },
+              -- Thichkness of atmosphere if its density were uniform, in Km
+              H_R = 8.0
             },
-            -- Thichkness of atmosphere if its density were uniform, in Km
-            H_R = 8.0
-          },
-          --[[
+            --[[
               Ozone = {
               Coefficients = {
                 -- Extinction coefficients 
@@ -93,7 +93,10 @@ local Atmosphere = {
             --Caster2 = { Name = "Independency Day Ship", Radius = 0.0, }
          }
     },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Atmosphere",
+        Path = "/Solar System/Planets/Earth"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index d7e8c4f6e3..5ed01f4bfd 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -10,21 +10,24 @@ local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }
 local mapServiceConfigsPath = asset.localResource("map_service_configs")
 
 local Earth = {
-    Name = "Earth",
-    Parent = transforms.EarthIAU.Name,
+    Identifier = "Earth",
+    Parent = transforms.EarthIAU.Identifier,
     Renderable = {
         Type = "RenderableGlobe",
         Radii = earthEllipsoid,
         SegmentsPerPatch = 64,
+        PerformShading = false,
         Layers = {
             ColorLayers = {
                 {
+                    Identifier = "ESRI_VIIRS_Combo",
                     Name = "ESRI VIIRS Combo",
                     Type = "ByLevelTileLayer",
                     LevelTileProviders = {
                         {
                             MaxLevel = 4,
                             TileProvider = {
+                                Identifier = "Temporal_VIIRS_SNPP",
                                 Name = "Temporal VIIRS SNPP",
                                 Type = "TemporalTileLayer",
                                 FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -41,6 +44,7 @@ local Earth = {
                         {
                             MaxLevel = 22,
                             TileProvider = {
+                                Identifier = "ESRI_World_Imagery",
                                 Name = "ESRI World Imagery",
                                 FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms",
                                 PadTiles = false
@@ -50,20 +54,24 @@ local Earth = {
                     Enabled = true,
                     PadTiles = false,
                     Fallback = {
+                        Identifier = "Blue_Marble",
                         Name = "Blue Marble",
                         FilePath = texturesPath .. "/earth_bluemarble.jpg",
                         Enabled = true
                     }
                 },
                 {
+                    Identifier = "ESRI_World_Imagery",
                     Name = "ESRI World Imagery",
                     FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms"
                 },
                 {
+                    Identifier = "ESRI_Imagery_World_2D",
                     Name = "ESRI Imagery World 2D",
                     FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms"
                 },
                 {
+                    Identifier = "VIIRS_SNPP_Temporal",
                     Name = "VIIRS SNPP (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -76,6 +84,7 @@ local Earth = {
                     )
                 },
                 {
+                    Identifier = "Aqua_Modis_Temporal",
                     Name = "Aqua Modis (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -88,6 +97,7 @@ local Earth = {
                     )
                 },
                 {
+                    Identifier = "Terra_Modis_Temporal",
                     Name = "Terra Modis (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -100,11 +110,12 @@ local Earth = {
                     )
                 },
                 {
-                    Name = "BMNG",
+                    Identifier = "BMNG",
                     FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms"
                 },
                 {
-                    Name = "AMSR2_GCOM_W1_Sea_Ice_Concentration (Temporal)",
+                    Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal",
+                    Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
                         "AMSR2_Sea_Ice_Concentration_12km",
@@ -116,7 +127,8 @@ local Earth = {
                     )
                 },
                 {
-                    Name = "MODIS_Terra_Chlorophyll_A (Temporal)",
+                    Identifier = "MODIS_Terra_Chlorophyll_A_Temporal",
+                    Name = "MODIS Terra Chlorophyll A (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
                         "MODIS_Terra_Chlorophyll_A",
@@ -128,7 +140,8 @@ local Earth = {
                     )
                 },
                 {
-                    Name = "GHRSST_L4_G1SST_Sea_Surface_Temperature (Temporal)",
+                    Identifier = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal",
+                    Name = "GHRSST L4 G1SST Sea Surface Temperature (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
                         "GHRSST_L4_G1SST_Sea_Surface_Temperature",
@@ -142,26 +155,19 @@ local Earth = {
             },
             NightLayers = {
                 {
+                    Identifier = "Earth_at_Night_2012",
                     Name = "Earth at Night 2012",
                     FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms",
                     Enabled = true,
-                    Settings = {
-                        Opacity = 1.0,
-                        Gamma = 1.5,
-                        Multiplier = 15.0
-                    },
                     Fallback = {
+                        Identifier = "Earth_Night",
                         Name = "Earth Night",
                         FilePath = texturesPath .. "/earth_night.jpg",
                         Enabled = true,
-                        Settings = {
-                            Opacity = 1.0,
-                            Gamma = 1.5,
-                            Multiplier = 15.0
-                        },
                     }
                 },
                 {
+                    Identifier = "Earth_at_Night_Temporal",
                     Name = "Earth at Night (Temporal)",
                     Type = "TemporalTileLayer",
                     FilePath = openspace.globebrowsing.createTemporalGibsGdalXml(
@@ -176,33 +182,38 @@ local Earth = {
             },
             WaterMasks = {
                 {
-                    Name = "MODIS_Water_Mask",
+                    Identifier = "MODIS_Water_Mask",
+                    Name = "MODIS Water Mask",
                     FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms",
                     Enabled = true
                 },
                 {
-                    Name = "GEBCO",
+                    Identifier = "GEBCO",
                     FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms"
                 }
             },
             Overlays = {
                 {
-                    Name = "Coastlines",
+                    Identifier = "Coastlines",
                     FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms"
                 },
                 {
-                    Name = "Reference_Features",
+                    Identifier = "Reference_Features",
+                    Name = "Reference Features",
                     FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms"
                 },
                 {
-                    Name = "Reference_Labels",
+                    Identifier = "Reference_Labels",
+                    Name = "Reference Labels",
                     FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms"
                 },
                 {
+                    Identifier = "Tile_Indices",
                     Name = "Tile Indices",
                     Type = "TileIndexTileLayer"
                 },
                 {
+                    Identifier = "Size_Reference",
                     Name = "Size Reference",
                     Type = "SizeReferenceTileLayer",
                     Radii = earthEllipsoid
@@ -210,6 +221,7 @@ local Earth = {
             },
             HeightLayers = {
                 {
+                    Identifier = "Terrain_tileset",
                     Name = "Terrain tileset",
                     FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms",
                     Enabled = true,
@@ -224,7 +236,9 @@ local Earth = {
         }
     },
     Tag = { "planet_solarSystem", "planet_terrestrial" },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Path = "/Solar System/Planets/Earth"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset
index ffb25ffb8a..beeaa55e27 100644
--- a/data/assets/scene/solarsystem/planets/earth/markers.asset
+++ b/data/assets/scene/solarsystem/planets/earth/markers.asset
@@ -5,8 +5,8 @@ local texturesPath = asset.require('./earth_textures').TexturesPath
 
 
 local EarthMarker = {
-    Name = "EarthMarker",
-    Parent = transforms.EarthIAU.Name,
+    Identifier = "EarthMarker",
+    Parent = transforms.EarthIAU.Identifier,
     Renderable = {
         Type = "RenderablePlaneImageLocal",
         Enabled = false,
@@ -16,7 +16,10 @@ local EarthMarker = {
         Texture = texturesPath .. "/marker.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Marker",
+        Path = "/Solar System/Planets/Earth"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index ed249c903c..44692f8ca3 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -10,8 +10,8 @@ asset.request('./trail')
 local mapServiceConfigs = asset.localResource("map_service_configs")
 
 local Moon = {
-    Name = "Moon",
-    Parent = transforms.EarthBarycenter.Name,
+    Identifier = "Moon",
+    Parent = transforms.EarthBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -32,28 +32,31 @@ local Moon = {
             ColorLayers = {
                 -- Utah based servers
                 {
-                    Name = "ClemUvvis",
+                    Identifier = "ClemUvvis",
+                    Name = "Clem Uvvis",
                     FilePath = mapServiceConfigs .. "/Utah/ClemUvvis.wms"
                 },
                 {
-                    Name = "Kaguya",
+                    Identifier = "Kaguya",
                     FilePath = mapServiceConfigs .. "/Utah/Kaguya.wms"
                 },
                 {
+                    Identifier = "WAC_Utah",
                     Name = "WAC Utah",
                     FilePath = mapServiceConfigs .. "/Utah/Wac.wms",
                     Enabled = true
                 },
                 -- LMMP based servers
                 {
-                    Name = "OnMoon",
+                    Identifier = "OnMoon",
                     FilePath = mapServiceConfigs .. "/OnMoonColor.wms"
                 }
             },
             HeightLayers = {
                 -- Utah based servers
                 {
-                    Name = "LolaDem",
+                    Identifier = "LolaDem",
+                    Name = "WAC [Utah]",
                     FilePath = mapServiceConfigs .. "/Utah/LolaDem.wms",
                     Enabled = true,
                     TilePixelSize = 64,
@@ -72,7 +75,9 @@ local Moon = {
             }
         }
     },
-    GuiPath = "/Solar System/Planets/Earth/Moon"
+    GUI = {
+        Path = "/Solar System/Planets/Earth/Moon"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
index b82b2cb143..fe707fff53 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/trail.asset
@@ -5,8 +5,8 @@ asset.require('spice/base')
 
 
 local MoonTrail = {
-    Name = "MoonTrail",
-    Parent = transforms.EarthBarycenter.Name,
+    Identifier = "MoonTrail",
+    Parent = transforms.EarthBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -18,7 +18,10 @@ local MoonTrail = {
         Period =  27,
         Resolution = 1000
     },
-    GuiPath = "/Solar System/Planets/Earth/Moon"
+    GUI = {
+        Name = "Moon Trail",
+        Path = "/Solar System/Planets/Earth/Moon"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
new file mode 100644
index 0000000000..734a0c2a75
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/amateur.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Amateur Radio",
+    Url = "http://www.celestrak.com/NORAD/elements/amateur.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
new file mode 100644
index 0000000000..d914346b3e
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/experimental.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Experimental",
+    Url = "http://www.celestrak.com/NORAD/elements/x-comm.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
new file mode 100644
index 0000000000..a4af6800e8
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/geostationary.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Geostationary",
+    Url = "http://celestrak.com/NORAD/elements/geo.txt",
+    TrailColor = { 0.9, 0.9, 0.0 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
new file mode 100644
index 0000000000..743df69502
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/globalstar.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "GlobalStar",
+    Url = "http://www.celestrak.com/NORAD/elements/globalstar.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
new file mode 100644
index 0000000000..b3a28b5644
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/gorizont.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Gorizont",
+    Url = "http://www.celestrak.com/NORAD/elements/gorizont.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
new file mode 100644
index 0000000000..ff2ced1cee
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/intelsat.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Intelsat",
+    Url = "http://www.celestrak.com/NORAD/elements/intelsat.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
new file mode 100644
index 0000000000..860fb7b4eb
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Iridium",
+    Url = "http://www.celestrak.com/NORAD/elements/iridium.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
new file mode 100644
index 0000000000..a58ef236a6
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/iridium_next.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Iridium NEXT",
+    Url = "http://www.celestrak.com/NORAD/elements/iridium-NEXT.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
new file mode 100644
index 0000000000..57028fd4f0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/molniya.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Molniya",
+    Url = "http://www.celestrak.com/NORAD/elements/molniya.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
new file mode 100644
index 0000000000..2897921252
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/orbcomm.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Orbcomm",
+    Url = "http://www.celestrak.com/NORAD/elements/orbcomm.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
new file mode 100644
index 0000000000..0968d8f30a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/other_comm.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Other comm",
+    Url = "http://www.celestrak.com/NORAD/elements/other-comm.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
new file mode 100644
index 0000000000..7133629c93
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/raduga.asset
@@ -0,0 +1,24 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Raduga",
+    Url = "http://www.celestrak.com/NORAD/elements/raduga.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
new file mode 100644
index 0000000000..fc6e0461bb
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/communications/ses.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "SES",
+    Url = "http://www.celestrak.com/NORAD/elements/ses.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
new file mode 100644
index 0000000000..755dbdc921
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_breezem.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Breeze-M Breakup",
+    Url = "http://www.celestrak.com/NORAD/elements/2012-044.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
new file mode 100644
index 0000000000..e7d80fa019
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_fengyun.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Fengyun Debris",
+    Url = "http://www.celestrak.com/NORAD/elements/1999-025.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
new file mode 100644
index 0000000000..603d15b12b
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_iridium33.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Iridium 33 Debris",
+    Url = "http://www.celestrak.com/NORAD/elements/iridium-33-debris.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
new file mode 100644
index 0000000000..847047bf67
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/debris/debris_kosmos2251.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Kosmos 2251 Debris",
+    Url = "http://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt",
+    TrailColor = { 0.25, 0.35, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
new file mode 100644
index 0000000000..dd3c90564d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/brightest.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "100 Brightest",
+    Url = "http://www.celestrak.com/NORAD/elements/visual.txt",
+    TrailColor = { 0.55, 0.25, 0.65 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
new file mode 100644
index 0000000000..b780584955
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/cubesats.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "CubeSat",
+    Url = "http://www.celestrak.com/NORAD/elements/cubesat.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
new file mode 100644
index 0000000000..0b0f7f05ef
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/military.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Military",
+    Url = "http://www.celestrak.com/NORAD/elements/military.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
new file mode 100644
index 0000000000..8e66e3d36d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/other.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Other",
+    Url = "http://www.celestrak.com/NORAD/elements/other.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
new file mode 100644
index 0000000000..bccc163bde
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/radar.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Radar Calibration",
+    Url = "http://www.celestrak.com/NORAD/elements/radar.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
new file mode 100644
index 0000000000..b16833dde5
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/spacestations.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "SpaceStations",
+    Url = "http://celestrak.com/NORAD/elements/stations.txt",
+    TrailColor = { 0.9, 0.0, 0.0 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
new file mode 100644
index 0000000000..79edd04285
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tle-new.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Last 30 Days",
+    Url = "http://www.celestrak.com/NORAD/elements/tle-new.txt",
+    TrailColor = { 0.65, 0.25, 0.45 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
new file mode 100644
index 0000000000..194b84b0ce
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/beidou.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Beidou",
+    Url = "http://www.celestrak.com/NORAD/elements/beidou.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, true)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
new file mode 100644
index 0000000000..24296abcd6
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/galileo.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Galileo",
+    Url = "http://www.celestrak.com/NORAD/elements/galileo.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
new file mode 100644
index 0000000000..6442b71d53
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/glosnass.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Glosnass",
+    Url = "http://www.celestrak.com/NORAD/elements/glo-ops.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
new file mode 100644
index 0000000000..b58801b01c
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/gps.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "GPS",
+    Url = "http://celestrak.com/NORAD/elements/gps-ops.txt",
+    TrailColor = { 0.9, 0.5, 0.0 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
new file mode 100644
index 0000000000..1a279f5f78
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/musson.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Russian LEO Navigation",
+    Url = "http://www.celestrak.com/NORAD/elements/musson.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
new file mode 100644
index 0000000000..fa001847a2
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/nnss.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Navy Navigation Satellite System",
+    Url = "http://www.celestrak.com/NORAD/elements/nnss.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
new file mode 100644
index 0000000000..c7f7b6401d
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/navigation/sbas.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Satellite Based Augmentation System",
+    Url = "http://www.celestrak.com/NORAD/elements/sbas.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset
index 6b498b155a..44c81c4ef8 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset
@@ -1,179 +1 @@
-local transforms = asset.require('../transforms')
-local assetHelper = asset.require('util/asset_helper')
-
--- Waiting for URL based download
-
---[[
-DOWNLOAD = false
-
-function dirListing(dirname)
-  f = io.popen('ls ' .. dirname)
-  files = {}
-  for name in f:lines() do
-    table.insert(files, name)
-  end
-  return files
-end
-
-function values(t)
-  local i = 0
-  return function () i = i + 1; return t[i] end
-end
-
-function trimString(s)
-  s = s:gsub("^%s*(.-)%s*$", "%1")
-  s = s:gsub("%s+", "_")
-  s = s:gsub("[%-()]", "")
-  return s
-end
-
-function getPeriodFromFile(line2)
-  return tonumber(string.sub(line2, 53, 63))
-end
-
-function getNumLinesInFile(filename)
-  local ctr = 0
-  for _ in io.lines(filename) do
-    ctr = ctr + 1
-  end
-  return ctr
-end
-
-function isEmpty(s)
-  return s == nil or s == ''
-end
-
---Check format of a set of 3 TLE file lines and return nonzero if there is a format error
-function checkTleFileFormat(lineArr)
-  if isEmpty(lineArr[1]) or isEmpty(lineArr[2]) or isEmpty(lineArr[3]) then
-    return -1
-  end
-  if string.sub(lineArr[2], 1, 2) ~= "1 " then
-    return -1
-  end
-  if string.sub(lineArr[3], 1, 2) ~= "2 " then
-    return -1
-  end
-  return 0
-end
-
-
-function  getSat(title, file, lineNum)
-  return {
-      Name = title,
-      Parent = "EarthInertial",
-      Renderable = {
-          Type = "RenderablePlaneImageLocal",
-          Size = 3e4,
-          Origin = "Center",
-          Body = "TLE",
-          Billboard = true,
-          Texture = "satB.png"
-      },
-      Transform = {
-          Translation = {
-              Type = "TLETranslation",
-              Body = title,
-              Observer = "EarthInertial",
-              File = file,
-              LineNum = lineNum
-          },
-          Scale = {
-              Type = "StaticScale",
-              Scale = 1,
-          }
-      },
-      GuiPath = "/Solar System/Planets/Earth/Satellites"
-  }
-end
-
-function getSatTrail(title, file, lineNum, per, color)
-  trailName = title .. "_trail"
-
-  return {
-      Name = trailName,
-      Parent = "EarthInertial",
-      Renderable = {
-          Type = "RenderableTrailOrbit",
-          Translation = {
-              Type = "TLETranslation",
-              Body = title,
-              Observer = "EarthInertial",
-              File = file,
-              LineNum = lineNum
-          },
-          Color = color,
-          Period = per,
-          Resolution = 160
-      },
-      GuiPath = "/Solar System/Planets/Earth/Satellites"
-  }
-end
-
--------------------------------------------------------------
---Name, URL, and color scheme for each satellite group
-satelliteGroups = {
-    { title = "GPS",
-      url = "http://celestrak.com/NORAD/elements/gps-ops.txt",
-      trailColor = {0.9, 0.5, 0.0}
-    },
-    { title = "SpaceStations",
-      url = "http://celestrak.com/NORAD/elements/stations.txt",
-      trailColor = {0.9, 0.0, 0.0}
-    },
-    { title = "Geostationary",
-      url = "http://celestrak.com/NORAD/elements/geo.txt",
-      trailColor = {0.9, 0.9, 0.0}
-    },
-}
-
-modElements = {}  
-fileErr = ""
-for sOrbit in values(satelliteGroups) do
-  filename = sOrbit.url:match("([^/]+)$")
-  filenameSansExt = filename:gsub(filename:match "(%.%w+)$", "")
-  sOrbit.path = "satellites/tle/" .. filename
- 
-  if DOWNLOAD then
-    openspace.downloadFile(sOrbit.url, sOrbit.path)
-  end
-  sOrbit.path = "../" .. sOrbit.path
-  pathFromScenegraphParent = "./" .. sOrbit.path
-  
-  line = {} 
-  myfile = io.open(sOrbit.path, "r")
-  lines = getNumLinesInFile(sOrbit.path)
-  --now loop through the tle file and get each set of 3 lines
-  if myfile then
-    for n=1,lines,3 do
-      line[1] = myfile:read('*l') --title line
-      line[2] = myfile:read('*l')
-      line[3] = myfile:read('*l')
-      if( checkTleFileFormat(line) == 0 ) then
-        title = trimString(line[1])
-        per = getPeriodFromFile(line[3])
-        per = 1.0 / per * 2 --trail for 2x a single revolution
-        table.insert(modElements, getSat(filenameSansExt .. "_" .. title, pathFromScenegraphParent, n))
-        table.insert(modElements, getSatTrail(filenameSansExt .. "_" .. title,
-                     pathFromScenegraphParent, n, per, sOrbit.trailColor))
-      else
-        fileErr = " TLE file syntax error on line " .. n .. ": " .. sOrbit.path
-        break
-      end
-    end
-  else
-    fileErr = " File not found: " .. sOrbit.path
-    break
-  end
-end
-assert(fileErr == "", fileErr)
-
-
-if (fileErr == "") then
-  return modElements
-else
-  return "Invalid file: " .. fileErr
-end
-
-
-]]
\ No newline at end of file
+asset.request('./satellites_interesting')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset
new file mode 100644
index 0000000000..cb663ed946
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset
@@ -0,0 +1,8 @@
+asset.request('./satellites_communications')
+-- The debris contains a **lot** of nodes, so we disable it on default
+-- asset.request('./satellites_debris')
+asset.request('./satellites_interesting')
+asset.request('./satellites_misc')
+asset.request('./satellites_navigation')
+asset.request('./satellites_science')
+asset.request('./satellites_weather')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset
new file mode 100644
index 0000000000..78080e6557
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset
@@ -0,0 +1,13 @@
+asset.request('./communications/geostationary')
+asset.request('./communications/intelsat')
+asset.request('./communications/ses')
+asset.request('./communications/iridium')
+asset.request('./communications/iridium_next')
+asset.request('./communications/orbcomm')
+asset.request('./communications/globalstar')
+asset.request('./communications/amateur')
+asset.request('./communications/experimental')
+asset.request('./communications/other_comm')
+asset.request('./communications/gorizont')
+asset.request('./communications/raduga')
+asset.request('./communications/molniya')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
new file mode 100644
index 0000000000..e4902c1725
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset
@@ -0,0 +1,4 @@
+asset.request('./debris/debris_breezem')
+asset.request('./debris/debris_fengyun')
+asset.request('./debris/debris_iridium33')
+asset.request('./debris/debris_kosmos2251')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
new file mode 100644
index 0000000000..230ded9c65
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_interesting.asset
@@ -0,0 +1,5 @@
+asset.request('./misc/brightest')
+asset.request('./communications/geostationary')
+asset.request('./navigation/gps')
+asset.request('./misc/spacestations')
+asset.request('./misc/tle-new')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset
new file mode 100644
index 0000000000..117ad486e8
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset
@@ -0,0 +1,4 @@
+asset.request('./misc/military')
+asset.request('./misc/radar')
+asset.request('./misc/cubesats')
+asset.request('./misc/other')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset
new file mode 100644
index 0000000000..2707ea06b4
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset
@@ -0,0 +1,7 @@
+asset.request('./navigation/beidou')
+asset.request('./navigation/galileo')
+asset.request('./navigation/glosnass')
+asset.request('./navigation/gps')
+asset.request('./navigation/musson')
+asset.request('./navigation/nnss')
+asset.request('./navigation/sbas')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset
new file mode 100644
index 0000000000..8e8d0a3e0f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset
@@ -0,0 +1,4 @@
+asset.request('./science/spaceearth')
+asset.request('./science/geodetic')
+asset.request('./science/engineering')
+asset.request('./science/education')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_shared.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_shared.asset
new file mode 100644
index 0000000000..7bd1566701
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_shared.asset
@@ -0,0 +1,169 @@
+local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
+
+local satImageFolder = asset.syncedResource({
+    Name = "Satellite Image Files",
+    Type = "HttpSynchronization",
+    Identifier = "tle_satellites_images",
+    Version = 1
+})
+
+function downloadTLEFile(sceneAsset, url, name)
+    local identifier = name
+    identifier = identifier:gsub(" ", "")
+    identifier = identifier:gsub("&", "")
+    identifier = identifier:gsub("-", "")
+    return sceneAsset.syncedResource({
+        Name = "Satellite TLE Data (" .. name .. ")",
+        Type = "UrlSynchronization",
+        Identifier = "satellite_tle_data_" .. identifier,
+        Url = url
+    })
+end
+
+local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
+    function numLinesInFile(filename)
+        local ctr = 0
+        for _ in io.lines(filename) do ctr = ctr + 1 end
+        return ctr
+    end
+
+    -- Check format of a set of 3 TLE file lines and return nonzero if there is a format error
+    function isValidTLEFileFormat(lineArr)
+        function isEmpty(s) return s == nil or s == '' end
+
+        if isEmpty(lineArr[1]) or isEmpty(lineArr[2]) or isEmpty(lineArr[3]) then
+            return false
+        end
+        if string.sub(lineArr[2], 1, 2) ~= "1 " then
+            return false
+        end
+        if string.sub(lineArr[3], 1, 2) ~= "2 " then
+            return false
+        end
+        return true
+    end
+
+    function getSat(title, file, lineNum, textureFile, group)
+        return {
+            Identifier = title,
+            Parent = transforms.EarthInertial.Identifier,
+            Renderable = {
+                Type = "RenderablePlaneImageLocal",
+                Enabled = false,
+                Size = 3e4,
+                Origin = "Center",
+                Body = "TLE",
+                Billboard = true,
+                Texture = textureFile
+            },
+            Transform = {
+                Translation = {
+                    Type = "TLETranslation",
+                    Body = title,
+                    Observer = transforms.EarthInertial.Identifier,
+                    File = file,
+                    LineNumber = lineNum
+                },
+                Scale = {
+                    Type = "StaticScale",
+                    Scale = 1
+                }
+            },
+            Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_marker" },
+            GUI = {
+                Path = "/Solar System/Planets/Earth/Satellites"
+            }
+        }
+    end
+
+    function getSatTrail(title, file, lineNum, per, color, group)
+        return {
+            Identifier = title .. "_trail",
+            Parent = transforms.EarthInertial.Identifier,
+            Renderable = {
+                Type = "RenderableTrailOrbit",
+                Translation = {
+                    Type = "TLETranslation",
+                    Body = title,
+                    Observer = transforms.EarthInertial.Identifier,
+                    File = file,
+                    LineNumber = lineNum
+                },
+                Color = color,
+                Period = per,
+                Resolution = 160
+            },
+            Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_trail"},
+            GUI = {
+                Path = "/Solar System/Planets/Earth/Satellites"
+            }
+        }
+    end
+
+
+    local filename = group.Url:match("([^/]+)$")
+    local filenameSansExt = filename:gsub(filename:match("(%.%w+)$"), "")
+
+    local path = tleFolder .. "/" .. filename
+    local texture = satImageFolder .. "/" .. "satB.png"
+
+
+    local file = io.open(path, "r")
+    assert(file, "File not found: " .. path)
+
+    local obj = {}
+
+    --now loop through the tle file and get each set of 3 lines
+    for n = 1, numLinesInFile(path), 3 do
+        local line = {
+            file:read('*l'), --title line
+            file:read('*l'),
+            file:read('*l')
+        }
+        assert(isValidTLEFileFormat(line), "TLE file syntax error on line " .. n .. ": " .. path)
+
+        -- Trim string
+        line[1] = line[1]:gsub("^%s*(.-)%s*$", "%1")
+        line[1] = line[1]:gsub("%s+", "_")
+        line[1] = line[1]:gsub("[%-()]", "")
+        local title = line[1]
+
+        -- Get period from correct location of the string
+        local per = tonumber(string.sub(line[3], 53, 63))
+        -- Trail for 2x a single revolution
+        per = 1.0 / per * 2.0
+
+        local satName = filenameSansExt .. "_" .. title
+
+        local shouldAddNotes = true
+        if openspace.hasSceneGraphNode(satName) then
+            if shouldAddDuplicates then
+                local originalSatName = satName
+                local i = 1
+                while openspace.hasSceneGraphNode(satName) do
+                    satName = originalSatName .. "_" .. tostring(i)
+                    i = i + 1
+                end
+            else
+                shouldAddNotes = false
+            end
+       end
+
+       if shouldAddNotes then
+            -- Register satellite object and trail
+            local sat_var = getSat(satName, path, n, texture, group.Title)
+            openspace.addSceneGraphNode(sat_var)
+            table.insert(obj, sat_var.Identifier)
+
+            local satTrail_var = getSatTrail(satName, path, n, per, group.TrailColor, group.Title)
+            openspace.addSceneGraphNode(satTrail_var)
+            table.insert(obj, satTrail_var.Identifier)
+        end
+    end
+
+    return obj
+end
+
+asset.export("satImageFolder", satImageFolder)
+asset.export("downloadTLEFile", downloadTLEFile)
+asset.export("addSatelliteGroupObjects", addSatelliteGroupObjects)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset
new file mode 100644
index 0000000000..c464cb4a6f
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset
@@ -0,0 +1,10 @@
+asset.request('./weather/argos')
+asset.request('./weather/dmc')
+asset.request('./weather/earth_resources')
+asset.request('./weather/goes')
+asset.request('./weather/noaa')
+asset.request('./weather/planet')
+asset.request('./weather/sarsat')
+asset.request('./weather/spire')
+asset.request('./weather/tdrss')
+asset.request('./weather/weather')
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
new file mode 100644
index 0000000000..6d0cdee19a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/education.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Education",
+    Url = "http://www.celestrak.com/NORAD/elements/education.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
new file mode 100644
index 0000000000..d5c563a9c3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/engineering.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Engineering",
+    Url = "http://www.celestrak.com/NORAD/elements/engineering.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
new file mode 100644
index 0000000000..4e4cd2a0d2
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/geodetic.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Geodect",
+    Url = "http://www.celestrak.com/NORAD/elements/geodetic.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
new file mode 100644
index 0000000000..454e5ac748
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/science/spaceearth.asset
@@ -0,0 +1,22 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Space & Earth Science",
+    Url = "http://www.celestrak.com/NORAD/elements/science.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
new file mode 100644
index 0000000000..9920953d7b
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/argos.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "ARGOS",
+    Url = "http://www.celestrak.com/NORAD/elements/argos.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
new file mode 100644
index 0000000000..31e8ff2724
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/dmc.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Disaster Monitoring",
+    Url = "http://www.celestrak.com/NORAD/elements/dmc.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
new file mode 100644
index 0000000000..6028cb5fc0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/earth_resources.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Earth Resources",
+    Url = "http://www.celestrak.com/NORAD/elements/resource.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
new file mode 100644
index 0000000000..0f782c2750
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/goes.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "GOES",
+    Url = "http://www.celestrak.com/NORAD/elements/goes.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
new file mode 100644
index 0000000000..8c744a0b9c
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/noaa.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "NOAA",
+    Url = "http://www.celestrak.com/NORAD/elements/noaa.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
new file mode 100644
index 0000000000..3224c9b0e0
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/planet.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Planet",
+    Url = "http://www.celestrak.com/NORAD/elements/planet.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
new file mode 100644
index 0000000000..0b6399b9b7
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/sarsat.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Search & Rescue (SARSAT)",
+    Url = "http://www.celestrak.com/NORAD/elements/sarsat.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
new file mode 100644
index 0000000000..ed058860c3
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/spire.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Spire",
+    Url = "http://www.celestrak.com/NORAD/elements/spire.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
new file mode 100644
index 0000000000..6ccbeede95
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/tdrss.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Tracking and Data Relay Satellite System (TDRSS)",
+    Url = "http://www.celestrak.com/NORAD/elements/tdrss.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
new file mode 100644
index 0000000000..362798b181
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/weather.asset
@@ -0,0 +1,23 @@
+local assetHelper = asset.require('util/asset_helper')
+local shared = asset.require('../satellites_shared')
+
+local group = {
+    Title = "Weather",
+    Url = "http://www.celestrak.com/NORAD/elements/weather.txt",
+    TrailColor = { 0.75, 0.75, 0.35 }
+}
+
+local tle = shared.downloadTLEFile(asset, group.Url, group.Title)
+
+
+local objectNames = {}
+
+asset.onInitialize(function ()
+    objectNames = shared.addSatelliteGroupObjects(group, tle, false)
+end)
+
+asset.onDeinitialize(function ()
+    for _, n in ipairs(objectNames) do
+        openspace.removeSceneGraphNode(n)
+    end
+end)
diff --git a/data/assets/scene/solarsystem/planets/earth/trail.asset b/data/assets/scene/solarsystem/planets/earth/trail.asset
index 815ed7c019..7abe222003 100644
--- a/data/assets/scene/solarsystem/planets/earth/trail.asset
+++ b/data/assets/scene/solarsystem/planets/earth/trail.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local EarthTrail = {
-    Name = "EarthTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "EarthTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -19,7 +19,10 @@ local EarthTrail = {
         Resolution = 1000,
         Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" }
     },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Trail",
+        Path = "/Solar System/Planets/Earth"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/earth/transforms.asset b/data/assets/scene/solarsystem/planets/earth/transforms.asset
index 5630c9bbc2..e93c136f2b 100644
--- a/data/assets/scene/solarsystem/planets/earth/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/earth/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local EarthBarycenter = {
-    Name = "EarthBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "EarthBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,13 +14,17 @@ local EarthBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Barycenter",
+        Path = "/Solar System/Planets/Earth",
+        Hidden = true
+    }
 }
 
 local EarthInertial = {
     -- The default reference frame for Earth-orbiting satellites
-    Name = "EarthInertial",
-    Parent = EarthBarycenter.Name,
+    Identifier = "EarthInertial",
+    Parent = EarthBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -28,12 +32,16 @@ local EarthInertial = {
             DestinationFrame = "GALACTIC",
         }
     },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth Inertial",
+        Path = "/Solar System/Planets/Earth",
+        Hidden = true
+    }
 }
 
 local EarthIAU = {
-    Name = "EarthIAU",
-    Parent = EarthBarycenter.Name,
+    Identifier = "EarthIAU",
+    Parent = EarthBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -41,7 +49,11 @@ local EarthIAU = {
             DestinationFrame = "GALACTIC",
         }
     },
-    GuiPath = "/Solar System/Planets/Earth"
+    GUI = {
+        Name = "Earth IAU",
+        Path = "/Solar System/Planets/Earth",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index 4ed9c55f5c..6f1abe17c6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -14,8 +14,8 @@ local textures = asset.syncedResource({
 })
 
 local Callisto = {
-    Name = "Callisto",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Callisto",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -37,7 +37,7 @@ local Callisto = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Callisto Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/callisto.jpg",
                     Enabled = true
                 }
@@ -45,7 +45,9 @@ local Callisto = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
index 3f5232b41c..2c4f4e58a0 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
@@ -6,8 +6,8 @@ local kernels = asset.require('../jup310').Kernels
 
 
 local CallistoTrail = {
-    Name = "CallistoTrail",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "CallistoTrail",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -21,7 +21,10 @@ local CallistoTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Name = "Callisto Trail",
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 40711a8999..d37e1d2d3b 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -14,8 +14,8 @@ local textures = asset.syncedResource({
 })
 
 local Europa = {
-    Name = "Europa",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Europa",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -37,7 +37,7 @@ local Europa = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Europa Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/europa.jpg",
                     Enabled = true
                 }
@@ -45,7 +45,9 @@ local Europa = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
index 451ef42937..9c450158f7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
@@ -6,8 +6,8 @@ local kernels = asset.require('../jup310').Kernels
 
 
 local EuropaTrail = {
-    Name = "EuropaTrail",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "EuropaTrail",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -21,7 +21,10 @@ local EuropaTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Name = "Europa Trail",
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index adce77b102..42efa8d7cb 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -14,8 +14,8 @@ local textures = asset.syncedResource({
 })
 
 local Ganymede = {
-    Name = "Ganymede",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Ganymede",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -37,7 +37,7 @@ local Ganymede = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Ganymede Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/ganymede.jpg",
                     Enabled = true
                 }
@@ -45,7 +45,9 @@ local Ganymede = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
index c87ff052ee..580e1429f3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
@@ -6,8 +6,8 @@ local kernels = asset.require('../jup310').Kernels
 
 
 local GanymedeTrail = {
-    Name = "GanymedeTrail",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "GanymedeTrail",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -21,7 +21,10 @@ local GanymedeTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Name = "Ganymede Trail",
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index c3c8fb7bb4..62d8309243 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -14,8 +14,8 @@ local textures = asset.syncedResource({
 })
 
 local Io = {
-    Name = "Io",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Io",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -37,7 +37,7 @@ local Io = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Io Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/io.jpg",
                     Enabled = true
                 }
@@ -45,7 +45,9 @@ local Io = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
index 84ffaefd49..a971aaf806 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
@@ -6,8 +6,8 @@ local kernels = asset.require('../jup310').Kernels
 
 
 local IoTrail = {
-    Name = "IoTrail",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "IoTrail",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -21,7 +21,10 @@ local IoTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_jupiter" },
-    GuiPath = "/Solar System/Planets/Jupiter/Moons"
+    GUI = {
+        Name = "Io Trail",
+        Path = "/Solar System/Planets/Jupiter/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index 1696493f42..9333c339c1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Jupiter = {
-    Name = "Jupiter",
-    Parent = transforms.JupiterBarycenter.Name,
+    Identifier = "Jupiter",
+    Parent = transforms.JupiterBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -29,7 +29,7 @@ local Jupiter = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Jupiter Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/jupiter.jpg",
                     Enabled = true
                 }
@@ -37,7 +37,9 @@ local Jupiter = {
         }
     },
     Tag = { "planet_solarSystem", "planet_giants" },
-    GuiPath = "/Solar System/Planets/Jupiter"
+    GUI = {
+        Path = "/Solar System/Planets/Jupiter"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
index 319a459950..dad2a58ad3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/ananke_group.asset
@@ -5,162 +5,186 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_ananke" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local anankeGroup = {
     {
-        Name = "S/2010 J 2",
+        Identifier = "S2010J2",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "552",
         Radii = { 1000, 1000, 1000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Name = "S/2010 J 2",
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 588.36,
         Kernels = kernels341
     },
     {
-        Name = "Thelxinoe",
+        Identifier = "Thelxinoe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "THELXINOE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 597.61,
         Kernels = kernels341
     },
     {
-        Name = "Euanthe",
+        Identifier = "Euanthe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "EUANTHE",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 598.09,
         Kernels = kernels341
     },
     {
-        Name = "Iocaste",
+        Identifier = "Iocaste",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "IOCASTE",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 609.43,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 16",
+        Identifier = "S2003J16",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55068",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Name = "S/2003 J 16",
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 610.36,
         Kernels = kernels341
     },
     {
-        Name = "Praxidike",
+        Identifier = "Praxidike",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PRAXIDIKE",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 613.90,
         Kernels = kernels341
     },
     {
-        Name = "Harpalyke",
+        Identifier = "Harpalyke",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HARPALYKE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 624.54,
         Kernels = kernels341
     },
     {
-        Name = "Mneme",
+        Identifier = "Mneme",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "MNEME",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 627.48,
         Kernels = kernels341
     },
     {
-        Name = "Hermippe",
+        Identifier = "Hermippe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HERMIPPE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 629.81,
         Kernels = kernels341
     },
     {
-        Name = "Thyone",
+        Identifier = "Thyone",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "THYONE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 639.80,
         Kernels = kernels341
     },
     {
-        Name = "Ananke",
+        Identifier = "Ananke",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ANANKE",
         Radii = { 28000, 28000, 28000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Ananke Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Ananke Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 640.38,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
index ad9ffad04c..e84e241bf7 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carme_group.asset
@@ -5,218 +5,250 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carme" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local carmeGroup = {
     {
-        Name = "Herse",
+        Identifier = "Herse",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HERSE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 672.75,
         Kernels = kernels341
     },
     {
-        Name = "Aitne",
+        Identifier = "Aitne",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "AITNE",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 679.64,
         Kernels = kernels341
     },
     {
-        Name = "Kale",
+        Identifier = "Kale",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "KALE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 685.32,
         Kernels = kernels341
     },
     {
-        Name = "Taygete",
+        Identifier = "Taygete",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "TAYGETE",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 686.67,
         Kernels = kernels341
     },
     {
-        Name = "Chaldene",
+        Identifier = "Chaldene",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CHALDENE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 699.33,
         Kernels = kernels341
     },
     {
-        Name = "Erinome",
+        Identifier = "Erinome",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ERINOME",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 711.96,
         Kernels = kernels341
     },
     {
-        Name = "Kallichore",
+        Identifier = "Kallichore",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "KALLICHORE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 717.81,
         Kernels = kernels341
     },
     {
-        Name = "Kalyke",
+        Identifier = "Kalyke",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "KALYKE",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 721.02,
         Kernels = kernels341
     },
     {
-        Name = "Pasithee",
+        Identifier = "Pasithee",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PASITHEE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 726.93,
         Kernels = kernel341
     },
     {
-        Name = "S/2010 J 1",
+        Identifier = "S2010J1",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "551",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Name = "S/2010 J 1",
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 722.83,
         Kernels = kernels341
     },
     {
-        Name = "Eukelade",
+        Identifier = "Eukelade",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "EUKELADE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 735.20,
         Kernels = kernels341
     },
     {
-        Name = "Arche",
+        Identifier = "Arche",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ARCHE",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 746.19,
         Kernels = kernels341
     },
     {
-        Name = "Isonoe",
+        Identifier = "Isonoe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ISONOE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 750.13,
         Kernels = kernels341
     },
     {
-        Name = "Carme",
+        Identifier = "Carme",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CARME",
         Radii = { 46000, 46000, 46000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 763.95,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 5",
+        Identifier = "S2003J5",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "557",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carme Group",
+        GUI = {
+            Name = "S/2003 J 5",
+            Path = "/Solar System/Planets/Jupiter/Moons/Carme Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 758.34,
         Kernels = kernels341
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 5cf3db134d..0125e88f37 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/carpo_group.asset
@@ -5,22 +5,24 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_carpo" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local carpoGroup = {
     {
-        Name = "Carpo",
+        Identifier = "Carpo",
         Parent = {
-            Name = parentName,
+            Name = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CARPO",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Carpo Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Carpo Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 458.62,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
index 7c5956f6bb..11091923d4 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/himalia_group.asset
@@ -5,79 +5,89 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_himalia" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local himaliaGroup = {
     {
-        Name = "Leda",
+        Identifier = "Leda",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "LEDA",
         Radii = { 16000, 16000, 16000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Himalia Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 240.82,
         Kernels = kernels341
     },
     {
-        Name = "Himalia",
+        Identifier = "Himalia",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HIMALIA",
         Radii = { 170000, 170000, 170000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Himalia Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 250.23,
         Kernels = kernels341
     },
     {
-        Name = "Lysithea",
+        Identifier = "Lysithea",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "LYSITHEA",
         Radii = { 36000, 36000, 36000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Himalia Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 259.89,
         Kernels = kernels341
     },
     {
-        Name = "Elara",
+        Identifier = "Elara",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ELARA",
         Radii = { 86000, 86000, 86000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Himalia Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 257.62,
         Kernels = kernels341
     },
     {
-        Name = "Dia",
+        Identifier = "Dia",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
-        -- Spice = "DIA", -- The name is not correctly registered in the Spice kernel
+        -- Spice = "DIA", -- The Identifier is not correctly registered in the Spice kernel
         Spice = "553",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Himalia Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Himalia Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 287.93,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
index dbe50113c7..fbc0a0713e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/inner_group.asset
@@ -5,64 +5,72 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_inner" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local innerMoons = {
     {
-        Name = "Metis",
+        Identifier = "Metis",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "METIS",
         Radii = { 60000, 40000, 34000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Inner Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.117912037,
         Kernels = kernels341
     },
     {
-        Name = "Adrastea",
+        Identifier = "Adrastea",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ADRASTEA",
         Radii = { 20000, 16000, 14000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Inner Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.2982638889,
         Kernels = kernels341
     },
     {
-        Name = "Amalthea",
+        Identifier = "Amalthea",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "AMALTHEA",
         Radii = { 250000, 146000, 128000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Inner Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.4981828704,
         Kernels = kernels341
     },
     {
-        Name = "Thebe",
+        Identifier = "Thebe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "THEBE",
         Radii = { 116000, 98000, 84000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Inner Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Inner Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.6745023148,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
index 46233a059f..b03ce0909e 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/other_groups.asset
@@ -5,120 +5,144 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_other" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local otherGroups = {
     {
-        Name = "S/2003 J 12",
+        Identifier = "S2003J12",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55066",
         Radii = { 1000, 1000, 1000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 12",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 482.69,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 3",
+        Identifier = "S/2003J3",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55061",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 3",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 561.52,
         Kernels = kernels341
     },
     {
-        Name = "S/2011 J 1",
+        Identifier = "S2011J1",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55074",
         Radii = { 1000, 1000, 1000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2011 J 1",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 582.22,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 19",
+        Identifier = "S2003J19",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55070",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 19",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 699.12,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 10",
+        Identifier = "S2003J10",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55065",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 10",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 700.13,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 23",
+        Identifier = "S2003J23",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55071",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 23",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 700.54,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 9",
+        Identifier = "S2003J9",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55064",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 9",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 752.84,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 2",
+        Identifier = "S2003J2",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55060",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Other Groups",
+        GUI = {
+            Name = "S/2003 J 2",
+            Path = "/Solar System/Planets/Jupiter/Moons/Other Groups"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 981.55,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
index 8351b0c74e..ed922bbd00 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/pasiphae_group.asset
@@ -5,289 +5,335 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_pasiphae" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local pasiphaeGroup = {
     {
-        Name = "Euporie",
+        Identifier = "Euporie",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "EUPORIE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 538.78,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 18",
+        Identifier = "S2003J18",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "555",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Name = "S/2003 J 18",
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 587.38,
         Kernels = kernels341
     },
     {
-        Name = "Helike",
+        Identifier = "Helike",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HELIKE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 601.40,
         Kernels = kernels341
     },
     {
-        Name = "Orthosie",
+        Identifier = "Orthosie",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ORTHOSIE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 602.62,
         Kernels = kernels341
     },
     {
-        Name = "S/2016 J 1",
+        Identifier = "S2016J1",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "554",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Name = "S/2016 J 1",
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 603.83,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 15",
+        Identifier = "S2003J15",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "558",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Name = "S/2003 J 15",
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 699.68,
         Kernels = kernels341
     },
     {
-        Name = "Aoede",
+        Identifier = "Aoede",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "AOEDE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 714.66,
         Kernels = kernels341
     },
     {
-        Name = "Callirrhoe",
+        Identifier = "Callirrhoe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CALLIRRHOE",
         Radii = { 9000, 9000, 9000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 727.11,
         Kernels = kernels341
     },
     {
-        Name = "Eurydome",
+        Identifier = "Eurydome",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "EURYDOME",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 723.36,
         Kernels = kernels341
     },
     {
-        Name = "Kore",
+        Identifier = "Kore",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "KORE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 776.02,
         Kernels = kernels341
     },
     {
-        Name = "Cyllene",
+        Identifier = "Cyllene",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CYLLENE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 731.10,
         Kernels = kernels341
     },
     {
-        Name = "S/2011 J 2",
+        Identifier = "S2011J2",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "556",
         Radii = { 1000, 1000, 1000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Name = "S/2011 J 2",
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 731.32,
         Kernels = kernels341
     },
     {
-        Name = "S/2017 J 1",
+        Identifier = "S2017J1",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "559",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Name = "S/2017 J 1",
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 734.15,
         Kernels = kernels341
     },
     {
-        Name = "S/2003 J 4",
+        Identifier = "S2003J4",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "55062",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Name = "S/2003 J 4",
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 739.29,
         Kernels = kernels341
     },
     {
-        Name = "Pasiphae",
+        Identifier = "Pasiphae",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PASIPHAE",
         Radii = { 60000, 60000, 60000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 739.80,
         Kernels = kernels341
     },
     {
-        Name = "Hegemone",
+        Identifier = "Hegemone",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HEGEMONE",
         Radii = { 3000, 3000, 3000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 745.50,
         Kernels = kernels341
     },
     {
-        Name = "Sinope",
+        Identifier = "Sinope",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SINOPE",
         Radii = { 38000, 38000, 38000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 739.33,
         Kernels = kernels341
     },
     {
-        Name = "Sponde",
+        Identifier = "Sponde",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SPONDE",
         Radii = { 2000, 2000, 2000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 771.60,
         Kernels = kernels341
     },
     {
-        Name = "Autonoe",
+        Identifier = "Autonoe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "AUTONOE",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 772.17,
         Kernels = kernels341
     },
     {
-        Name = "Megaclite",
+        Identifier = "Megaclite",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
-        -- sic:  The name in the SPICE kernel is wrong
+        -- sic:  The Identifier in the SPICE kernel is wrong
         Spice = "MAGACLITE",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Pasiphae Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 792.44,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
index 346563b31a..d5d43ccaa3 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/minor/themisto_group.asset
@@ -5,22 +5,24 @@ local kernels341 = asset.require('../jup341').Kernels
 
 
 
-local parentName = transforms.JupiterBarycenter.Name
+local parentIdentifier = transforms.JupiterBarycenter.Identifier
 local parentSpice = "JUPITER BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_jupiter", "moon_themisto" }
 local trailColor = { 0.4, 0.3, 0.01 }
 
 local themistoGroup = {
     {
-        Name = "Themisto",
+        Identifier = "Themisto",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "THEMISTO",
         Radii = { 8000, 8000, 8000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Jupiter/Moons/Themisto Group",
+        GUI = {
+            Path = "/Solar System/Planets/Jupiter/Moons/Themisto Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 129.87,
         Kernels = kernels341
diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset
index ea66b8b6da..c78bce02ca 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local JupiterTrail = {
-    Name = "JupiterTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "JupiterTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -19,7 +19,10 @@ local JupiterTrail = {
         Resolution = 1000
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
-    GuiPath = "/Solar System/Planets/Jupiter"
+    GUI = {
+        Name = "Jupiter Trail",
+        Path = "/Solar System/Planets/Jupiter"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
index b0cc9a23e0..851a2d5310 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local JupiterBarycenter = {
-    Name = "JupiterBarycenter",
-    Parent = sun_transforms_asset.SolarSystemBarycenter.Name,
+    Identifier = "JupiterBarycenter",
+    Parent = sun_transforms_asset.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,11 @@ local JupiterBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Jupiter"
+    GUI = {
+        Name = "Jupiter Barycenter",
+        Path = "/Solar System/Planets/Jupiter",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
index 663624aec6..2850e528ca 100644
--- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
@@ -4,8 +4,8 @@ local assetHelper = asset.require('util/asset_helper')
 
 
 local Atmosphere = {
-    Name = "MarsAtmosphere",
-    Parent = transforms.Mars.Name,
+    Identifier = "MarsAtmosphere",
+    Parent = transforms.Mars.Identifier,
     Renderable = {
         Type = "RenderableAtmosphere",
         Atmosphere = {
@@ -55,7 +55,10 @@ local Atmosphere = {
             }
         }
     },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Name = "Mars Atmosphere",
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset
index 8f94b21e31..703eeff975 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -19,6 +19,7 @@ local mapServiceConfigs = asset.localResource("map_service_configs")
 
 local color_layers = {
     {
+        Identifier = "MOC_WA_AMNH_Color",
         Name = "MOC WA AMNH Color",
         FilePath = mapServiceConfigs .. "/Utah/Mars_Color.wms",
         Enabled = true,
@@ -29,60 +30,73 @@ local color_layers = {
         }
     },
     {
+        Identifier = "Viking_MDIM",
         Name = "Viking MDIM",
         FilePath = mapServiceConfigs .. "/MARS_Viking_MDIM21.wms"
     },
     {
+        Identifier = "MOLA_Pseudo_Color",
         Name = "MOLA Pseudo Color",
         FilePath = mapServiceConfigs .. "/Utah/Mola_PseudoColor.wms"
     },
     {
+        Identifier = "MOLA_HRSC",
         Name = "MOLA HRSC",
         FilePath = mapServiceConfigs .. "/Utah/Mola_HRSC.wms"
     },
     {
+        Identifier = "Viking_MDIM_Utah",
         Name = "Viking MDIM [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/Mdim.wms"
     },
     {
+        Identifier = "Viking_MDIM_AWS",
         Name = "Viking MDIM [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/Mdim.wms"
     },
     {
+        Identifier = "MOLA_Pseudo_Color_AWS",
         Name = "MOLA Pseudo Color [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/Mola_PseudoColor.wms"
     },
     {
+        Identifier = "CTX_Mosaic_LiU",
         Name = "CTX Mosaic [LiU]",
         FilePath = mapServiceConfigs .. "/LiU/CTX.wms",
         BlendMode = "Color"
     },
     {
+        Identifier = "CTX_Mosaic_Utah",
         Name = "CTX Mosaic [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/CTX.wms",
         BlendMode = "Color"
     },
     {
+        Identifier = "CTX_Mosaic_AWS",
         Name = "CTX Mosaic [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/CTX.wms",
         BlendMode = "Color"
     },
     {
+        Identifier = "Themis_IR_Day_Utah",
         Name = "Themis IR Day [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Day.wms",
         BlendMode = "Color"
     },
     {
+        Identifier = "Themis_IR_Night_Utah",
         Name = "Themis IR Night [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/Themis_IR_Night.wms",
         BlendMode = "Color"
     },
     {
+        Identifier = "Themis_IR_Day_AWS_",
         Name = "Themis IR Day [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/Themis_IR_Day.wms",
         BlendMode = "Color"
     },
     {
+        Identifier = "Themis_IR_Night_AWS",
         Name = "Themis IR Night [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/Themis_IR_Night.wms",
         BlendMode = "Color"
@@ -91,34 +105,39 @@ local color_layers = {
 
 local overlay_layers = {
     {
-        Type = "TileIndexTileLayer",
-        Name = "Indices"
+        Identifier = "Indices",
+        Type = "TileIndexTileLayer"
     },
     {
-        Type = "SizeReferenceTileLayer",
+        Identifier = "Size_Reference",
         Name = "Size Reference",
+        Type = "SizeReferenceTileLayer",
         Radii = marsRadii
     }
 }
 
 local height_layers = {
     {
+        Identifier = "Mola",
         Name = "Mola Elevation",
         FilePath = mapServiceConfigs .. "/Mars_MGS_MOLA_DEM.wms",
         TilePixelSize = 90
     },
     {
+        Identifier = "Mola_Europe",
         Name = "Mola Elevation [Europe]",
         FilePath = mapServiceConfigs .. "/LiU/Mola_Elevation.wms",
         Enabled = true,
         TilePixelSize = 90
     },
     {
+        Identifier = "Mola_Utah",
         Name = "Mola Elevation [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/Mola_Elevation.wms",
         TilePixelSize = 90
     },
     {
+        Identifier = "Mola_AWS",
         Name = "Mola Elevation [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/Mola_Elevation.wms",
         TilePixelSize = 90
@@ -126,8 +145,8 @@ local height_layers = {
 }
 
 local Mars = {
-    Name = "Mars",
-    Parent = transforms.MarsBarycenter.Name,
+    Identifier = "Mars",
+    Parent = transforms.MarsBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -146,7 +165,9 @@ local Mars = {
         }
     },
     Tag = { "planet_solarSystem", "planet_terrestrial" },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
index ec9951ba39..c880bf8b08 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset
@@ -12,8 +12,8 @@ local kernels = asset.require('../mar097').Kernels
 
 
 local Deimos = {
-    Name = "Deimos",
-    Parent = transforms.MarsBarycenter.Name,
+    Identifier = "Deimos",
+    Parent = transforms.MarsBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -36,12 +36,14 @@ local Deimos = {
         }
     },
     Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 local DeimosTrail = {
-    Name = "DeimosTrail",
-    Parent = transforms.MarsBarycenter.Name,
+    Identifier = "DeimosTrail",
+    Parent = transforms.MarsBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -54,7 +56,10 @@ local DeimosTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Name = "Deimos Trail",
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
index 3e0bbce206..ff97e74ce2 100644
--- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
+++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset
@@ -12,8 +12,8 @@ local kernels = asset.require('../mar097').Kernels
 
 
 local Phobos = {
-    Name = "Phobos",
-    Parent = transforms.MarsBarycenter.Name,
+    Identifier = "Phobos",
+    Parent = transforms.MarsBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -36,12 +36,14 @@ local Phobos = {
         }
     },
     Tag = { "moon_solarSystem", "moon_terrestrial", "moon_mars" },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 local PhobosTrail = {
-    Name = "PhobosTrail",
-    Parent = transforms.MarsBarycenter.Name,
+    Identifier = "PhobosTrail",
+    Parent = transforms.MarsBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -54,7 +56,10 @@ local PhobosTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_terrestrial", "moonTrail_mars" },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Name = "Phobos Trail",
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset
index 30746e230f..19e201a8af 100644
--- a/data/assets/scene/solarsystem/planets/mars/trail.asset
+++ b/data/assets/scene/solarsystem/planets/mars/trail.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local MarsTrail = {
-    Name = "MarsTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "MarsTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -19,7 +19,10 @@ local MarsTrail = {
         Resolution = 1000
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Name = "Mars Trail",
+        Path = "/Solar System/Planets/Mars"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset
index deab65360a..c953e89c69 100644
--- a/data/assets/scene/solarsystem/planets/mars/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local MarsBarycenter = {
-    Name = "MarsBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "MarsBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,11 @@ local MarsBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Mars"
+    GUI = {
+        Name = "Mars Barycenter",
+        Path = "/Solar System/Planets/Mars",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index 1b88fb68f3..e4a50c6964 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -10,28 +10,32 @@ local mapServiceConfigs = asset.localResource("map_service_configs")
 local color_layers = {
     -- Utah based servers
     {
+        Identifier = "Messenger_MDIS_Utah",
         Name = "Messenger MDIS [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/MessengerMDIS.wms",
         Enabled = true
     },
     {
+        Identifier = "Messenger_Mosaic_Utah",
         Name = "Messenger Mosaic [Utah]",
         FilePath = mapServiceConfigs .. "/Utah/MessengerMosaic.wms"
     },
     -- AWS based servers
     {
+        Identifier = "Messenger_MDIS_AWS",
         Name = "Messenger MDIS [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/MessengerMdis.wms"
     },
     {
+        Identifier = "Messenger_Mosaic_AWS",
         Name = "Messenger Mosaic [AWS]",
         FilePath = mapServiceConfigs .. "/AWS/MessengerMosaic.wms"
     }
 }
 
 local Mercury = {
-    Name = "Mercury",
-    Parent = transforms.MercuryBarycenter.Name,
+    Identifier = "Mercury",
+    Parent = transforms.MercuryBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -51,7 +55,9 @@ local Mercury = {
         }
     },
     Tag = { "planet_solarSystem", "planet_terrestrial" },
-    GuiPath = "/Solar System/Planets/Mercury"
+    GUI = {
+        Path = "/Solar System/Planets/Mercury"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/trail.asset b/data/assets/scene/solarsystem/planets/mercury/trail.asset
index 6adf1f2679..1a7f9c1195 100644
--- a/data/assets/scene/solarsystem/planets/mercury/trail.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/trail.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local MercuryTrail = {
-    Name = "MercuryTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "MercuryTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -19,7 +19,10 @@ local MercuryTrail = {
         Resolution = 100
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
-    GuiPath = "/Solar System/Planets/Mercury"
+    GUI = {
+        Name = "Mercury Trail",
+        Path = "/Solar System/Planets/Mercury"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
index 4365925fcd..bef198f85d 100644
--- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local MercuryBarycenter = {
-    Name = "MercuryBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "MercuryBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,11 @@ local MercuryBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Mercury"
+    GUI = {
+        Name = "Mercury Barycenter",
+        Path = "/Solar System/Planets/Mercury",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
index 522b56ebb8..f767bc9cbc 100644
--- a/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/inner_moons.asset
@@ -7,106 +7,121 @@ local kernels088 = asset.require('./nep088').Kernels
 
 
 
-local parentName = transforms.NeptuneBarycenter.Name
+local parentIdentifier = transforms.NeptuneBarycenter.Identifier
 local parentSpice = "NEPTUNE BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_inner" }
 local trailColor = { 0.2, 0.5, 0.75 }
 
 local innerMoons = {
     {
-        Name = "Naiad",
+        Identifier = "Naiad",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "NAIAD",
         Radii = { 96000, 60000, 52000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.294,
         Kernels = kernels088
     },
     {
-        Name = "Thalassa",
+        Identifier = "Thalassa",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "THALASSA",
         Radii = { 108000, 100000, 52000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.311,
         Kernels = kernels088
     },
     {
-        Name = "Despina",
+        Identifier = "Despina",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "DESPINA",
         Radii = { 180000, 148000, 128000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.335,
         Kernels = kernels088
     },
     {
-        Name = "Galatea",
+        Identifier = "Galatea",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "GALATEA",
         Radii = { 204000, 184000, 144000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.429,
         Kernels = kernels088
     },
     {
-        Name = "Larissa",
+        Identifier = "Larissa",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "LARISSA",
         Radii = { 216000, 204000, 168000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.555,
         Kernels = kernels088
     },
     {
-        Name = "S/2004 N 1",
+        Identifier = "S2004N1",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "814",
         Radii = { 16000, 16000, 16000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Name = "S/2004 N 1",
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.936,
         Kernels = kernels088
     },
     {
-        Name = "Proteus",
+        Identifier = "Proteus",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PROTEUS",
         Radii = { 436000, 416000, 402000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.122,
         Kernels = kernels081
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset
index 80cf5b6f64..41b2868905 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_prograde_moons.asset
@@ -7,50 +7,56 @@ local kernels088 = asset.require('./nep088').Kernels
 
 
 
-local parentName = transforms.NeptuneBarycenter.Name
+local parentIdentifier = transforms.NeptuneBarycenter.Identifier
 local parentSpice = "NEPTUNE BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_prograde" }
 local trailColor = { 0.2, 0.5, 0.75 }
 
 local irregularProgradeMoons = {
     {
-        Name = "Halimede",
+        Identifier = "Halimede",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HALIMEDE",
         Radii = { 62000, 62000, 62000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1879.08,
         Kernels = kernels086
     },
     {
-        Name = "Psamathe",
+        Identifier = "Psamathe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PSAMATHE",
         Radii = { 40000, 40000, 40000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 9074.3,
         Kernels = kernels086
     },
     {
-        Name = "Neso",
+        Identifier = "Neso",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "NESO",
         Radii = { 60000, 60000, 60000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 9740.73,
         Kernels = kernels086
diff --git a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset
index dc0343273d..d07e7e26c3 100644
--- a/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/irregular_retrograde_moons.asset
@@ -7,50 +7,56 @@ local kernels088 = asset.require('./nep088').Kernels
 
 
 
-local parentName = transforms.NeptuneBarycenter.Name
+local parentIdentifier = transforms.NeptuneBarycenter.Identifier
 local parentSpice = "NEPTUNE BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_neptune", "moon_irregular_retrograde" }
 local trailColor = { 0.2, 0.5, 0.75 }
 
 local irregularRetrogradeMoons = {
     {
-        Name = "Nereid",
+        Identifier = "Nereid",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "NEREID",
         Radii = { 340000, 340000, 340000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 360.13,
         Kernels = kernels081
     },
     {
-        Name = "Sao",
+        Identifier = "Sao",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SAO",
         Radii = { 44000, 44000, 44000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 2912.72,
         Kernels = kernels086
     },
     {
-        Name = "Laomedeia",
+        Identifier = "Laomedeia",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "LAOMEDEIA",
         Radii = { 42000, 42000, 42000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Neptune/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 3171.33,
         Kernels = kernels086
diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
index 79ebb44214..4cd35f22a6 100644
--- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Neptune = {
-    Name = "Neptune",
-    Parent = transforms.NeptuneBarycenter.Name,
+    Identifier = "Neptune",
+    Parent = transforms.NeptuneBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -29,7 +29,7 @@ local Neptune = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/neptune.jpg",
                     Enabled = true
                 }
@@ -37,7 +37,9 @@ local Neptune = {
         }
     },
     Tag = { "planet_solarSystem", "planet_giants" },
-    GuiPath = "/Solar System/Planets/Neptune"
+    GUI = {
+        Path = "/Solar System/Planets/Neptune"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset
index 3d93d39c66..c1647a47da 100644
--- a/data/assets/scene/solarsystem/planets/neptune/trail.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local NeptuneTrail = {
-    Name = "NeptuneTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "NeptuneTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -30,7 +30,10 @@ local NeptuneTrail = {
         Resolution = 1000
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
-    GuiPath = "/Solar System/Planets/Neptune"
+    GUI = {
+        Name = "Neptune Trail",
+        Path = "/Solar System/Planets/Neptune"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
index 7f3e6f58d3..c9671ca5b0 100644
--- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local NeptuneBarycenter = {
-    Name = "NeptuneBarycenter",
-    Parent = sun_transforms_asset.SolarSystemBarycenter.Name,
+    Identifier = "NeptuneBarycenter",
+    Parent = sun_transforms_asset.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,11 @@ local NeptuneBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Neptune"
+    GUI = {
+        Name = "Neptune Barycenter",
+        Path = "/Solar System/Planets/Neptune",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/neptune/triton.asset b/data/assets/scene/solarsystem/planets/neptune/triton.asset
index d60d52dd16..92a57ab4cc 100644
--- a/data/assets/scene/solarsystem/planets/neptune/triton.asset
+++ b/data/assets/scene/solarsystem/planets/neptune/triton.asset
@@ -6,15 +6,17 @@ local kernels081 = asset.require('./nep081').Kernels
 
 
 local Triton = {
-    Name = "Triton",
+    Identifier = "Triton",
     Parent = {
-        Name = transforms.NeptuneBarycenter.Name,
+        Identifier = transforms.NeptuneBarycenter.Identifier,
         Spice = "NEPTUNE BARYCENTER"
     },
     Spice = "TRITON",
     Radii = { 2709000, 2706000, 2705000 },
     Tags = { "moon_solarSystem", "moon_giants", "moon_neptune" },
-    GuiPath = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons",
+    GUI = {
+        Path = "/Solar System/Planets/Neptune/Moons/Irregular Prograde Moons"
+    },
     TrailColor = { 0.2, 0.5, 0.75 },
     OrbitPeriod = 5.877,
     Kernels = kernels081
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index bd8a1e0fd7..dc185156e9 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Dione = {
-    Name = "Dione",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Dione",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Dione = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Dione Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/dione.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Dione = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
index f27bd71afc..95fe6b1953 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local DioneTrail = {
-    Name = "DioneTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "DioneTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local DioneTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Dione Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index 92116bc318..1e443df8e4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Enceladus = {
-    Name = "Enceladus",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Enceladus",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Enceladus = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Enceladus Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/enceladus.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Enceladus = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
index 8834b45399..466281b1f4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local EnceladusTrail = {
-    Name = "EnceladusTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "EnceladusTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local EnceladusTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Enceladus Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
index 8b862702c3..cfbdea7f7e 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
@@ -13,8 +13,8 @@ asset.request('./trail')
 -- })
 
 local Hyperion = {
-    Name = "Hyperion",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Hyperion",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -43,7 +43,9 @@ local Hyperion = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
index fc03a4a8d5..9b52198e2c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local HyperionTrail = {
-    Name = "HyperionTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "HyperionTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local HyperionTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Hyperion Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index ccfc237df0..be23afba40 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Iapetus = {
-    Name = "Iapetus",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Iapetus",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Iapetus = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Iapetus Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/iapetus.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Iapetus = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
index 08fa8dffeb..fdc7a468a4 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local IapetusTrail = {
-    Name = "IapetusTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "IapetusTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local IapetusTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Iapetus Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index fa5919a38b..b15f141cd7 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Mimas = {
-    Name = "Mimas",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Mimas",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Mimas = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Mimas Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/mimas.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Mimas = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
index b3ab9f7d64..c1ad48a0e1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local MimasTrail = {
-    Name = "MimasTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "MimasTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local MimasTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Mimas Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
index e33a9c6fa5..129814643f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/gallic_group.asset
@@ -5,64 +5,72 @@ local kernels368 = asset.require('../sat368').Kernels
 
 
 
-local parentName = transforms.SaturnBarycenter.Name
+local parentIdentifier = transforms.SaturnBarycenter.Identifier
 local parentSpice = "SATURN BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_gallic" }
 local trailColor = { 0.5, 0.3, 0.3 }
 
 local gallicGroup = {
     {
-        Name = "Albiorix",
+        Identifier = "Albiorix",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ALBIORIX",
         Radii = { 32000, 32000, 32000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Gallic Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 774.58,
         Kernels = kernels368
     },
     {
-        Name = "Bebhionn",
+        Identifier = "Bebhionn",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "BEBHIONN",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Gallic Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 838.77,
         Kernels = kernels368
     },
     {
-        Name = "Erriapus",
+        Identifier = "Erriapus",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ERRIAPUS",
         Radii = { 10000, 10000, 10000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Gallic Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 844.89,
         Kernels = kernels368
     },
     {
-        Name = "Tarvos",
+        Identifier = "Tarvos",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "TARVOS",
         Radii = { 15000, 15000, 15000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Gallic Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Gallic Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 944.23,
         Kernels = kernels368
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
index e72ce0bcf2..e19528647f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/inuit_group.asset
@@ -5,78 +5,88 @@ local kernels368 = asset.require('../sat368').Kernels
 
 
 
-local parentName = transforms.SaturnBarycenter.Name
+local parentIdentifier = transforms.SaturnBarycenter.Identifier
 local parentSpice = "SATURN BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_inuit" }
 local trailColor = { 0.5, 0.3, 0.3 }
 
 local inuitGroup = {
     {
-        Name = "Kiviuq",
+        Identifier = "Kiviuq",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "KIVIUQ",
         Radii = { 16000, 16000, 16000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Inuit Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 448.16,
         Kernels = kernels368
     },
     {
-        Name = "Ijiraq",
+        Identifier = "Ijiraq",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "IJIRAQ",
         Radii = { 12000, 12000, 12000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Inuit Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 451.77,
         Kernels = kernels368
     },
     {
-        Name = "Paaliaq",
+        Identifier = "Paaliaq",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PAALIAQ",
         Radii = { 22000, 22000, 22000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Inuit Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 692.98,
         Kernels = kernels368
     },
     {
-        Name = "Siarnaq",
+        Identifier = "Siarnaq",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SIARNAQ",
         Radii = { 40000, 40000, 40000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Inuit Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 884.88,
         Kernels = kernels368
     },
     {
-        Name = "Tarqeq",
+        Identifier = "Tarqeq",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "TARQEQ",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Inuit Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Inuit Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 894.86,
         Kernels = kernels368
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
index bdf82911f0..a81ff133c3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/norse_group.asset
@@ -6,415 +6,481 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 
-local parentName = transforms.SaturnBarycenter.Name
+local parentIdentifier = transforms.SaturnBarycenter.Identifier
 local parentSpice = "SATURN BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_norse" }
 local trailColor = { 0.5, 0.3, 0.3 }
 
 local norseGroup = {
     {
-        Name = "Phoebe",
+        Identifier = "Phoebe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PHOEBE",
         Radii = { 218800, 217000, 203600 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 545.09,
         Kernels = kernels375
     },
     {
-        Name = "Skathi",
+        Identifier = "Skathi",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SKATHI",
         Radii = { 8000, 8000, 8000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 732.52,
         Kernels = kernels368
     },
     {
-        Name = "S/2007 S 2",
+        Identifier = "S2007S2",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65055",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2007 S 2",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 792.96,
         Kernels = kernels368
     },
     {
-        Name = "Skoll",
+        Identifier = "Skoll",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SKOLL",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 862.37,
         Kernels = kernels368
     },
     {
-        Name = "S/2004 S 13",
+        Identifier = "S2004S13",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65041",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2004 S 13",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 905.85,
         Kernels = kernels368
     },
     {
-        Name = "Greip",
+        Identifier = "Greip",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "GREIP",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 906.56,
         Kernels = kernels368
     },
     {
-        Name = "Hyrrokkin",
+        Identifier = "Hyrrokkin",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HYRROKKIN",
         Radii = { 8000, 8000, 8000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 914.29,
         Kernels = kernels368
     },
     {
-        Name = "Jarnsaxa",
+        Identifier = "Jarnsaxa",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "JARNSAXA",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 943.78,
         Kernels = kernels368
     },
     {
-        Name = "Mundilfari",
+        Identifier = "Mundilfari",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "MUNDILFARI",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 956.70,
         Kernels = kernels368
     },
     {
-        Name = "S/2006 S 1",
+        Identifier = "S2006S1",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65048",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2006 S 1",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 972.41,
         Kernels = kernels368
     },
     {
-        Name = "S/2004 S 17",
+        Identifier = "S2004S17",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65045",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2004 S 17",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 985.45,
         Kernels = kernels368
     },
     {
-        Name = "Bergelmir",
+        Identifier = "Bergelmir",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "BERGELMIR",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 985.83,
         Kernels = kernels368
     },
     {
-        Name = "Narvi",
+        Identifier = "Narvi",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "NARVI",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1008.45,
         Kernels = kernels368
     },
     {
-        Name = "Suttungr",
+        Identifier = "Suttungr",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SUTTUNGR",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1022.82,
         Kernels = kernels368
     },
     {
-        Name = "Hati",
+        Identifier = "Hati",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HATI",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1033.05,
         Kernels = kernels368
     },
     {
-        Name = "S/2004 S 12",
+        Identifier = "S2004S12",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65040",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2004 S 12",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1048.54,
         Kernels = kernels368
     },
     {
-        Name = "Farbauti",
+        Identifier = "Farbauti",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "FARBAUTI",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1054.78,
         Kernels = kernels368
     },
     {
-        Name = "Thrymr",
+        Identifier = "Thrymr",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "THRYMR",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1078.09,
         Kernels = kernels368
     },
     {
-        Name = "Aegir",
+        Identifier = "Aegir",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "AEGIR",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1094.46,
         Kernels = kernels368
     },
     {
-        Name = "S/2007 S 3",
+        Identifier = "S2007S3",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65056",
         Radii = { 5000, 5000, 5000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2007 S 3",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1100,
         Kernels = kernels368
     },
     {
-        Name = "Bestla",
+        Identifier = "Bestla",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "BESTLA",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1101.45,
         Kernels = kernels368
     },
     {
-        Name = "S/2004 S 7",
+        Identifier = "S2004S7",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65035",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2004 S 7",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1101.99,
         Kernels = kernels368
     },
     {
-        Name = "S/2006 S 3",
+        Identifier = "S2006S3",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "65050",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Name = "S/2006 S 3",
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1142.37,
         Kernels = kernels368
     },
     {
-        Name = "FENRIR",
+        Identifier = "FENRIR",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "FENRIR",
         Radii = { 4000, 4000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1212.53,
         Kernels = kernels368
     },
     -- Not yet in the Spice kernels
     -- {
-    --     Name = "Sutur", -- Rising
+    --     Identifier = "Sutur", -- Rising
     --     Parent = {
-    --         Name = parentName,
+    --         Identifier = parentIdentifier,
     --         Spice = parentSpice
     --     },
     --     Spice = "SUTUR",
     --     Radii = { 6000, 6000, 6000 },
     --     Tags = tags,
-    --     GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+    --     GUI = {
+    --         Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+    --     },
     --     TrailColor = trailColor,
     --     OrbitPeriod = 1242.36,
     --     Kernels = kernels368
     -- },
     {
-        Name = "Kari",
+        Identifier = "Kari",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "KARI",
         Radii = { 7000, 7000, 7000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1245.06,
         Kernels = kernels368
     },
     {
-        Name = "Ymir",
+        Identifier = "Ymir",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "YMIR",
         Radii = { 18000, 18000, 18000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1254.15,
         Kernels = kernels368
     },
     {
-        Name = "Loge",
+        Identifier = "Loge",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "LOGE",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1300.95,
         Kernels = kernels368
     },
     {
-        Name = "Fornjot",
+        Identifier = "Fornjot",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "FORNJOT",
         Radii = { 6000, 6000, 6000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Norse Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Norse Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1432.16,
         Kernels = kernels368
diff --git a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
index 38b356cd5e..0203893816 100644
--- a/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/minor/other_group.asset
@@ -6,190 +6,216 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 
-local parentName = transforms.SaturnBarycenter.Name
+local parentIdentifier = transforms.SaturnBarycenter.Identifier
 local parentSpice = "SATURN BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_saturn", "moon_other" }
 local trailColor = { 0.5, 0.3, 0.3 }
 
 local otherGroup = {
     {
-        Name = "Atlas",
+        Identifier = "Atlas",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ATLAS",
         Radii = { 41000, 35000, 19000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.60169,
         Kernels = kernels393
     },
     {
-        Name = "Prometheus",
+        Identifier = "Prometheus",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PROMETHEUS",
         Radii = { 136000, 79000, 59000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.61299,
         Kernels = kernels393
     },
     {
-        Name = "Pandora",
+        Identifier = "Pandora",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PANDORA",
         Radii = { 104000, 81000, 64000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.62850,
         Kernels = kernels393
     },
     {
-        Name = "Epimetheus",
+        Identifier = "Epimetheus",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "EPIMETHEUS",
         Radii = { 130000, 114000, 106000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.69433,
         Kernels = kernels393
     },
     {
-        Name = "Janus",
+        Identifier = "Janus",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "JANUS",
         Radii = { 203000, 185000, 153000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.69466,
         Kernels = kernels393
     },
     {
-        Name = "Aegaeon",
+        Identifier = "Aegaeon",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "AEGAEON",
         Radii = { 500, 500, 500 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.80812,
         Kernels = kernels393
     },
     {
-        Name = "Methone",
+        Identifier = "Methone",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "METHONE",
         Radii = { 3200, 3200, 3200 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.00957,
         Kernels = kernels393
     },
     {
-        Name = "Anthe",
+        Identifier = "Anthe",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ANTHE",
         Radii = { 1800, 1800, 1800 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.05089,
         Kernels = kernels393
     },
     {
-        Name = "Pallene",
+        Identifier = "Pallene",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PALLENE",
         Radii = { 6000, 6000, 4000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.370218,
         Kernels = kernels393
     },
     {
-        Name = "Telesto",
+        Identifier = "Telesto",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "TELESTO",
         Radii = { 33000, 24000, 20000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.887802,
         Kernels = kernels375
     },
     {
-        Name = "Calypso",
+        Identifier = "Calypso",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CALYPSO",
         Radii = { 30000, 23000, 14000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.887802,
         Kernels = kernels375
     },
     {
-        Name = "Helene",
+        Identifier = "Helene",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "HELENE",
         Radii = { 43000, 38000, 26000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 2.736915,
         Kernels = kernels375
     },
     {
-        Name = "Polydeuces",
+        Identifier = "Polydeuces",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "POLYDEUCES",
         Radii = { 3000, 2000, 1000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Saturn/Moons/Other Group",
+        GUI = {
+            Path = "/Solar System/Planets/Saturn/Moons/Other Group"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 2.736915,
         Kernels = kernels393
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index 6a0ff41807..ef17b8ae46 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Rhea = {
-    Name = "Rhea",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Rhea",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Rhea = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Rhea Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/rhea.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Rhea = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
index 36d1d469c3..d673879143 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local RheaTrail = {
-    Name = "RheaTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "RheaTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local RheaTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Rhea Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
index 7ba41f082c..5eba3cd243 100644
--- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Saturn = {
-    Name = "Saturn",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Saturn",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -29,7 +29,7 @@ local Saturn = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Saturn Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/saturn.jpg",
                     Enabled = true
                 }
@@ -37,19 +37,24 @@ local Saturn = {
         }
     },
     Tag = { "planet_solarSystem", "planet_giants" },
-    GuiPath = "/Solar System/Planets/Saturn"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn"
+    }
 }
 
 local SaturnRings = {
-    Name = "SaturnRings",
-    Parent = Saturn.Name,
+    Identifier = "SaturnRings",
+    Parent = Saturn.Identifier,
     Renderable = {
         Type = "RenderableRings",
         Texture = textures .. "/saturn_rings.png",
         Size = 140220000,
         Offset = { 74500 / 140445.100671159, 1.0 } -- min / max extend
     },
-    GuiPath = "/Solar System/Planets/Saturn"
+    GUI = {
+        Name = "Saturn Rings",
+        Path = "/Solar System/Planets/Saturn"
+    }
 },
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index a56abc150e..dbcc1147ca 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Tethys = {
-    Name = "Tethys",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Tethys",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Tethys = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Tethys Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/tethys.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Tethys = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
index 359b8cde03..13a2cfce44 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local TethysTrail = {
-    Name = "TethysTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "TethysTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local TethysTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Tethys Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index 6c739bdc27..0e90ce2f8c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Titan = {
-    Name = "Titan",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "Titan",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -35,7 +35,7 @@ local Titan = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Titan Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/titan.jpg",
                     Enabled = true
                 }
@@ -43,7 +43,9 @@ local Titan = {
         }
     },
     Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
index 733b7c60d0..715c45ff74 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/trail.asset
@@ -5,8 +5,8 @@ local kernels375 = asset.require('../sat375').Kernels
 
 
 local TitanTrail = {
-    Name = "TitanTrail",
-    Parent = transforms.SaturnBarycenter.Name,
+    Identifier = "TitanTrail",
+    Parent = transforms.SaturnBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -20,7 +20,10 @@ local TitanTrail = {
         Resolution = 1000
     },
     Tag = { "moonTrail_solarSystem", "moonTrail_giants", "moonTrail_saturn" },
-    GuiPath = "/Solar System/Planets/Saturn/Moons"
+    GUI = {
+        Name = "Titan Trail",
+        Path = "/Solar System/Planets/Saturn/Moons"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset
index 31dd0bb5c0..590d9d3bda 100644
--- a/data/assets/scene/solarsystem/planets/saturn/trail.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset
@@ -4,8 +4,8 @@ local transforms = asset.require('scene/solarsystem/sun/transforms')
 
 
 local SaturnTrail = {
-    Name = "SaturnTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "SaturnTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -18,7 +18,10 @@ local SaturnTrail = {
         Resolution = 1000
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
-    GuiPath = "/Solar System/Planets/Saturn"
+    GUI = {
+        Name = "Saturn Trail",
+        Path = "/Solar System/Planets/Saturn"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
index fb262abb40..910aae992f 100644
--- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local SaturnBarycenter = {
-    Name = "SaturnBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "SaturnBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,11 @@ local SaturnBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Saturn"
+    GUI = {
+        Name = "Saturn Barycenter",
+        Path = "/Solar System/Planets/Saturn",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
index ae453c899a..6b27fe5cd3 100644
--- a/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/inner_moons.asset
@@ -5,190 +5,216 @@ local kernels091 = asset.require('./ura091').Kernels
 
 
 
-local parentName = transforms.UranusBarycenter.Name
+local parentIdentifier = transforms.UranusBarycenter.Identifier
 local parentSpice = "URANUS BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_inner" }
 local trailColor = { 0.60, 0.65, 0.84 }
 
 local innerMoons = {
     {
-        Name = "Cordelia",
+        Identifier = "Cordelia",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CORDELIA",
         Radii = { 40000, 40000, 40000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.335034,
         Kernels = kernels091
     },
     {
-        Name = "Ophelia",
+        Identifier = "Ophelia",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "OPHELIA",
         Radii = { 43000, 43000, 43000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.376400,
         Kernels = kernels091
     },
     {
-        Name = "Bianca",
+        Identifier = "Bianca",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "BIANCA",
         Radii = { 51000, 51000, 51000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.434579,
         Kernels = kernels091
     },
     {
-        Name = "Cressida",
+        Identifier = "Cressida",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CRESSIDA",
         Radii = { 80000, 80000, 80000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.463570,
         Kernels = kernels091
     },
     {
-        Name = "Desdemona",
+        Identifier = "Desdemona",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "DESDEMONA",
         Radii = { 64000, 64000, 64000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.473650,
         Kernels = kernels091
     },
     {
-        Name = "Juliet",
+        Identifier = "Juliet",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "JULIET",
         Radii = { 94000, 94000, 94000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.493065,
         Kernels = kernels091
     },
     {
-        Name = "Portia",
+        Identifier = "Portia",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PORTIA",
         Radii = { 135000, 135000, 135000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.513196,
         Kernels = kernels091
     },
     {
-        Name = "Rosalind",
+        Identifier = "Rosalind",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ROSALIND",
         Radii = { 72000, 72000, 72000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.558460,
         Kernels = kernels091
     },
     {
-        Name = "Cupid",
+        Identifier = "Cupid",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CUPID",
         Radii = { 18000, 18000, 18000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.618,
         Kernels = kernels091
     },
     {
-        Name = "Belinda",
+        Identifier = "Belinda",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "BELINDA",
         Radii = { 90000, 90000, 90000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.623527,
         Kernels = kernels091
     },
     {
-        Name = "Perdita",
+        Identifier = "Perdita",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PERDITA",
         Radii = { 30000, 30000, 30000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.638,
         Kernels = kernels091
     },
     {
-        Name = "Puck",
+        Identifier = "Puck",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PUCK",
         Radii = { 162000, 162000, 162000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.761833,
         Kernels = kernels091
     },
     {
-        Name = "Mab",
+        Identifier = "Mab",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "MAB",
         Radii = { 25000, 25000, 25000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Inner Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Inner Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 0.923,
         Kernels = kernels091
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
index 34522a58ad..d866dfbd7f 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_prograde_moons.asset
@@ -5,22 +5,24 @@ local kernels112 = asset.require('./ura112').Kernels
 
 
 
-local parentName = transforms.UranusBarycenter.Name
+local parentIdentifier = transforms.UranusBarycenter.Identifier
 local parentSpice = "URANUS BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_prograde" }
 local trailColor = { 0.60, 0.65, 0.84 }
 
 local irregularMoons = {
     {
-        Name = "Margaret",
+        Identifier = "Margaret",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "MARGARET",
         Radii = { 20000, 20000, 20000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Prograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Prograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1694.8,
         Kernels = kernels112
diff --git a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
index bf3817e663..9e1efdd062 100644
--- a/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/irregular_retrograde_moons.asset
@@ -5,120 +5,136 @@ local kernels112 = asset.require('./ura112').Kernels
 
 
 
-local parentName = transforms.UranusBarycenter.Name
+local parentIdentifier = transforms.UranusBarycenter.Identifier
 local parentSpice = "URANUS BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_irregular_retrograde" }
 local trailColor = { 0.60, 0.65, 0.84 }
 
 local irregularMoons = {
     {
-        Name = "Francisco",
+        Identifier = "Francisco",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "FRANCISCO",
         Radii = { 22000, 22000, 22000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 266.56,
         Kernels = kernels112
     },
     {
-        Name = "Caliban",
+        Identifier = "Caliban",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "CALIBAN",
         Radii = { 72000, 72000, 72000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 579.50,
         Kernels = kernels112
     },
     {
-        Name = "Stephano",
+        Identifier = "Stephano",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "STEPHANO",
         Radii = { 32000, 32000, 32000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 676.50,
         Kernels = kernels112
     },
     {
-        Name = "Trinculo",
+        Identifier = "Trinculo",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "TRINCULO",
         Radii = { 18000, 18000, 18000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 758.10,
         Kernels = kernels112
     },
     {
-        Name = "Sycorax",
+        Identifier = "Sycorax",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SYCORAX",
         Radii = { 165000, 165000, 165000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1283.4,
         Kernels = kernels112
     },
     {
-        Name = "Prospero",
+        Identifier = "Prospero",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "PROSPERO",
         Radii = { 50000, 50000, 50000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1992.8,
         Kernels = kernels112
     },
     {
-        Name = "Setebos",
+        Identifier = "Setebos",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "SETEBOS",
         Radii = { 48000, 48000, 48000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 2202.3,
         Kernels = kernels112
     },
     {
-        Name = "Ferdinand",
+        Identifier = "Ferdinand",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "FERDINAND",
         Radii = { 20000, 20000, 20000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Irregular Retrograde Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 2823.4,
         Kernels = kernels112
diff --git a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
index 45d6e0cce1..a8d44f1514 100644
--- a/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/major_moons.asset
@@ -5,78 +5,88 @@ local kernels111 = asset.require('./ura111').Kernels
 
 
 
-local parentName = transforms.UranusBarycenter.Name
+local parentIdentifier = transforms.UranusBarycenter.Identifier
 local parentSpice = "URANUS BARYCENTER"
 local tags = { "moon_solarSystem", "moon_giants", "moon_uranus", "moon_major" }
 local trailColor = { 0.60, 0.65, 0.84 }
 
 local majorMoons = {
     {
-        Name = "Miranda",
+        Identifier = "Miranda",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "MIRANDA",
         Radii = { 471600, 468000, 466000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Major Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 1.413479,
         Kernels = kernels111
     },
     {
-        Name = "Ariel",
+        Identifier = "Ariel",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "ARIEL",
         Radii = { 1162000, 1156000, 1155000 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Major Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 2.520379,
         Kernels = kernels111
     },
     {
-        Name = "Umbriel",
+        Identifier = "Umbriel",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "UMBRIEL",
         Radii = { 1169400, 1169400, 1169400 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Major Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 4.144177,
         Kernels = kernels111
     },
     {
-        Name = "Titania",
+        Identifier = "Titania",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "TITANIA",
         Radii = { 1576800, 1576800, 1576800 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Major Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 8.705872,
         Kernels = kernels111
     },
     {
-        Name = "Oberon",
+        Identifier = "Oberon",
         Parent = {
-            Name = parentName,
+            Identifier = parentIdentifier,
             Spice = parentSpice
         },
         Spice = "OBERON",
         Radii = { 1522800, 1522800, 1522800 },
         Tags = tags,
-        GuiPath = "/Solar System/Planets/Uranus/Moons/Major Moons",
+        GUI = {
+            Path = "/Solar System/Planets/Uranus/Moons/Major Moons"
+        },
         TrailColor = trailColor,
         OrbitPeriod = 13.463239,
         Kernels = kernels111
diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset
index a558871700..7acf031ffe 100644
--- a/data/assets/scene/solarsystem/planets/uranus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset
@@ -4,8 +4,8 @@ local transforms = asset.require('scene/solarsystem/sun/transforms')
 
 
 local UranusTrail = {
-    Name = "UranusTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "UranusTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -18,7 +18,10 @@ local UranusTrail = {
         Resolution = 1000
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_giants" },
-    GuiPath = "/Solar System/Planets/Uranus"
+    GUI = {
+        Name = "Uranus Trail",
+        Path = "/Solar System/Planets/Uranus"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
index 0647e15403..2b801bebd1 100644
--- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local UranusBarycenter = {
-    Name = "UranusBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "UranusBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,11 @@ local UranusBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Uranus"
+    GUI = {
+        Name = "Uranus Barycenter",
+        Path = "/Solar System/Planets/Uranus",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
index 8cb72d3c88..1bb29fa184 100644
--- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset
+++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Uranus = {
-    Name = "Uranus",
-    Parent = transforms.UranusBarycenter.Name,
+    Identifier = "Uranus",
+    Parent = transforms.UranusBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -29,7 +29,7 @@ local Uranus = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/uranus.jpg",
                     Enabled = true
                 }
@@ -37,7 +37,9 @@ local Uranus = {
         }
     },
     Tag = { "planet_solarSystem", "planet_giants" },
-    GuiPath = "/Solar System/Planets/Uranus"
+    GUI = {
+        Path = "/Solar System/Planets/Uranus"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset
index 0d4e4853e7..b9c3d86743 100644
--- a/data/assets/scene/solarsystem/planets/venus/trail.asset
+++ b/data/assets/scene/solarsystem/planets/venus/trail.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local VenusTrail = {
-    Name = "VenusTrail",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "VenusTrail",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailOrbit",
         Translation = {
@@ -19,7 +19,11 @@ local VenusTrail = {
         Resolution = 1000
     },
     Tag = { "planetTrail_solarSystem", "planetTrail_terrestrial" },
-    GuiPath = "/Solar System/Planets/Venus"
+    GUI = {
+        Name = "Venus Trail",
+        Path = "/Solar System/Planets/Venus",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset
index 71ff2ddd57..f8b0bf0307 100644
--- a/data/assets/scene/solarsystem/planets/venus/transforms.asset
+++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset
@@ -5,8 +5,8 @@ asset.require("spice/base")
 
 
 local VenusBarycenter = {
-    Name = "VenusBarycenter",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "VenusBarycenter",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -14,7 +14,10 @@ local VenusBarycenter = {
             Observer = "SUN"
         }
     },
-    GuiPath = "/Solar System/Planets/Venus"
+    GUI = {
+        Name = "Venus Barycenter",
+        Path = "/Solar System/Planets/Venus"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 7596c7d076..6cb6586798 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -13,8 +13,8 @@ local textures = asset.syncedResource({
 })
 
 local Venus = {
-    Name = "Venus",
-    Parent = transforms.VenusBarycenter.Name,
+    Identifier = "Venus",
+    Parent = transforms.VenusBarycenter.Identifier,
     Transform = {
         Rotation = {
             Type = "SpiceRotation",
@@ -34,7 +34,7 @@ local Venus = {
         Layers = {
             ColorLayers = {
                 {
-                    Name = "Venus Texture",
+                    Identifier = "Texture",
                     FilePath = textures .. "/venus.jpg",
                     Enabled = true
                 }
@@ -42,7 +42,9 @@ local Venus = {
         }
     },
     Tag = { "planet_solarSystem", "planet_terrestrial" },
-    GuiPath = "/Solar System/Planets/Venus"
+    GUI = {
+        Path = "/Solar System/Planets/Venus"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset
index fd35d5cc16..14e3af3264 100644
--- a/data/assets/scene/solarsystem/sun/glare.asset
+++ b/data/assets/scene/solarsystem/sun/glare.asset
@@ -6,8 +6,8 @@ asset.require("spice/base")
 
 
 local SunGlare = {
-    Name = "SunGlare",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "SunGlare",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderablePlaneImageLocal",
         Size = 1.3*10^10.5,
@@ -23,7 +23,10 @@ local SunGlare = {
             Observer = "SSB"
         }
     },
-    GuiPath = "/Solar System/Sun"
+    GUI = {
+        Name = "Sun Glare",
+        Path = "/Solar System/Sun"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset
index 604ad37456..7bfdaf911e 100644
--- a/data/assets/scene/solarsystem/sun/marker.asset
+++ b/data/assets/scene/solarsystem/sun/marker.asset
@@ -6,8 +6,8 @@ asset.require("spice/base")
 
 
 local SunMarker = {
-    Name = "SunMarker",
-    Parent = transforms.SolarSystemBarycenter.Name,
+    Identifier = "SunMarker",
+    Parent = transforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Enabled = false,
         Type = "RenderablePlaneImageLocal",
@@ -17,7 +17,10 @@ local SunMarker = {
         Texture = textures .. "/marker.png",
         BlendMode = "Additive"
     },
-    GuiPath = "/Solar System/Sun"
+    GUI = {
+        Name = "Sun Marker",
+        Path = "/Solar System/Sun"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset
index 9df364e153..b9a51bf6bc 100644
--- a/data/assets/scene/solarsystem/sun/sun.asset
+++ b/data/assets/scene/solarsystem/sun/sun.asset
@@ -6,8 +6,8 @@ asset.require("spice/base")
 
 
 local Sun = {
-    Name = "Sun",
-    Parent = transforms.SunIAU.Name,
+    Identifier = "Sun",
+    Parent = transforms.SunIAU.Identifier,
     Renderable = {
         Type = "RenderablePlanet",
         Frame = "IAU_SUN",
@@ -20,7 +20,9 @@ local Sun = {
         ColorTexture = textures .. "/sun.jpg",
         PerformShading = false
     },
-    GuiPath = "/Solar System/Sun"
+    GUI = {
+        Path = "/Solar System/Sun"
+    }
 }
 
 
diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset
index f5345a0adc..d30fef8ae6 100644
--- a/data/assets/scene/solarsystem/sun/transforms.asset
+++ b/data/assets/scene/solarsystem/sun/transforms.asset
@@ -5,14 +5,19 @@ asset.require("spice/base")
 
 -- Barycenter of the solar system, expressed in the Galactic frame
 local SolarSystemBarycenter = {
-    Name = "SolarSystemBarycenter"
+    Identifier = "SolarSystemBarycenter",
+    GUI = {
+        Name = "Solar System Barycenter",
+        Path = "/Solar System",
+        Hidden = true
+    }
     -- No parent; this node is attached to the scene graph root
 }
 
 -- Spice frame for the Sun
 local SunIAU = {
-    Name = "SunIAU",
-    Parent = SolarSystemBarycenter.Name,
+    Identifier = "SunIAU",
+    Parent = SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
             Type = "SpiceTranslation",
@@ -25,7 +30,11 @@ local SunIAU = {
             DestinationFrame = "GALACTIC"
         }
     },
-    GuiPath = "/Solar System/Sun"
+    GUI = {
+        Name = "SUN IAU",
+        Path = "/Solar System/Sun",
+        Hidden = true
+    }
 }
 
 
diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset
index bc738cf2e9..956b3a5758 100644
--- a/data/assets/util/asset_helper.asset
+++ b/data/assets/util/asset_helper.asset
@@ -37,7 +37,7 @@ local registerSceneGraphNodes = function (sceneAsset, nodes, override)
     sceneAsset.onDeinitialize(function ()
         for i = #nodes, 1, -1 do
             node = nodes[i]
-            openspace.removeSceneGraphNode(node.Name)
+            openspace.removeSceneGraphNode(node.Identifier)
         end
     end)
 end
@@ -50,7 +50,12 @@ local registerSceneGraphNodesAndExport = function (sceneAsset, nodes, override)
             return
         end
     end
-    
+
+    for i, node in ipairs(nodes) do
+        if not node.Identifier then
+            openspace.printError("Could not load asset as Identifier was missing")
+        end
+    end
 
     sceneAsset.onInitialize(function ()
         for i, node in ipairs(nodes) do
@@ -60,27 +65,27 @@ local registerSceneGraphNodesAndExport = function (sceneAsset, nodes, override)
     sceneAsset.onDeinitialize(function ()
         for i = #nodes, 1, -1 do
             node = nodes[i]
-            openspace.removeSceneGraphNode(node.Name)
+            openspace.removeSceneGraphNode(node.Identifier)
         end
     end)
 
     for i, node in ipairs(nodes) do
-        asset.export(node.Name, node)
+        sceneAsset.export(node.Identifier, node)
     end
 end
 
-local requireAll = function (asset, directory)
+local requireAll = function (sceneAsset, directory)
     function string.ends(String,End)
        return End=='' or string.sub(String,-string.len(End))==End
     end
 
     local result = {}
 
-    local files = openspace.walkDirectoryFiles(asset.localResource('') .. directory, true)
+    local files = openspace.walkDirectoryFiles(sceneAsset.localResource('') .. directory, true)
     for _, file in pairs(files) do
         if file:ends('.asset') then
             openspace.printDebug("Requiring: " .. file:sub(file:find(directory), -7))
-            local exports = asset.require(file:sub(1, -7))
+            local exports = sceneAsset.require(file:sub(1, -7))
             table.insert(result, exports)
         end
     end
@@ -88,16 +93,16 @@ local requireAll = function (asset, directory)
     return result
 end
 
-local requestAll = function (asset, directory)
+local requestAll = function (sceneAsset, directory)
     function string.ends(String,End)
        return End=='' or string.sub(String,-string.len(End))==End
     end
 
-    local files = openspace.walkDirectoryFiles(asset.localResource('') .. directory, true)
+    local files = openspace.walkDirectoryFiles(sceneAsset.localResource('') .. directory, true)
     for _, file in pairs(files) do
         if file:ends('.asset') then
             openspace.printDebug("Requesting: " .. file:sub(file:find(directory), -7))
-            asset.request(file:sub(file:find(directory), -7))
+            sceneAsset.request(file:sub(file:find(directory), -7))
         end
     end
 end
diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset
index 5a8e0b800b..3d31d9bdcc 100644
--- a/data/assets/util/default_keybindings.asset
+++ b/data/assets/util/default_keybindings.asset
@@ -5,7 +5,7 @@ local Keybindings = {
     {
         Key = "F2",
         Command =
-[[local b = openspace.getPropertyValue('Modules.ImGUI.Main.Scene Properties.Enabled');
+[[local b = openspace.getPropertyValue('Modules.ImGUI.Main.SceneProperties.Enabled');
 local c = openspace.getPropertyValue('Modules.ImGUI.Main.IsHidden');
 openspace.setPropertyValue('Modules.ImGUI.*.Enabled', false);
 if b and c then
@@ -13,11 +13,11 @@ if b and c then
     -- and then closed again. So the main properties window is enabled, but also all
     -- windows are hidden
     openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', false);
-    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Scene Properties.Enabled', true);
-    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Space/Time.Enabled', true);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.SceneProperties.Enabled', true);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.SpaceTime.Enabled', true);
 else
-    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Scene Properties.Enabled', not b);
-    openspace.setPropertyValueSingle('Modules.ImGUI.Main.Space/Time.Enabled', not b);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.SceneProperties.Enabled', not b);
+    openspace.setPropertyValueSingle('Modules.ImGUI.Main.SpaceTime.Enabled', not b);
     openspace.setPropertyValueSingle('Modules.ImGUI.Main.IsHidden', b);
 end]],
         Documentation = "Shows or hides the properties window",
diff --git a/data/assets/util/procedural_globe.asset b/data/assets/util/procedural_globe.asset
index c055d43420..6a7650fe94 100644
--- a/data/assets/util/procedural_globe.asset
+++ b/data/assets/util/procedural_globe.asset
@@ -1,8 +1,8 @@
 asset.require('spice/base')
 
-local createGlobe = function(name, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels)
+local createGlobeWithoutName = function(identifier, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels)
     return {
-        Name = name,
+        Identifier = identifier,
         Parent = parent,
         Transform = {
             Translation = {
@@ -19,10 +19,12 @@ local createGlobe = function(name, parent, parentSpiceName, spiceName, radii, ta
             Layers = {},
             Tag = tags
         },
-        GuiPath = guiPath
+        GUI = {
+            Path = guiPath
+        }
     },
     {
-        Name = name .. "Trail",
+        Identifier = identifier .. "Trail",
         Parent = parent,
         Renderable = {
             Type = "RenderableTrailOrbit",
@@ -35,13 +37,25 @@ local createGlobe = function(name, parent, parentSpiceName, spiceName, radii, ta
             Period = orbitPeriod,
             Resolution = 1000
         },
-        GuiPath = guiPath
+        GUI = {
+            Path = guiPath
+        }
     }
 end
-asset.export("createGlobe", createGlobe)
+
+local createGlobeWithName = function(identifier, name, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels)
+    g, t = createGlobeWithoutName(identifier, parent, parentSpiceName, spiceName, radii, tags, guiPath, trailColor, orbitPeriod, kernels)
+
+    g.GUI.Name = name
+    t.GUI.Name = name .. " Trail"
+
+    return g, t
+end
+asset.export("createGlobeWithoutName", createGlobeWithoutName)
+asset.export("createGlobeWithName", createGlobeWithName)
+
 
 local createGlobes = function(t)
-
     for _,v in pairs(t) do
         if type(v) ~= "table" then
             openspace.printWarning("The table passed to 'createGlobes' was not a table of tables")
@@ -53,18 +67,36 @@ local createGlobes = function(t)
     result = {}
 
     for i, v in ipairs(t) do
-        globe, trail = createGlobe(
-            v.Name,
-            v.Parent.Name,
-            v.Parent.Spice,
-            v.Spice,
-            v.Radii,
-            v.Tags,
-            v.GuiPath,
-            v.TrailColor,
-            v.OrbitPeriod,
-            v.Kernels
-        )
+        local globe = nil
+        local trail = nil
+        if v.Name then
+            globe, trail = createGlobeWithName(
+                v.Identifier,
+                v.GUI.Name,
+                v.Parent.Identifier,
+                v.Parent.Spice,
+                v.Spice,
+                v.Radii,
+                v.Tags,
+                v.GUI.Path,
+                v.TrailColor,
+                v.OrbitPeriod,
+                v.Kernels
+            )
+        else
+            globe, trail = createGlobeWithoutName(
+                v.Identifier,
+                v.Parent.Identifier,
+                v.Parent.Spice,
+                v.Spice,
+                v.Radii,
+                v.Tags,
+                v.GUI.Path,
+                v.TrailColor,
+                v.OrbitPeriod,
+                v.Kernels
+            )
+        end
 
         table.insert(result, globe)
         table.insert(result, trail)
diff --git a/data/assets/util/property_helper.asset b/data/assets/util/property_helper.asset
index 8d3576d130..dab5038a2c 100644
--- a/data/assets/util/property_helper.asset
+++ b/data/assets/util/property_helper.asset
@@ -16,6 +16,35 @@ local decrement = function(prop, value)
     return increment(prop, -value)
 end
 
+local fade = function(prop, value, duration)
+    assert(type(prop) == "string", "prop must be a number")
+    assert(type(duration) == "number", "duration must be a number")
+
+    local escaped_property = "'" .. prop .. "'"
+    return "openspace.setPropertyValue(" .. escaped_property ..", " .. tostring(value) .. ", " .. tostring(duration) .. ")"
+end
+
+local fadeOut = function(prop, duration)
+    return fade(prop, 0.0, duration)
+end
+
+local fadeIn = function(prop, duration)
+    return fade(prop, 1.0, duration)
+end
+
+local fadeInOut = function(prop, duration)
+    assert(type(prop) == "string", "prop must be a number")
+    assert(type(duration) == "number", "duration must be a number")
+
+    local escaped_property = "'" .. prop .. "'"
+    -- If the value is > 0.5 fade out, otherwise fade in
+    return "local v = openspace.getPropertyValue(" .. escaped_property .. "); if v <= 0.5 then " .. fadeIn(prop, duration) .. " else " .. fadeOut(prop, duration) .. " end"
+end
+
 asset.export('invert', invert)
 asset.export('increment', increment)
 asset.export('decrement', decrement)
+asset.export('fade', fade)
+asset.export('fadeIn', fadeIn)
+asset.export('fadeOut', fadeOut)
+asset.export('fadeInOut', fadeInOut)
diff --git a/data/assets/voyager.scene b/data/assets/voyager.scene
index 9bce0d584e..a5d24cd235 100644
--- a/data/assets/voyager.scene
+++ b/data/assets/voyager.scene
@@ -47,7 +47,7 @@ asset.onInitialize(function ()
     )
 
     openspace.navigation.setCameraState({
-        Focus = VoyagerAsset["Voyager 1"].Name,
+        Focus = VoyagerAsset.Voyager_1.Identifier,
         Position = { 526781518487.171326, 257168309890.072144, -1381125204152.817383 },
         Rotation = { -0.106166, 0.981574, -0.084545, 0.134513 },
     })
diff --git a/data/tasks/default.task b/data/tasks/default.task
index 1170166620..a564707544 100644
--- a/data/tasks/default.task
+++ b/data/tasks/default.task
@@ -1,3 +1 @@
-return {
-    "kameleonmetadatatojson"
-}
+return {}
diff --git a/data/web/log/script.js b/data/web/log/script.js
index fefe69a3c0..9d82ac59ac 100644
--- a/data/web/log/script.js
+++ b/data/web/log/script.js
@@ -1,6 +1,19 @@
+var sessionData = {};
+try {
+  sessionData = JSON.parse(decodeURIComponent(window.location.hash.slice(1)));
+} catch (e) {}
+
 var levels = ['trace', 'debug', 'info', 'warning', 'error', 'fatal'];
 var filterLevel = 0;
 
+function insert(newNode, parentNode) {
+  parentNode.insertBefore(newNode, null);
+}
+
+function insertBefore(newNode, referenceNode) {
+  referenceNode.parentNode.insertBefore(newNode, referenceNode);
+}
+
 function insertAfter(newNode, referenceNode) {
   referenceNode.parentNode.insertBefore(newNode, referenceNode.nextSibling);
 }
@@ -12,7 +25,9 @@ function remove(node) {
 function scrollToPosition(selector) {
   var element = document.querySelector(selector);
   if (element && element.scrollIntoView) {
-    element.scrollIntoView();
+    var rect = element.getBoundingClientRect();
+    // Header is 80 px, 40 px margin
+    window.scrollTo(window.scrollX, + window.scrollY + rect.top - 80 - 40);
   }
 }
 
@@ -80,49 +95,132 @@ function updateFilter() {
     }
   });
   if (nShown === 0) {
-    var select = document.getElementsByTagName('select')[0];
+    var header = document.getElementsByTagName('header')[0];
     var p = document.createElement("p");
     p.id = "no-messages";
     p.innerHTML = "There are no log messages with the level '" + levels[filterLevel] + "' or higher.";
-    insertAfter(p, select);
+    insertAfter(p, header);
     table.classList.add('hidden');
   }
 }
 
+var reloadHandle = 0;
+
+function scheduleReload() {
+  updateSessionData({
+    reload: true
+  });
+  reloadHandle = window.setTimeout(function () {
+    window.location.reload();
+  }, 5000);
+}
+
+function unscheduleReload() {
+  updateSessionData({
+    reload: false
+  });
+  window.clearTimeout(reloadHandle);
+}
+
+function updateSessionData(obj) {
+  var changed = false;
+  Object.keys(obj).forEach(function (k) {
+    if (sessionData != obj[k]) {
+      sessionData[k] = obj[k];
+      changed = true;
+    }
+    if (!sessionData[k]) {
+      delete sessionData[k];
+    }
+  });
+  if (changed) {
+    window.location.hash = '#' + JSON.stringify(sessionData);
+  }
+}
+
 window.onload = function () {
-  var header = document.getElementsByTagName('h1')[0];
-  header.innerHTML = "OpenSpace Log";
+  var header = document.createElement('header');
+
+  var headerTitle = document.createElement('h1');
+  headerTitle.innerHTML = "OpenSpace Log";
 
   var summary = document.createElement('p');
+  summary.id = 'summary';
   summary.innerHTML = getSummary();
 
-  var select = document.createElement('select');
-  select.id = 'filter-level-selector';
+  var selectFilter = document.createElement('select');
+  selectFilter.id = 'filter-level-selector';
 
-  var selectLabel = document.createElement('label');
-  selectLabel.for = 'filter-level-selector';
-  selectLabel.innerHTML = "Lowest log level to show: ";
+  var selectFilterGroup = document.createElement('div');
+  var selectFilterLabel = document.createElement('label');
+  selectFilterLabel.innerHTML = "Filter level";
 
   levels.forEach(function (level) {
     var option = document.createElement('option');
     option.value = level;
     option.innerHTML = level;
-    select.appendChild(option);
+    selectFilter.appendChild(option);
   });
 
-  insertAfter(summary, header);
-  insertAfter(selectLabel, summary);
-  insertAfter(select, selectLabel);
 
-  var preselectedIndex = levels.indexOf(window.location.hash.slice(1));
+  var autoReloadToggle = document.createElement('input');
+  autoReloadToggle.type = 'checkbox';
+
+  if (sessionData.reload) {
+    scheduleReload();
+    autoReloadToggle.checked = true;
+    if (sessionData.trackBottom) {
+      window.setTimeout(function () {
+        window.scrollTo(window.scrollX, document.body.scrollHeight);
+      }, 1);
+    }
+  }
+
+  autoReloadToggle.onchange = function () {
+    if (autoReloadToggle.checked) {
+      scheduleReload();
+    } else {
+      unscheduleReload();
+    }
+  };
+
+  var autoReloadLabel = document.createElement('label');
+  autoReloadLabel.innerHTML = "Auto-reload";
+
+  var autoReloadGroup = document.createElement('div');
+
+  insertBefore(header, document.getElementsByTagName('table')[0]);
+  insert(headerTitle, header);
+  insert(summary, header);
+
+  insert(selectFilterLabel, selectFilterGroup)
+  insert(selectFilter, selectFilterGroup);
+  insert(selectFilterGroup, header);
+
+  insert(autoReloadLabel, autoReloadGroup);
+  insert(autoReloadToggle, autoReloadGroup);
+  insert(autoReloadGroup, header)
+
+
+  var preselectedIndex = levels.indexOf(sessionData.filter || 'trace');
   if (preselectedIndex >= 0) {
-    filterLevel = select.selectedIndex = preselectedIndex;
+    filterLevel = selectFilter.selectedIndex = preselectedIndex;
     updateFilter();
   }
 
-  select.onchange = function (evt) {
-    filterLevel = select.selectedIndex;
+  selectFilter.onchange = function (evt) {
+    filterLevel = selectFilter.selectedIndex;
     updateFilter();
-    window.location.hash = '#' + select.options[select.selectedIndex].value;
+    updateSessionData({
+      filter: selectFilter.options[selectFilter.selectedIndex].value
+    });
   };
+
+  window.onscroll = function () {
+    var scroll = document.documentElement.scrollTop || document.body.scrollTop;
+    scroll += window.innerHeight;
+    updateSessionData({
+      trackBottom: scroll > document.body.scrollHeight - 10
+    });
+  }
 }
\ No newline at end of file
diff --git a/data/web/log/style.css b/data/web/log/style.css
index 5b14dc72ad..6f3854d6b1 100644
--- a/data/web/log/style.css
+++ b/data/web/log/style.css
@@ -1,5 +1,33 @@
-table {
+html, body {
+  background-color: #222;
+}
+
+header {
+  position: fixed;
   width: 100%;
+  height: 80px;
+  z-index: 1;
+  background-color: #000;
+  min-width: 800px;
+}
+
+header div {
+  float: left;
+  color: #ddd;
+  margin-top: 30px;
+  margin-right: 20px;
+  float: right;
+}
+
+label {
+  margin-right: 10px;
+}
+
+table {
+  position: relative;
+  top: 80px;
+  width: 100%;
+  background-color: #222;
 }
 
 td, th {
@@ -7,51 +35,56 @@ td, th {
 }
 
 .log-date {
-  width: 8em;
+  white-space: nowrap;
 }
 
 h1 {
+  color: #fff;
   padding-left: 15px;
+  float: left;
+  margin-right: 15px;
+}
+
+#summary {
+  float: left;
+  margin-left: 20px;
+  margin-top: 30px;
+}
+
+#filter-level-selector {
+  background-color: #333;
+  color: #eee;
 }
 
 .hidden {
   display: none;
 }
 
-p, label {
-  margin-left: 15px;
-  margin-bottom: 15px;
-}
-
-label {
-  margin-right: 0.5em;
-}
-
 .log-level-trace {
-  color: #eeeeee;
-  background-color: #aaaaaa;
-  border-bottom: 1px solid #eaeaea;
+  color: #eee;
+  background-color: #333;
+  border-bottom: 1px solid #111;
 }
 .log-level-trace td:first-child {
-  border-left: 10px solid #eaeaea;
+  border-left: 10px solid #111;
 }
 
 .log-level-debug {
-  background-color: #bbdda9;
-  border-bottom: 1px solid #7bc142;
-  color: #265127;
+  background-color: #3A4556;
+  border-bottom: 1px solid #172228;
+  color: #ccd1d6;
 }
 .log-level-debug td:first-child {
-  border-left: 10px solid #7bc142;
+  border-left: 10px solid #172228;
 }
 
 thead, .log-level-info {
-  color: #333333;
-  background-color: #ffffff;
-  border-bottom: 1px solid #eaeaea;
+  color: #eee;
+  background-color: #333;
+  border-bottom: 1px solid #111;
 }
 .log-level-info td:first-child {
-  border-left: 10px solid #eaeaea;
+  border-left: 10px solid #111;
 }
 
 thead th:first-child {
@@ -68,12 +101,12 @@ thead th:first-child {
 }
 
 .log-level-error {
-  color: #4c1315;
-  background-color: #fcdcdc;
-  border-bottom: 1px solid #d66767;
+  color: #fcdcdc;
+  background-color: #d66767;
+  border-bottom: 1px solid #721c1c;
 }
 .log-level-error td:first-child {
-  border-left: 10px solid #d66767;
+  border-left: 10px solid #721c1c;
 }
 
 .log-level-fatal {
@@ -93,11 +126,27 @@ thead th:first-child {
   background-color: #fef8c3;
 }
 .summary-error {
-  background-color: #fcdcdc;
+  background-color: #d66767;
+  color: #fcdcdc;
 }
+.summary-error a {
+  color: #fff;
+}
+
 .summary-fatal {
   background-color: #ff7dc1;
 }
+.summary-fatal a {
+  color: #fff;
+}
+
 .summary-ok {
   background-color: #bbdda9;
+}
+
+#no-messages {
+  position: relative;
+  top: 120px;
+  margin-left: 20px;
+  color: #ddd;
 }
\ No newline at end of file
diff --git a/ext/sgct b/ext/sgct
index 462cca02c6..0f689a49a8 160000
--- a/ext/sgct
+++ b/ext/sgct
@@ -1 +1 @@
-Subproject commit 462cca02c68e6fe74ccc3aa18580aae673ecc5aa
+Subproject commit 0f689a49a8d0e47cdba9d57b9b9cf5e98fb7847a
diff --git a/include/openspace/engine/configurationmanager.h b/include/openspace/engine/configurationmanager.h
index cd6735ab3d..ac7c325e27 100644
--- a/include/openspace/engine/configurationmanager.h
+++ b/include/openspace/engine/configurationmanager.h
@@ -86,6 +86,9 @@ public:
 
     /// The key that stores the factory documentation values
     static constexpr const char* KeyFactoryDocumentation = "FactoryDocumentation";
+    /// The key that decides whether or not we should require incoming web socket connections
+    /// to authorize or not
+    static constexpr const char* KeyRequireSocketAuthentication = "RequireSocketAuthentication";
 
     /// The key that stores the location of the asset file that is initially loaded
     static constexpr const char* KeyConfigAsset = "Asset";
@@ -200,7 +203,13 @@ public:
     /// The part of the key storing whether the OpenGL state should be checked each call
     static constexpr const char* KeyCheckOpenGLState = "CheckOpenGLState";
 
-    /// The part of the key storing whether each OpenGL call should be logged
+    /// The part of the key storing whether the OpenGL state should be checked each call
+    static constexpr const char* KeyServerPasskey = "ServerPasskey";
+
+    /// Whitelist of client addresses that won't need autorization
+    static constexpr const char* KeyServerClientAddressWhitelist =
+                                                                 "ClientAddressWhitelist";
+
     static constexpr const char* KeyLogEachOpenGLCall = "LogEachOpenGLCall";
 
     /// This key determines whether the scene graph nodes should initialized multithreaded
@@ -233,6 +242,8 @@ public:
     /// The key used to specify whether screenshots should contain the current date
     static constexpr const char* KeyScreenshotUseDate = "ScreenshotUseDate";
 
+    static constexpr const char* KeyWebHelperLocation = "WebHelperLocation";
+    static constexpr const char* KeyCefWebGuiUrl = "CefWebGuiUrl";
 
     /**
      * Iteratively walks the directory structure starting with \p filename to find the
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index 547f6e5c2c..1ad4f7af11 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -95,7 +95,7 @@ public:
     ModuleSubClass* module() const {
         auto it = std::find_if(_modules.begin(), _modules.end(),
             [](const std::unique_ptr<OpenSpaceModule>& m) {
-                return m->name() == ModuleSubClass::Name;
+                return m->identifier() == ModuleSubClass::Name;
             });
         if (it != _modules.end()) {
             return dynamic_cast<ModuleSubClass*>(it->get());
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 29d46fcadf..8b2e3e49aa 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -51,7 +51,7 @@ class LoadingScreen;
 class LuaConsole;
 class ModuleEngine;
 class NetworkEngine;
-class ParallelConnection;
+class ParallelPeer;
 class RenderEngine;
 class Scene;
 class SyncEngine;
@@ -128,7 +128,7 @@ public:
     ModuleEngine& moduleEngine();
     LoadingScreen& loadingScreen();
     NetworkEngine& networkEngine();
-    ParallelConnection& parallelConnection();
+    ParallelPeer& parallelPeer();
     RenderEngine& renderEngine();
     TimeManager& timeManager();
     WindowWrapper& windowWrapper();
@@ -212,7 +212,7 @@ private:
     std::unique_ptr<LuaConsole> _console;
     std::unique_ptr<ModuleEngine> _moduleEngine;
     std::unique_ptr<NetworkEngine> _networkEngine;
-    std::unique_ptr<ParallelConnection> _parallelConnection;
+    std::unique_ptr<ParallelPeer> _parallelPeer;
     std::unique_ptr<RenderEngine> _renderEngine;
     std::unique_ptr<SyncEngine> _syncEngine;
     std::unique_ptr<TimeManager> _timeManager;
diff --git a/include/openspace/interaction/keyframenavigator.h b/include/openspace/interaction/keyframenavigator.h
index 152af94341..1d7f5164b5 100644
--- a/include/openspace/interaction/keyframenavigator.h
+++ b/include/openspace/interaction/keyframenavigator.h
@@ -26,7 +26,7 @@
 #define __OPENSPACE_CORE___KEYFRAMENAVIGATOR___H__
 
 #include <openspace/util/timeline.h>
-#include <openspace/network/parallelconnection.h>
+#include <openspace/network/parallelpeer.h>
 
 #include <ghoul/glm.h>
 #include <glm/gtx/quaternion.hpp>
diff --git a/include/openspace/interaction/luaconsole.h b/include/openspace/interaction/luaconsole.h
index 4cc1241e30..fe7ffc037b 100644
--- a/include/openspace/interaction/luaconsole.h
+++ b/include/openspace/interaction/luaconsole.h
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___LUACONSOLE___H__
 #define __OPENSPACE_CORE___LUACONSOLE___H__
 
+#include <openspace/network/parallelpeer.h>
 #include <openspace/network/parallelconnection.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/scalar/boolproperty.h>
diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index 4205ee8899..9cd33e8bea 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -26,39 +26,18 @@
 #define __OPENSPACE_CORE___PARALLELCONNECTION___H__
 
 #include <openspace/network/messagestructures.h>
-#include <openspace/properties/propertyowner.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/numericalproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 
-#include <glm/gtx/quaternion.hpp>
+#include <ghoul/io/socket/tcpsocket.h>
 
-#include <ghoul/designpattern/event.h>
-
-#include <string>
 #include <vector>
-#include <deque>
-#include <atomic>
-#include <thread>
-#include <mutex>
-#include <map>
-#include <condition_variable>
-
-#if defined(WIN32) || defined(__MING32__) || defined(__MING64__)
-typedef size_t _SOCKET;
-#else
-typedef int _SOCKET;
-#include <netdb.h>
-#endif
-
-struct addrinfo;
 
 namespace openspace {
 
-class ParallelConnection : public properties::PropertyOwner {
-    public:
+class ParallelConnection  {
+public:
     enum class Status : uint32_t {
         Disconnected = 0,
+        Connecting,
         ClientWithoutHost,
         ClientWithHost,
         Host
@@ -70,7 +49,8 @@ class ParallelConnection : public properties::PropertyOwner {
         ConnectionStatus,
         HostshipRequest,
         HostshipResignation,
-        NConnections
+        NConnections,
+        Disconnection
     };
 
     struct Message {
@@ -94,115 +74,23 @@ class ParallelConnection : public properties::PropertyOwner {
         std::vector<char> content;
     };
 
-    ParallelConnection();
-    ~ParallelConnection();
-    void clientConnect();
-    void setPort(std::string port);
-    void setAddress(std::string address);
-    void setName(std::string name);
-    bool isHost();
-    const std::string& hostName();
-    void requestHostship();
-    void resignHostship();
-    void setPassword(std::string password);
-    void setHostPassword(std::string hostPassword);
-    void signalDisconnect();
-    void preSynchronization();
-    void sendScript(std::string script);
-    void resetTimeOffset();
-    double latencyStandardDeviation() const;
-    double timeTolerance() const;
+    class ConnectionLostError : public ghoul::RuntimeError {
+    public:
+        explicit ConnectionLostError();
+    };
 
-    /**
-        * Returns the Lua library that contains all Lua functions available to affect the
-        * remote OS parallel connection. The functions contained are
-        * -
-        * \return The Lua library that contains all Lua functions available to affect the
-        * interaction
-        */
-    static scripting::LuaLibrary luaLibrary();
-    Status status();
-    int nConnections();
-    std::shared_ptr<ghoul::Event<>> connectionEvent();
+    ParallelConnection(std::unique_ptr<ghoul::io::TcpSocket> socket);
 
+    bool isConnectedOrConnecting();
+    void sendDataMessage(const ParallelConnection::DataMessage& dataMessage);
+    bool sendMessage(const  ParallelConnection::Message& message);
+    void disconnect();
+    ghoul::io::TcpSocket* socket();
+
+    ParallelConnection::Message receiveMessage();
 
 private:
-    //@TODO change this into the ghoul hasher for client AND server
-    uint32_t hash(const std::string &val);
-    void queueOutMessage(const Message& message);
-    void queueOutDataMessage(const DataMessage& dataMessage);
-    void queueInMessage(const Message& message);
-
-    void disconnect();
-    void closeSocket();
-    bool initNetworkAPI();
-    void establishConnection(addrinfo *info);
-    void sendAuthentication();
-    void listenCommunication();
-    int receiveData(_SOCKET & socket, std::vector<char> &buffer, int length, int flags);
-
-    void handleMessage(const Message&);
-    void dataMessageReceived(const std::vector<char>& messageContent);
-    void connectionStatusMessageReceived(const std::vector<char>& messageContent);
-    void nConnectionsMessageReceived(const std::vector<char>& messageContent);
-
-    void sendCameraKeyframe();
-    void sendTimeKeyframe();
-
-    void sendFunc();
-    void threadManagement();
-
-    void setStatus(Status status);
-    void setHostName(const std::string& hostName);
-    void setNConnections(size_t nConnections);
-
-    double calculateBufferedKeyframeTime(double originalTime);
-
-    properties::StringProperty _password;
-    properties::StringProperty _hostPassword;
-    properties::StringProperty _port;
-    properties::StringProperty _address;
-    properties::StringProperty _name;
-    properties::FloatProperty _bufferTime;
-    properties::FloatProperty _timeKeyframeInterval;
-    properties::FloatProperty _cameraKeyframeInterval;
-    properties::FloatProperty _timeTolerance;
-
-    double _lastTimeKeyframeTimestamp;
-    double _lastCameraKeyframeTimestamp;
-
-    _SOCKET _clientSocket;
-
-    std::atomic<bool> _isConnected;
-    std::atomic<bool> _isRunning;
-    std::atomic<bool> _tryConnect;
-    std::atomic<bool> _disconnect;
-    std::atomic<bool> _initializationTimejumpRequired;
-
-    std::atomic<size_t> _nConnections;
-    std::atomic<Status> _status;
-    std::string _hostName;
-
-    std::condition_variable _disconnectCondition;
-    std::mutex _disconnectMutex;
-
-    std::condition_variable _sendCondition;
-    std::deque<Message> _sendBuffer;
-    std::mutex _sendBufferMutex;
-
-    std::deque<Message> _receiveBuffer;
-    std::mutex _receiveBufferMutex;
-
-    std::atomic<bool> _timeJumped;
-    std::mutex _latencyMutex;
-    std::deque<double> _latencyDiffs;
-    double _initialTimeDiff;
-
-    std::unique_ptr<std::thread> _connectionThread;
-    std::unique_ptr<std::thread> _sendThread;
-    std::unique_ptr<std::thread> _listenThread;
-    std::unique_ptr<std::thread> _handlerThread;
-    std::shared_ptr<ghoul::Event<>> _connectionEvent;
+    std::unique_ptr<ghoul::io::TcpSocket> _socket;
 };
 
 } // namespace openspace
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
new file mode 100644
index 0000000000..6b44b1fc68
--- /dev/null
+++ b/include/openspace/network/parallelpeer.h
@@ -0,0 +1,136 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * 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___PARALLELPEER___H__
+#define __OPENSPACE_CORE___PARALLELPEER___H__
+
+#include <openspace/network/parallelconnection.h>
+#include <openspace/network/messagestructures.h>
+#include <openspace/properties/propertyowner.h>
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/numericalproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+
+#include <glm/gtx/quaternion.hpp>
+
+#include <ghoul/designpattern/event.h>
+#include <ghoul/io/socket/tcpsocket.h>
+
+#include <string>
+#include <vector>
+#include <deque>
+#include <atomic>
+#include <thread>
+#include <mutex>
+#include <map>
+#include <condition_variable>
+
+namespace openspace {
+
+class ParallelPeer : public properties::PropertyOwner {
+public:
+    ParallelPeer();
+    ~ParallelPeer();
+    void connect();
+    void setPort(std::string port);
+    void setAddress(std::string address);
+    void setName(std::string name);
+    bool isHost();
+    const std::string& hostName();
+    void requestHostship();
+    void resignHostship();
+    void setPassword(std::string password);
+    void setHostPassword(std::string hostPassword);
+    void disconnect();
+    void preSynchronization();
+    void sendScript(std::string script);
+    void resetTimeOffset();
+    double latencyStandardDeviation() const;
+    double timeTolerance() const;
+
+    /**
+    * Returns the Lua library that contains all Lua functions available to affect the
+    * remote OS parallel connection.
+    */
+    static scripting::LuaLibrary luaLibrary();
+    ParallelConnection::Status status();
+    int nConnections();
+    std::shared_ptr<ghoul::Event<>> connectionEvent();
+
+private:
+    void queueInMessage(const ParallelConnection::Message& message);
+
+    void sendAuthentication();
+    void handleCommunication();
+
+    void handleMessage(const ParallelConnection::Message&);
+    void dataMessageReceived(const std::vector<char>& messageContent);
+    void connectionStatusMessageReceived(const std::vector<char>& messageContent);
+    void nConnectionsMessageReceived(const std::vector<char>& messageContent);
+
+    void sendCameraKeyframe();
+    void sendTimeKeyframe();
+
+    void setStatus(ParallelConnection::Status status);
+    void setHostName(const std::string& hostName);
+    void setNConnections(size_t nConnections);
+
+    double calculateBufferedKeyframeTime(double originalTime);
+
+    properties::StringProperty _password;
+    properties::StringProperty _hostPassword;
+    properties::StringProperty _port;
+    properties::StringProperty _address;
+    properties::StringProperty _name;
+    properties::FloatProperty _bufferTime;
+    properties::FloatProperty _timeKeyframeInterval;
+    properties::FloatProperty _cameraKeyframeInterval;
+    properties::FloatProperty _timeTolerance;
+
+    double _lastTimeKeyframeTimestamp;
+    double _lastCameraKeyframeTimestamp;
+
+    std::atomic<bool> _shouldDisconnect;
+
+    std::atomic<size_t> _nConnections;
+    std::atomic<ParallelConnection::Status> _status;
+    std::string _hostName;
+
+    std::deque<ParallelConnection::Message> _receiveBuffer;
+    std::mutex _receiveBufferMutex;
+
+    std::atomic<bool> _timeJumped;
+    std::mutex _latencyMutex;
+    std::deque<double> _latencyDiffs;
+    double _initialTimeDiff;
+
+    std::unique_ptr<std::thread> _receiveThread;
+    std::shared_ptr<ghoul::Event<>> _connectionEvent;
+
+    ParallelConnection _connection;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___PARALLELPEER___H__
diff --git a/include/openspace/network/parallelserver.h b/include/openspace/network/parallelserver.h
new file mode 100644
index 0000000000..79133e9fed
--- /dev/null
+++ b/include/openspace/network/parallelserver.h
@@ -0,0 +1,123 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * 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___PARALLELSERVER___H__
+#define __OPENSPACE_CORE___PARALLELSERVER___H__
+
+#include <openspace/network/parallelconnection.h>
+
+#include <openspace/util/concurrentqueue.h>
+
+#include <ghoul/io/socket/tcpsocketserver.h>
+#include <ghoul/io/socket/tcpsocket.h>
+
+#include <string>
+#include <unordered_map>
+#include <atomic>
+
+namespace openspace {
+
+class ParallelServer {
+public:
+    void start(int port,
+        const std::string& password,
+        const std::string& changeHostPassword);
+
+    void setDefaultHostAddress(std::string);
+
+    std::string defaultHostAddress() const;
+
+    void stop();
+
+    size_t nConnections() const;
+
+private:
+    struct Peer {
+        size_t id;
+        std::string name;
+        ParallelConnection parallelConnection;
+        ParallelConnection::Status status;
+        std::thread thread;
+    };
+
+    struct PeerMessage {
+        size_t peerId;
+        ParallelConnection::Message message;
+    };
+
+    bool isConnected(std::shared_ptr<Peer> peer) const;
+
+    void sendMessage(std::shared_ptr<Peer> peer,
+        ParallelConnection::MessageType messageType,
+        const std::vector<char>& message);
+
+    void sendMessageToAll(ParallelConnection::MessageType messageType,
+        const std::vector<char>& message);
+
+    void sendMessageToClients(ParallelConnection::MessageType messageType,
+        const std::vector<char>& message);
+
+    void disconnect(std::shared_ptr<Peer> peer);
+    void setName(std::shared_ptr<Peer> peer, std::string name);
+    void assignHost(std::shared_ptr<Peer> peer);
+    void setToClient(std::shared_ptr<Peer> peer);
+    void setNConnections(size_t nConnections);
+    void sendConnectionStatus(std::shared_ptr<Peer> peer);
+
+    void handleAuthentication(std::shared_ptr<Peer> peer, std::vector<char> data);
+    void handleData(std::shared_ptr<Peer> peer, std::vector<char> data);
+    void handleHostshipRequest(std::shared_ptr<Peer> peer, std::vector<char> data);
+    void handleHostshipResignation(std::shared_ptr<Peer> peer, std::vector<char> data);
+    void handleDisconnection(std::shared_ptr<Peer> peer);
+
+    void handleNewPeers();
+    void eventLoop();
+    std::shared_ptr<Peer> peer(size_t i);
+    void handlePeer(size_t id);
+    void handlePeerMessage(PeerMessage peerMessage);
+
+    std::unordered_map<size_t, std::shared_ptr<Peer>> _peers;
+    mutable std::mutex _peerListMutex;
+
+    std::thread _serverThread;
+    std::thread _eventLoopThread;
+    ghoul::io::TcpSocketServer _socketServer;
+    size_t _passwordHash;
+    size_t _changeHostPasswordHash;
+    size_t _nextConnectionId = 1;
+    std::atomic_bool _shouldStop = false;
+
+    std::atomic_size_t _nConnections = 0;
+    std::atomic_size_t _hostPeerId = 0;
+
+    mutable std::mutex _hostInfoMutex;
+    std::string _hostName;
+    std::string _defaultHostAddress;
+
+    ConcurrentQueue<PeerMessage> _incomingMessages;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___PARALLELSERVER___H__
diff --git a/include/openspace/properties/binaryproperty.h b/include/openspace/properties/binaryproperty.h
new file mode 100644
index 0000000000..d810a8b8b7
--- /dev/null
+++ b/include/openspace/properties/binaryproperty.h
@@ -0,0 +1,37 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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___BINARYPROPERTY___H__
+#define __OPENSPACE_CORE___BINARYPROPERTY___H__
+
+#include <openspace/properties/templateproperty.h>
+#include <vector>
+
+namespace openspace::properties {
+
+REGISTER_TEMPLATEPROPERTY_HEADER(BinaryProperty, std::vector<char>)
+
+} // namespace openspace::properties
+
+#endif // __OPENSPACE_CORE___BINARYPROPERTY___H__
diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index 12cec0e4e3..1be4a3a5d9 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -62,20 +62,41 @@ public:
 
     virtual std::string className() const override;
 
+    std::string jsonValue() const override;
+
     using TemplateProperty<T>::operator=;
 
+
+    void setInterpolationTarget(ghoul::any value) override;
+    void setLuaInterpolationTarget(lua_State* state) override;
+    void setStringInterpolationTarget(std::string value) override;
+    
+    void interpolateValue(float t,
+        ghoul::EasingFunc<float> easingFunc = nullptr) override;
+
+
 protected:
     static const std::string MinimumValueKey;
     static const std::string MaximumValueKey;
     static const std::string SteppingValueKey;
     static const std::string ExponentValueKey;
 
-    std::string generateAdditionalDescription() const override;
+    std::string generateAdditionalJsonDescription() const override;
+
+    /**
+     * convert a lua formatted value to a JSON formatted value
+     * @param luaValue
+     * @return a json formatted string representation of the given lua value
+     */
+    std::string luaToJson(std::string luaValue) const;
 
     T _minimumValue;
     T _maximumValue;
     T _stepping;
     float _exponent;
+
+    T _interpolationStart;
+    T _interpolationEnd;
 };
 
 } // namespace openspace::properties
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index edfbcddbbd..91fe0ddee6 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -386,13 +386,90 @@ void NumericalProperty<T>::setExponent(float exponent) {
 }
 
 template <typename T>
-std::string NumericalProperty<T>::generateAdditionalDescription() const {
-    std::string result;
-    result += MinimumValueKey  + " = " + std::to_string(_minimumValue) + ",";
-    result += MaximumValueKey  + " = " + std::to_string(_maximumValue) + ",";
-    result += SteppingValueKey + " = " + std::to_string(_stepping) + ",";
-    result += ExponentValueKey + " = " + std::to_string(_exponent);
+std::string NumericalProperty<T>::generateAdditionalJsonDescription() const {
+    std::string result = "{ ";
+    result += "\"" + MinimumValueKey + "\": " + luaToJson(std::to_string(_minimumValue)) + ",";
+    result += "\"" + MaximumValueKey + "\": " + luaToJson(std::to_string(_maximumValue)) + ",";
+    result += "\"" + SteppingValueKey + "\": " + luaToJson(std::to_string(_stepping)) + ",";
+    result += "\"" + ExponentValueKey + "\": " + luaToJson(std::to_string(_exponent));
+    result += " }";
     return result;
 }
 
+template <typename T>
+std::string NumericalProperty<T>::luaToJson(std::string luaValue) const {
+    if(luaValue[0] == '{') {
+        luaValue.replace(0, 1, "[");
+    }
+    if (luaValue[luaValue.size() - 1] == '}') {
+        luaValue.replace(luaValue.size() - 1, 1, "]");
+    }
+    return luaValue;
+}
+
+template <typename T>
+std::string NumericalProperty<T>::jsonValue() const {
+    std::string value;
+    getStringValue(value);
+    return luaToJson(value);
+}
+
+template <typename T>
+void NumericalProperty<T>::setInterpolationTarget(ghoul::any value) {
+    try {
+        T v = ghoul::any_cast<T>(std::move(value));
+
+        _interpolationStart = TemplateProperty<T>::_value;
+        _interpolationEnd = std::move(v);
+    }
+    catch (ghoul::bad_any_cast&) {
+        LERRORC(
+            "TemplateProperty",
+            fmt::format(
+                "Illegal cast from '{}' to '{}'",
+                value.type().name(),
+                typeid(T).name()
+            )
+        );
+    }
+}
+
+template <typename T>
+void NumericalProperty<T>::setLuaInterpolationTarget(lua_State* state) {
+    bool success = false;
+    T thisValue = PropertyDelegate<NumericalProperty<T>>::template fromLuaValue<T>(
+        state,
+        success
+    );
+    if (success) {
+        _interpolationStart = TemplateProperty<T>::_value;
+        _interpolationEnd = std::move(thisValue);
+    }
+}
+
+template <typename T>
+void NumericalProperty<T>::setStringInterpolationTarget(std::string value) {
+    bool success = false;
+    T thisValue = PropertyDelegate<NumericalProperty<T>>::template fromString<T>(
+        value,
+        success
+    );
+    if (success) {
+        _interpolationStart = TemplateProperty<T>::_value;
+        _interpolationEnd = std::move(thisValue);
+    }
+}
+
+template <typename T>
+void NumericalProperty<T>::interpolateValue(float t,
+                                            ghoul::EasingFunc<float> easingFunction)
+{
+    if (easingFunction) {
+        t = easingFunction(t);
+    }
+    TemplateProperty<T>::setValue(static_cast<T>(
+        glm::mix(_interpolationStart, _interpolationEnd, t)
+    ));
+}
+
 } // namespace openspace::properties
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index f2945d6b83..ac4d099869 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -143,7 +143,7 @@ public:
 
 private:
     static const std::string OptionsKey;
-    std::string generateAdditionalDescription() const override;
+    std::string generateAdditionalJsonDescription() const override;
 
     /// The list of options which have been registered with this OptionProperty
     std::vector<Option> _options;
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index e3e393a243..4e51e5e740 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -28,6 +28,7 @@
 #include <openspace/properties/propertydelegate.h>
 
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/easing.h>
 
 #include <functional>
 #include <string>
@@ -92,6 +93,10 @@ public:
     /// onChange callback
     using OnChangeHandle = uint32_t;
 
+    /// An OnChangeHandle is returned by the onChange method to uniquely identify an
+    /// onDelete callback
+    using OnDeleteHandle = uint32_t;
+
     /// This OnChangeHandle can be used to remove all onChange callbacks from this
     /// Property
     static OnChangeHandle OnChangeHandleAll;
@@ -113,7 +118,7 @@ public:
      * The destructor taking care of deallocating all unused memory. This method will not
      * remove the Property from the PropertyOwner.
      */
-    virtual ~Property() = default;
+    virtual ~Property();
 
     /**
      * This method returns the class name of the Property. The method is used by the
@@ -197,6 +202,14 @@ public:
      */
     virtual bool getStringValue(std::string& value) const;
 
+    /**
+     * This method encodes the encapsulated value of this Property as a
+     * <code>std::string</code>.
+     * \return the string value
+     * \throws an exception if value couldn't be fetched
+     */
+    std::string getStringValue() const;
+
     /**
      * This method sets the value encapsulated by this Property by deserializing the
      * passed <code>std::string</code>. The specific details of the deserialization are up
@@ -221,6 +234,14 @@ public:
      */
     OnChangeHandle onChange(std::function<void()> callback);
 
+    /**
+    * This method registers a <code>callback</code> function that will be called when
+    * the property is destructed.
+    * \pre The callback must not be empty
+    * \return An OnDeleteHandle that can be used in subsequent calls to remove a callback
+    */
+    OnDeleteHandle onDelete(std::function<void()> callback);
+
     /**
      * This method deregisters a callback that was previously registered with the onChange
      * method. If OnChangeHandleAll is passed to this function, all registered callbacks
@@ -232,6 +253,16 @@ public:
      */
     void removeOnChange(OnChangeHandle handle);
 
+    /**
+    * This method deregisters a callback that was previously registered with the onDelete
+    * method.
+    * \param handle An OnDeleteHandle that was returned from a previous call to onDelete
+    * by this property.
+    * \pre handle must refer to a callback that has been previously registred
+    * \pre handle must refer to a callback that has not been removed previously
+    */
+    void removeOnDelete(OnDeleteHandle handle);
+
     /**
      * This method returns the unique identifier of this Property.
      * \return The unique identifier of this Property
@@ -364,11 +395,26 @@ public:
      */
     const ghoul::Dictionary& metaData() const;
 
-protected:
-    static const char* IdentifierKey;
-    static const char* NameKey;
-    static const char* TypeKey;
-    static const char* MetaDataKey;
+    /**
+     * Convert the Property into a string containing a JSON representation of the Property.
+     * Includes description of the object.
+     * @return the JSON string
+     */
+    virtual std::string toJson() const;
+
+    /**
+     * Get a valid JSON formatted representation of the Property's value.
+     * @return the value in a json compatible format
+     */
+    virtual std::string jsonValue() const;
+
+    /// Interpolation methods
+    virtual void setInterpolationTarget(ghoul::any value);
+    virtual void setLuaInterpolationTarget(lua_State* state);
+    virtual void setStringInterpolationTarget(std::string value);
+    
+    virtual void interpolateValue(float t,
+        ghoul::EasingFunc<float> easingFunction = nullptr);
 
     /**
      * Creates the information that is general to every Property and adds the
@@ -378,16 +424,16 @@ protected:
      * class wants to add meta data that is not curated by the Property class
      * \return The base description common to all Property classes
      */
-    std::string generateBaseDescription() const;
+    std::string generateBaseJsonDescription() const;
 
     /**
-     * Creates the information for the <code>MetaData</code> key-part of the Lua
+     * Creates the information for the <code>MetaData</code> key-part of the json
      * description for the Property. The result can be included as one key-value pair in
      * the description text generated by subclasses. Only the metadata curated by the
      * Property class is used in this method.
      * \return The metadata information text for the property
      */
-    virtual std::string generateMetaDataDescription() const;
+    virtual std::string generateMetaDataJsonDescription() const;
 
     /**
      * Creates the information that is specific to each subclass of Property%s. If a
@@ -400,13 +446,23 @@ protected:
      * and this method being the override points to customize the behavior.
      * \return The information specific to each subclass of Property
      */
-    virtual std::string generateAdditionalDescription() const;
+    virtual std::string generateAdditionalJsonDescription() const;
+
+protected:
+
+    static const char* IdentifierKey;
+    static const char* NameKey;
+    static const char* TypeKey;
+    static const char* DescriptionKey;
+    static const char* JsonValueKey;
+    static const char* MetaDataKey;
+    static const char* AdditionalDataKey;
 
     /**
      * This method must be called by all subclasses whenever the encapsulated value has
-     * changed and a potential listener has to be informed.
+     * changed and potential listeners need to be informed.
      */
-    void notifyListener();
+    void notifyChangeListeners();
 
     /// The PropetyOwner this Property belongs to, or <code>nullptr</code>
     PropertyOwner* _owner;
@@ -426,7 +482,12 @@ protected:
     /// The callback function sthat will be invoked whenever the value changes
     std::vector<std::pair<OnChangeHandle, std::function<void()>>> _onChangeCallbacks;
 
+    /// The callback function sthat will be invoked whenever the value changes
+    std::vector<std::pair<OnDeleteHandle, std::function<void()>>> _onDeleteCallbacks;
+
 private:
+    void notifyDeleteListeners();
+
     OnChangeHandle _currentHandleValue;
 
 #ifdef _DEBUG
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 4bcfac0b75..fe0d367795 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -55,11 +55,23 @@ public:
     static const char URISeparator = '.';
 
     struct PropertyOwnerInfo {
-        std::string name;
+        std::string identifier;
+        std::string guiName = "";
         std::string description = "";
     };
 
-    /// The constructor initializing the PropertyOwner's name to <code>""</code>
+    /**
+     * The constructor of PropertyOwner.
+     *
+     * \param info the PropertyOwnerInfo struct that contains the
+     * #PropertyOwnerInfo::identifier, #PropertyOwnerInfo::guiName, and
+     * #PropertyOwnerInfo::description of this PropertyOwner.
+     *
+     * \pre The \p info 's #PropertyOwnerInfo::identifier must not contain any whitespaces
+     * \pre The \p info 's #PropertyOwnerInfo::identifier must not contain any
+     *      <code>.</code>
+     */
+
     PropertyOwner(PropertyOwnerInfo info);
 
     /**
@@ -69,20 +81,40 @@ public:
     virtual ~PropertyOwner();
 
     /**
-     * Sets the name for this PropertyOwner. If the PropertyOwner does not have an owner
-     * itself, the name must be globally unique. If the PropertyOwner has an owner, the
-     * name must be unique to the owner (including the owner's properties). No uniqueness
-     * check will be preformed here, but rather in the PropertyOwner::addProperty and
-     * PropertyOwner::addPropertySubOwner methods).
-     * \param name The name of this PropertyOwner. It may not contain any <code>.</code>s
+     * Sets the identifier for this PropertyOwner. If the PropertyOwner does not have an
+     * owner itself, the identifier must be globally unique. If the PropertyOwner has an
+     * owner, the identifier must be unique to the owner (including the owner's 
+     * properties). No uniqueness check will be preformed here, but rather in the 
+     * PropertyOwner::addProperty and PropertyOwner::addPropertySubOwner methods).
+     *
+     * \param identifier The identifier of this PropertyOwner. It must not contain any
+     *        <code>.</code>s or whitespaces
+     *
+     * \pre \p identifier must not contain any whitespaces
+     * \pre \p identifier must not contain any <code>.</code>
      */
-    void setName(std::string name);
+    void setIdentifier(std::string identifier);
 
     /**
-     * Returns the name of this PropertyOwner.
-     * \return The name of this PropertyOwner
+     * Returns the identifier of this PropertyOwner.
+     * \return The identifier of this PropertyOwner
      */
-    std::string name() const;
+    std::string identifier() const;
+
+    /**
+     * Sets the user-facing name of this PropertyOwner. This name does not have to be 
+     * unique, but it is recommended to be.
+     *
+     * \param guiName The new user-facing name for this PropertyOwner
+     */
+    void setGuiName(std::string guiName);
+
+    /**
+     * Returns the current user-facing name for this PropertyOwner.
+     *
+     * \return The current user-facing name for this PropertyOwner
+     */
+    const std::string& guiName() const;
 
     void setDescription(std::string description);
 
@@ -91,12 +123,14 @@ public:
     /**
      * Returns a list of all Propertys directly owned by this PropertyOwner. This list not
      * include Propertys owned by other sub-owners.
+     *
      * \return A list of all Propertys directly owned by this PropertyOwner
      */
     std::vector<Property*> properties() const;
 
     /**
      * Returns a list of all Propertys directly or indirectly owned by this PropertyOwner.
+     *
      * \return A list of all Propertys directly or indirectly owned by this PropertyOwner
      */
     std::vector<Property*> propertiesRecursive() const;
@@ -239,13 +273,18 @@ public:
      */
     void removeTag(const std::string& tag);
 
+
+protected:
+    /// The unique identifier of this PropertyOwner
+    std::string _identifier;
+    /// The user-facing GUI name for this PropertyOwner
+    std::string _guiName;
+    /// The description for this PropertyOwner
+    std::string _description;
+
 private:
     std::string generateJson() const override;
 
-    /// The name of this PropertyOwner
-    std::string _name;
-    /// The description for this PropertyOwner
-    std::string _description;
     /// The owner of this PropertyOwner
     PropertyOwner* _owner;
     /// A list of all registered Property's
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 6462786e85..fc0f9eac77 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -51,7 +51,7 @@ public:
 
 private:
     static const std::string OptionsKey;
-    std::string generateAdditionalDescription() const override;
+    std::string generateAdditionalJsonDescription() const override;
 
     /// The list of options which have been registered with this OptionProperty
     std::vector<Option> _options;
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index fc9f6c59ca..3a032c8cae 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -178,7 +178,7 @@ template <typename T>
 void openspace::properties::TemplateProperty<T>::setValue(T val) {
     if (val != _value) {
         _value = std::move(val);
-        notifyListener();
+        notifyChangeListeners();
     }
 }
 
@@ -199,7 +199,7 @@ void TemplateProperty<T>::set(ghoul::any value) {
         T v = ghoul::any_cast<T>(std::move(value));
         if (v != _value) {
             _value = std::move(v);
-            notifyListener();
+            notifyChangeListeners();
         }
     }
     catch (ghoul::bad_any_cast&) {
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index cd6447af9c..a7d619cc53 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -65,6 +65,10 @@ public:
      * \param value The ignored value
      */
     void set(ghoul::any value) override;
+
+    std::string toJson() const override;
+
+    std::string jsonValue() const override;
 };
 
 } // namespace openspace::properties
diff --git a/include/openspace/rendering/dashboarditem.h b/include/openspace/rendering/dashboarditem.h
index c43f33ca57..a76d7d9485 100644
--- a/include/openspace/rendering/dashboarditem.h
+++ b/include/openspace/rendering/dashboarditem.h
@@ -42,7 +42,7 @@ public:
         ghoul::Dictionary dictionary
     );
 
-    DashboardItem(std::string name);
+    DashboardItem(std::string identifier, std::string guiName = "");
 
     bool isEnabled() const;
     virtual void render(glm::vec2& penPosition) = 0;
diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h
index fff052291b..40dd34b9e8 100644
--- a/include/openspace/rendering/deferredcaster.h
+++ b/include/openspace/rendering/deferredcaster.h
@@ -39,6 +39,7 @@ namespace openspace {
 
 struct RenderData;
 struct DeferredcastData;
+struct UpdateData;
 
 class Deferredcaster {
 public:
@@ -58,6 +59,10 @@ public:
 
     virtual std::string deferredcastFSPath() const = 0;
 
+    virtual void initializeCachedVariables(ghoul::opengl::ProgramObject&) = 0;
+
+    virtual void update(const UpdateData&) = 0;
+
     /**
      * Return a path to a glsl file with helper functions required for the
      * transformation and raycast steps.
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index e156ec6f69..e823d9eefb 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -84,7 +84,8 @@ public:
         Failed
     };
 
-    void updateItem(const std::string& itemName, ItemStatus newStatus, float progress);
+    void updateItem(const std::string& itemIdentifier, const std::string& itemName,
+        ItemStatus newStatus, float progress);
 
 private:
     bool _showMessage;
@@ -122,6 +123,7 @@ private:
     std::mutex _messageMutex;
 
     struct Item {
+        std::string identifier;
         std::string name;
         ItemStatus status;
         float progress;
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 2069bd23c3..575045be36 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -28,6 +28,7 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
 
 namespace ghoul { class Dictionary; }
 namespace ghoul::opengl {
@@ -99,6 +100,9 @@ public:
 
 protected:
     properties::BoolProperty _enabled;
+    properties::FloatProperty _opacity;
+    
+    void registerUpdateRenderBinFromOpacity();
 
 private:
     RenderBin _renderBin;
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index c25600c091..ce6c09331f 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -167,6 +167,8 @@ public:
 
     std::vector<Syncable*> getSyncables();
 
+    properties::PropertyOwner& screenSpaceOwner();
+
 private:
     void setRenderer(std::unique_ptr<Renderer> renderer);
     RendererImplementation rendererFromString(const std::string& method) const;
@@ -216,6 +218,7 @@ private:
     uint64_t _frameNumber;
 
     std::vector<ghoul::opengl::ProgramObject*> _programs;
+    properties::PropertyOwner _screenSpaceOwner;
     std::vector<std::shared_ptr<ScreenSpaceRenderable>> _screenSpaceRenderables;
 
     std::shared_ptr<ghoul::fontrendering::Font> _fontBig = nullptr;
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 2a90eb3b5c..4244fa22bb 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -55,6 +55,9 @@ public:
     static std::unique_ptr<ScreenSpaceRenderable> createFromDictionary(
         const ghoul::Dictionary& dictionary);
 
+    static constexpr const char* KeyName = "Name";
+    static constexpr const char* KeyIdentifier = "Identifier";
+
     ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
     virtual ~ScreenSpaceRenderable() = default;
 
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index c6ac073386..4f88260d6c 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -47,14 +47,17 @@ public:
     glm::vec4 sample(size_t t);
     size_t width();
     void setCallback(TfChangedCallback callback);
+    void setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture> ptr);
 private:
-    void setTextureFromTxt();
+    void setTextureFromTxt() {
+        setTextureFromTxt(_texture);
+    }
     void setTextureFromImage();
     void uploadTexture();
 
     std::string _filepath;
     std::unique_ptr<ghoul::filesystem::File> _file = nullptr;
-    std::unique_ptr<ghoul::opengl::Texture> _texture = nullptr;
+    std::shared_ptr<ghoul::opengl::Texture> _texture = nullptr;
     bool _needsUpdate = false;
     TfChangedCallback _tfChangedCallback;
 };
diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h
index e1185694ff..34ef37497a 100644
--- a/include/openspace/scene/asset.h
+++ b/include/openspace/scene/asset.h
@@ -83,7 +83,8 @@ public:
     void clearSynchronizations();
     std::vector<std::shared_ptr<ResourceSynchronization>> ownSynchronizations() const;
 
-    void syncStateChanged(ResourceSynchronization::State s);
+    void syncStateChanged(std::shared_ptr<ResourceSynchronization> sync,
+        ResourceSynchronization::State s);
 
     /**
      * Load this asset and return true if successful,
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 1d703bb68e..b25d0bdb21 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -25,21 +25,21 @@
 #ifndef __OPENSPACE_CORE___SCENE___H__
 #define __OPENSPACE_CORE___SCENE___H__
 
+#include <openspace/properties/propertyowner.h>
+
 #include <vector>
 #include <unordered_map>
 #include <set>
 #include <mutex>
 
-#include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/sceneinitializer.h>
+#include <openspace/scene/scenegraphnode.h>
 #include <openspace/scene/scenelicense.h>
 #include <openspace/scene/scenelicensewriter.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/camera.h>
 #include <openspace/util/updatestructures.h>
-
-#include <openspace/properties/propertyowner.h>
-
+#include <ghoul/misc/easing.h>
 #include <ghoul/opengl/programobject.h>
 
 namespace ghoul { class Dictionary; }
@@ -153,9 +153,9 @@ public:
     void writeSceneLicenseDocumentation(const std::string& path) const;
 
     /**
-     * Return a a map from name to scene graph node.
+     * Returns a map from identifier to scene graph node.
      */
-    const std::unordered_map<std::string, SceneGraphNode*>& nodesByName() const;
+    const std::unordered_map<std::string, SceneGraphNode*>& nodesByIdentifier() const;
 
     /**
      * Load a scene graph node from a dictionary and return it.
@@ -172,6 +172,47 @@ public:
      */
     bool isInitializing() const;
 
+    /**
+     * Adds an interpolation request for the passed \p prop that will run for
+     * \p durationSeconds seconds. Every time the #updateInterpolations method is called
+     * the Property will be notified that it has to update itself using the stored
+     * interpolation values. If an interpolation record already exists for the passed 
+     * \p prop, the previous record will be overwritten and the remaining time of the old
+     * interpolation is ignored.
+     *
+     * \param prop The property that should be called to update itself every frame until
+     *        \p durationSeconds seconds have passed
+     * \param durationSeconds The number of seconds that the interpolation will run for
+     *
+     * \pre \p prop must not be \c nullptr
+     * \pre \p durationSeconds must be positive and not 0
+     * \post A new interpolation record exists for \p that is not expired 
+     */
+    void addInterpolation(properties::Property* prop, float durationSeconds,
+        ghoul::EasingFunction easingFunction = ghoul::EasingFunction::Linear);
+
+    /**
+     * Removes the passed \p prop from the list of Property%s that are update each time
+     * the #updateInterpolations method is called
+     *
+     * \param prop The Property that should not longer be updated
+     *
+     * \pre \prop must not be nullptr
+     * \post No interpolation record exists for \p prop
+     */
+    void removeInterpolation(properties::Property* prop);
+
+    /**
+     * Informs all Property%s with active interpolations about applying a new update tick
+     * using the Property::interpolateValue method, passing a parameter \c t which is \c 0
+     * if no time has passed between the #addInterpolation method and \c 1 if an amount of
+     * time equal to the requested interpolation time has passed. The parameter \c t is
+     * updated with a resolution of 1 microsecond, which means that if this function is
+     * called twice within 1 microsecond, the passed parameter \c t might be the same for
+     * both calls
+     */
+    void updateInterpolations();
+
     /**
      * Returns the Lua library that contains all Lua functions available to change the
      * scene graph. The functions contained are
@@ -193,7 +234,7 @@ private:
     std::unique_ptr<Camera> _camera;
     std::vector<SceneGraphNode*> _topologicallySortedNodes;
     std::vector<SceneGraphNode*> _circularNodes;
-    std::unordered_map<std::string, SceneGraphNode*> _nodesByName;
+    std::unordered_map<std::string, SceneGraphNode*> _nodesByIdentifier;
     bool _dirtyNodeRegistry;
     SceneGraphNode _rootDummy;
     std::unique_ptr<SceneInitializer> _initializer;
@@ -203,6 +244,15 @@ private:
     std::mutex _programUpdateLock;
     std::set<ghoul::opengl::ProgramObject*> _programsToUpdate;
     std::vector<std::unique_ptr<ghoul::opengl::ProgramObject>> _programs;
+
+    struct InterpolationInfo {
+        properties::Property* prop;
+        std::chrono::time_point<std::chrono::steady_clock> beginTime;
+        float durationSeconds;
+        ghoul::EasingFunc<float> easingFunction;
+        bool isExpired = false;
+    };
+    std::vector<InterpolationInfo> _interpolationInfos;
 };
 
 } // namespace openspace
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index dbbe252fde..363d3bd659 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -71,11 +71,11 @@ public:
         long long updateTimeScaling;  // time in ns
     };
 
-    static const std::string RootNodeName;
-    static const std::string KeyName;
-    static const std::string KeyParentName;
-    static const std::string KeyDependencies;
-    static const std::string KeyTag;
+    static constexpr const char* RootNodeIdentifier = "Root";
+    static constexpr const char* KeyIdentifier = "Identifier";
+    static constexpr const char* KeyParentName = "Parent";
+    static constexpr const char* KeyDependencies = "Dependencies";
+    static constexpr const char* KeyTag = "Tag";
 
     SceneGraphNode();
     ~SceneGraphNode();
@@ -137,6 +137,7 @@ public:
     Renderable* renderable();
 
     const std::string& guiPath() const;
+    bool hasGuiHintHidden() const;
 
     static documentation::Documentation Documentation();
 
@@ -152,6 +153,10 @@ private:
     std::vector<SceneGraphNode*> _dependentNodes;
     Scene* _scene;
 
+    // If this value is 'true' GUIs are asked to hide this node from collections, as it
+    // might be a node that is not very interesting (for example barycenters)
+    bool _guiHintHidden = false;
+
     PerformanceRecord _performanceRecord;
 
     std::unique_ptr<Renderable> _renderable;
diff --git a/include/openspace/util/blockplaneintersectiongeometry.h b/include/openspace/util/blockplaneintersectiongeometry.h
index b494fff259..8f1c5bfd80 100644
--- a/include/openspace/util/blockplaneintersectiongeometry.h
+++ b/include/openspace/util/blockplaneintersectiongeometry.h
@@ -48,7 +48,7 @@ public:
 private:
     void updateVertices();
     std::vector<float> _vertices;
-    bool _initialized;
+    // bool _initialized;
     GLuint _vaoId;
     GLuint _vBufferId;
     glm::vec3 _size;
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 4d303f2241..a8fe019c23 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -70,6 +70,7 @@ public:
     Histogram equalize();
     float equalize (float);
     float entropy();
+    std::vector<char> getBinaryData() const;
 
     float highestBinValue(bool equalized, int overBins=0);
     float binWidth();
diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h
index 9e97bd3c3c..76eb42baa8 100644
--- a/include/openspace/util/httprequest.h
+++ b/include/openspace/util/httprequest.h
@@ -229,6 +229,8 @@ public:
     HttpFileDownload(HttpFileDownload&& d) = default;
     virtual ~HttpFileDownload() = default;
 
+    const std::string& destination() const;
+
 protected:
     bool initDownload() override;
     bool deinitDownload() override;
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index 04b9c2289b..93627967e5 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -25,8 +25,10 @@
 #ifndef __OPENSPACE_CORE___TIMEMANAGER___H__
 #define __OPENSPACE_CORE___TIMEMANAGER___H__
 
+#include <utility>
 #include <vector>
 #include <deque>
+#include <functional>
 #include <openspace/util/timeline.h>
 #include <openspace/util/time.h>
 #include <openspace/util/syncdata.h>
@@ -35,6 +37,9 @@ namespace openspace {
 
 class TimeManager {
 public:
+    using CallbackHandle = int;
+    using TimeChangeCallback = std::function<void()>;
+
     Time& time();
     std::vector<Syncable*> getSyncables();
     void preSynchronization(double dt);
@@ -45,6 +50,10 @@ public:
     void setTimeNextFrame(Time t);
     size_t nKeyframes() const;
 
+    CallbackHandle addTimeChangeCallback(TimeChangeCallback cb);
+    CallbackHandle addDeltaTimeChangeCallback(TimeChangeCallback cb);
+    void removeTimeChangeCallback(CallbackHandle handle);
+    void removeDeltaTimeChangeCallback(CallbackHandle handle);
 private:
     bool _shouldSetTime = false;
     Time _timeNextFrame;
@@ -52,6 +61,12 @@ private:
     SyncData<Time> _currentTime;
     void consumeKeyframes(double dt);
     double _latestConsumedTimestamp;
+    int _nextCallbackHandle = 0;
+
+    std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeChangeCallbacks;
+    std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeChangeCallbacks;
+    double _lastTime = 0;
+    double _lastDeltaTime = 0;
 };
 
 } // namespace openspace
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index a44fcd657e..11d81184e1 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -207,81 +207,66 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
             (_atmosphereRadius + ATM_EPS)*KM_TO_M)
             )
         {
-            program.setUniform("cullAtmosphere", 1);
+            program.setUniform(_uniformCache.cullAtmosphere, 1);
         }
         else {
-            program.setUniform("cullAtmosphere", 0);
-            program.setUniform("Rg", _atmospherePlanetRadius);
-            program.setUniform("Rt", _atmosphereRadius);
-            program.setUniform(
-                "AverageGroundReflectance",
-                _planetAverageGroundReflectance
-            );
-            program.setUniform("groundRadianceEmittion", _planetGroundRadianceEmittion);
-            program.setUniform("HR", _rayleighHeightScale);
-            program.setUniform("betaRayleigh", _rayleighScatteringCoeff);
-            program.setUniform("HM", _mieHeightScale);
-            program.setUniform("betaMieScattering", _mieScatteringCoeff);
-            program.setUniform("betaMieExtinction", _mieExtinctionCoeff);
-            program.setUniform("mieG", _miePhaseConstant);
-            program.setUniform("sunRadiance", _sunRadianceIntensity);
-            program.setUniform("ozoneLayerEnabled", _ozoneEnabled);
-            program.setUniform("HO", _ozoneHeightScale);
-            program.setUniform("betaOzoneExtinction", _ozoneExtinctionCoeff);
-
-            program.setUniform("TRANSMITTANCE_W", _transmittance_table_width);
-            program.setUniform("TRANSMITTANCE_H", _transmittance_table_height);
-            program.setUniform("SKY_W", _irradiance_table_width);
-            program.setUniform("SKY_H", _irradiance_table_height);
-            program.setUniform("OTHER_TEXTURES_W", _delta_e_table_width);
-            program.setUniform("OTHER_TEXTURES_H", _delta_e_table_height);
-            program.setUniform("SAMPLES_R", _r_samples);
-            program.setUniform("SAMPLES_MU", _mu_samples);
-            program.setUniform("SAMPLES_MU_S", _mu_s_samples);
-            program.setUniform("SAMPLES_NU", _nu_samples);
-
-            program.setUniform("ModelTransformMatrix", _modelTransform);
+            program.setUniform(_uniformCache.cullAtmosphere, 0);
+            program.setUniform(_uniformCache.Rg, _atmospherePlanetRadius);
+            program.setUniform(_uniformCache.Rt, _atmosphereRadius);
+            program.setUniform(_uniformCache.groundRadianceEmittion, _planetGroundRadianceEmittion);
+            program.setUniform(_uniformCache.HR, _rayleighHeightScale);
+            program.setUniform(_uniformCache.betaRayleigh, _rayleighScatteringCoeff);
+            program.setUniform(_uniformCache.HM, _mieHeightScale);
+            program.setUniform(_uniformCache.betaMieExtinction, _mieExtinctionCoeff);
+            program.setUniform(_uniformCache.mieG, _miePhaseConstant);
+            program.setUniform(_uniformCache.sunRadiance, _sunRadianceIntensity);
+            program.setUniform(_uniformCache.ozoneLayerEnabled, _ozoneEnabled);
+            program.setUniform(_uniformCache.HO, _ozoneHeightScale);
+            program.setUniform(_uniformCache.betaOzoneExtinction, _ozoneExtinctionCoeff);
+            program.setUniform(_uniformCache.SAMPLES_R, _r_samples);
+            program.setUniform(_uniformCache.SAMPLES_MU, _mu_samples);
+            program.setUniform(_uniformCache.SAMPLES_MU_S, _mu_s_samples);
+            program.setUniform(_uniformCache.SAMPLES_NU, _nu_samples);
 
             // Object Space
             glm::dmat4 inverseModelMatrix = glm::inverse(_modelTransform);
-            program.setUniform("dInverseModelTransformMatrix", inverseModelMatrix);
-            program.setUniform("dModelTransformMatrix", _modelTransform);
-
-            // The following scale comes from PSC transformations.
-            float fScaleFactor = renderData.camera.scaling().x *
-                                 pow(10.f, renderData.camera.scaling().y);
-            glm::dmat4 dfScaleCamTransf = glm::scale(glm::dvec3(fScaleFactor));
-            program.setUniform(
-                "dInverseScaleTransformMatrix",
-                glm::inverse(dfScaleCamTransf)
-            );
-
-            // World to Eye Space in OS
-            program.setUniform(
-                "dInverseCamRotTransform",
-                glm::mat4_cast(
-                    static_cast<glm::dquat>(renderData.camera.rotationQuaternion())
-                )
-            );
-
-            program.setUniform(
-                "dInverseSgctEyeToWorldTranform",
-                glm::inverse(renderData.camera.combinedViewMatrix())
-            );
-
+            program.setUniform(_uniformCache2.dInverseModelTransformMatrix, inverseModelMatrix);
+            program.setUniform(_uniformCache2.dModelTransformMatrix, _modelTransform);
+            
             // Eye Space in OS to Eye Space in SGCT
-            glm::dmat4 dOsEye2SGCTEye = glm::dmat4(renderData.camera.viewMatrix());
-            glm::dmat4 dSgctEye2OSEye = glm::inverse(dOsEye2SGCTEye);
-            program.setUniform("dSgctEyeToOSEyeTranform", dSgctEye2OSEye);
-
+            glm::dmat4 dSgctEye2OSEye = glm::inverse(
+                glm::dmat4(renderData.camera.viewMatrix()));
+            
             // Eye Space in SGCT to Projection (Clip) Space in SGCT
-            glm::dmat4 dSgctEye2Clip = glm::dmat4(renderData.camera.projectionMatrix());
-            glm::dmat4 dInverseProjection = glm::inverse(dSgctEye2Clip);
+            glm::dmat4 dInverseProjection = glm::inverse(
+                glm::dmat4(renderData.camera.projectionMatrix()));
 
-            program.setUniform("dInverseSgctProjectionMatrix", dInverseProjection);
+            glm::dmat4 dInverseCameraRotationToSgctEyeTransform = glm::mat4_cast(
+                static_cast<glm::dquat>(renderData.camera.rotationQuaternion())
+            ) * dSgctEye2OSEye;
+            
+            
+            glm::dmat4 dInverseSGCTEyeToTmpRotTransformMatrix = 
+                dInverseCameraRotationToSgctEyeTransform * dInverseProjection;
+            
+            double *mSource = (double*)glm::value_ptr(dInverseSGCTEyeToTmpRotTransformMatrix);
+            mSource[12] += renderData.camera.positionVec3().x;
+            mSource[13] += renderData.camera.positionVec3().y;
+            mSource[14] += renderData.camera.positionVec3().z;
+            mSource[15] = 1.0;
 
-            program.setUniform("dObjpos", glm::dvec4(renderData.position.dvec3(), 1.0));
-            program.setUniform("dCampos", renderData.camera.positionVec3());
+            glm::dmat4 inverseWholeMatrixPipeline = inverseModelMatrix *
+                dInverseSGCTEyeToTmpRotTransformMatrix;
+            program.setUniform(_uniformCache2.dInverseSgctProjectionToModelTransformMatrix,
+                inverseWholeMatrixPipeline);
+
+            program.setUniform(_uniformCache2.dInverseSGCTEyeToTmpRotTransformMatrix, 
+                dInverseCameraRotationToSgctEyeTransform);
+
+            program.setUniform(_uniformCache2.dCampos, renderData.camera.positionVec3());
+
+            glm::dvec4 camPosObjCoords = inverseModelMatrix * glm::dvec4(renderData.camera.positionVec3(), 1.0);
+            program.setUniform(_uniformCache2.dCamPosObj, camPosObjCoords);
 
             double lt;
             glm::dvec3 sunPosWorld = SpiceManager::ref().targetPosition(
@@ -307,9 +292,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
             }
 
             // Sun Position in Object Space
-            program.setUniform("sunDirectionObj", glm::normalize(glm::dvec3(sunPosObj)));
-
-            program.setUniform("ellipsoidRadii", _ellipsoidRadii);
+            program.setUniform(_uniformCache2.sunDirectionObj, glm::normalize(glm::dvec3(sunPosObj)));
 
             // Shadow calculations..
             if (!_shadowConfArray.empty()) {
@@ -403,21 +386,21 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                     }
                     counter++;
                 }
-                program.setUniform("hardShadows", _hardShadowsEnabled);
+                program.setUniform(_uniformCache2.hardShadows, _hardShadowsEnabled);
             }
         }
     }
     _transmittanceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _transmittanceTableTexture);
-    program.setUniform("transmittanceTexture", _transmittanceTableTextureUnit);
+    program.setUniform(_uniformCache2.transmittanceTexture, _transmittanceTableTextureUnit);
 
     _irradianceTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_2D, _irradianceTableTexture);
-    program.setUniform("irradianceTexture", _irradianceTableTextureUnit);
+    program.setUniform(_uniformCache2.irradianceTexture, _irradianceTableTextureUnit);
 
     _inScatteringTableTextureUnit.activate();
     glBindTexture(GL_TEXTURE_3D, _inScatteringTableTexture);
-    program.setUniform("inscatterTexture", _inScatteringTableTextureUnit);
+    program.setUniform(_uniformCache2.inscatterTexture, _inScatteringTableTextureUnit);
 }
 
 void AtmosphereDeferredcaster::postRaycast(const RenderData&,
@@ -446,6 +429,41 @@ std::string AtmosphereDeferredcaster::helperPath() const {
     return ""; // no helper file
 }
 
+void AtmosphereDeferredcaster::initializeCachedVariables(ghoul::opengl::ProgramObject& program) {
+    _uniformCache.cullAtmosphere = program.uniformLocation("cullAtmosphere");
+    _uniformCache.Rg = program.uniformLocation("Rg"); 
+    _uniformCache.Rt = program.uniformLocation("Rt");
+    _uniformCache.groundRadianceEmittion = program.uniformLocation("groundRadianceEmittion");
+    _uniformCache.HR = program.uniformLocation("HR"); 
+    _uniformCache.betaRayleigh = program.uniformLocation("betaRayleigh"); 
+    _uniformCache.HM = program.uniformLocation("HM");  
+    _uniformCache.betaMieExtinction = program.uniformLocation("betaMieExtinction"); 
+    _uniformCache.mieG = program.uniformLocation("mieG"); 
+    _uniformCache.sunRadiance = program.uniformLocation("sunRadiance"); 
+    _uniformCache.ozoneLayerEnabled = program.uniformLocation("ozoneLayerEnabled");
+    _uniformCache.HO = program.uniformLocation("HO"); 
+    _uniformCache.betaOzoneExtinction = program.uniformLocation("betaOzoneExtinction"); 
+    _uniformCache.SAMPLES_R = program.uniformLocation("SAMPLES_R");
+    _uniformCache.SAMPLES_MU = program.uniformLocation("SAMPLES_MU"); 
+    _uniformCache.SAMPLES_MU_S = program.uniformLocation("SAMPLES_MU_S"); 
+    _uniformCache.SAMPLES_NU = program.uniformLocation("SAMPLES_NU");
+    _uniformCache2.dInverseModelTransformMatrix = program.uniformLocation("dInverseModelTransformMatrix");
+    _uniformCache2.dModelTransformMatrix = program.uniformLocation("dModelTransformMatrix");
+    _uniformCache2.dInverseSgctProjectionToModelTransformMatrix = program.uniformLocation("dInverseSgctProjectionToModelTransformMatrix");
+    _uniformCache2.dInverseSGCTEyeToTmpRotTransformMatrix = program.uniformLocation("dInverseSGCTEyeToTmpRotTransformMatrix");
+    _uniformCache2.dCampos = program.uniformLocation("dCampos");
+    _uniformCache2.dCamPosObj = program.uniformLocation("dCamPosObj");
+    _uniformCache2.sunDirectionObj = program.uniformLocation("sunDirectionObj");
+    _uniformCache2.hardShadows = program.uniformLocation("hardShadows");
+    _uniformCache2.transmittanceTexture = program.uniformLocation("transmittanceTexture");
+    _uniformCache2.irradianceTexture = program.uniformLocation("irradianceTexture");
+    _uniformCache2.inscatterTexture = program.uniformLocation("inscatterTexture");
+}
+
+void AtmosphereDeferredcaster::update(const UpdateData&) {
+
+}
+
 void AtmosphereDeferredcaster::setModelTransform(const glm::dmat4& transform) {
     _modelTransform = transform;
 }
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index c4e5e078ee..2fa9dd6d96 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -29,6 +29,7 @@
 
 #include <ghoul/glm.h>
 #include <ghoul/opengl/textureunit.h>
+#include <ghoul/opengl/uniformcache.h>
 
 #include <string>
 #include <vector>
@@ -61,6 +62,10 @@ public:
     std::string deferredcastFSPath() const override;
     std::string helperPath() const override;
 
+    void initializeCachedVariables(ghoul::opengl::ProgramObject&) override;
+
+    void update(const UpdateData&) override;
+
     void preCalculateAtmosphereParam();
 
     void setModelTransform(const glm::dmat4 &transform);
@@ -124,6 +129,18 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _atmosphereProgramObject;
     std::unique_ptr<ghoul::opengl::ProgramObject> _deferredAtmosphereProgramObject;
 
+    UniformCache(cullAtmosphere, Rg, Rt,
+        groundRadianceEmittion, HR, betaRayleigh, HM,
+        betaMieExtinction, mieG, sunRadiance, ozoneLayerEnabled,
+        HO, betaOzoneExtinction, SAMPLES_R,
+        SAMPLES_MU, SAMPLES_MU_S, SAMPLES_NU) _uniformCache;
+    UniformCache(dInverseModelTransformMatrix, dModelTransformMatrix,
+        dInverseSgctProjectionToModelTransformMatrix,
+        dInverseSGCTEyeToTmpRotTransformMatrix,
+        dCampos, dCamPosObj, sunDirectionObj,
+        hardShadows, transmittanceTexture, irradianceTexture,
+        inscatterTexture) _uniformCache2;
+
     GLuint _transmittanceTableTexture;
     GLuint _irradianceTableTexture;
     GLuint _inScatteringTableTexture;
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index ee67e21e41..7c42e0d450 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -299,8 +299,8 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     , _hardShadows(false)
  {
     ghoul_precondition(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyName),
-        "RenderableAtmosphere needs the name to be specified"
+        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyIdentifier),
+        "RenderableAtmosphere needs the identifier to be specified"
     );
 
     documentation::testSpecificationAndThrow(
@@ -309,7 +309,9 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         "RenderableAtmosphere"
     );
 
-    const std::string name = dictionary.value<std::string>(SceneGraphNode::KeyName);
+    const std::string identifier = dictionary.value<std::string>(
+        SceneGraphNode::KeyIdentifier
+    );
     //================================================================
     //======== Reads Shadow (Eclipses) Entries in mod file ===========
     //================================================================
@@ -335,7 +337,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
                         "No Radius value expecified for Shadow Source Name '{}' from "
                         "'{}' planet. Disabling shadows for this planet.",
                         sourceName,
-                        name
+                        identifier
                     ));
                     disableShadows = true;
                     break;
@@ -364,7 +366,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
                             "No Radius value expecified for Shadow Caster Name '{}' from "
                             "'{}' planet. Disabling shadows for this planet.",
                             casterName,
-                            name
+                            identifier
                         ));
                         disableShadows = true;
                         break;
@@ -398,7 +400,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         if (!atmosphereDictionary.getValue(keyAtmosphereRadius, _atmosphereRadius)) {
             errorReadingAtmosphereData = true;
             LWARNINGC(
-                name,
+                identifier,
                 "No Atmosphere Radius value specified for Atmosphere Effects. "
                 "Disabling atmosphere effects for this planet."
             );
@@ -407,7 +409,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         if (!atmosphereDictionary.getValue(keyPlanetRadius, _atmospherePlanetRadius)) {
             errorReadingAtmosphereData = true;
             LWARNINGC(
-                name,
+                identifier,
                 "No Planet Radius value expecified for Atmosphere Effects. "
                 "Disabling atmosphere effects for this planet."
             );
@@ -419,7 +421,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         {
             errorReadingAtmosphereData = true;
             LWARNINGC(
-                name,
+                identifier,
                 "No Average Atmosphere Ground Reflectance value specified for "
                 "Atmosphere Effects. Disabling atmosphere effects for this planet."
             );
@@ -431,7 +433,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         {
             errorReadingAtmosphereData = true;
             LWARNINGC(
-                name,
+                identifier,
                 "No Ground Radiance Emitted percentage value specified for Atmosphere "
                 "Effects. Disabling atmosphere effects for this planet."
             );
@@ -454,7 +456,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
             {
                 errorReadingAtmosphereData = true;
                 LWARNINGC(
-                    name,
+                    identifier,
                     "No Rayleigh Scattering parameters specified for Atmosphere Effects. "
                     "Disabling atmosphere effects for this planet."
                 );
@@ -466,7 +468,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
             {
                 errorReadingAtmosphereData = true;
                 LWARNINGC(
-                    name,
+                    identifier,
                     "No Rayleigh Height Scale value specified for Atmosphere Effects. "
                     "Disabling atmosphere effects for this planet."
                 );
@@ -475,7 +477,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         else {
             errorReadingAtmosphereData = true;
             LWARNINGC(
-                name,
+                identifier,
                 "No Rayleigh parameters specified for Atmosphere Effects. "
                 "Disabling atmosphere effects for this planet."
             );
@@ -506,7 +508,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
             if (!mieDictionary.getValue(keyMieHeightScale, _mieHeightScale)) {
                 errorReadingAtmosphereData = true;
                 LWARNINGC(
-                    name,
+                    identifier,
                     "No Mie Height Scale value specified for Atmosphere Effects. "
                     "Disabling atmosphere effects for this planet."
                 );
@@ -515,7 +517,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
             if (!mieDictionary.getValue("Coefficients.Scattering", _mieScatteringCoeff)) {
                 errorReadingAtmosphereData = true;
                 LWARNINGC(
-                    name,
+                    identifier,
                     "No Mie Scattering parameters specified for Atmosphere Effects. "
                     "Disabling atmosphere effects for this planet."
                 );
@@ -524,7 +526,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
             if (!mieDictionary.getValue("Coefficients.Extinction", _mieExtinctionCoeff)) {
                 errorReadingAtmosphereData = true;
                 LWARNINGC(
-                    name,
+                    identifier,
                     "No Mie Extinction parameters specified for Atmosphere Effects. "
                     "Disabling atmosphere effects for this planet."
                 );
@@ -533,7 +535,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
             if (!mieDictionary.getValue(keyMiePhaseConstant, _miePhaseConstant)) {
                 errorReadingAtmosphereData = true;
                 LWARNINGC(
-                    name,
+                    identifier,
                     "No Mie Phase Constant value specified for Atmosphere Effects. "
                     "Disabling atmosphere effects for this planet."
                 );
@@ -542,7 +544,7 @@ RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
         else {
             errorReadingAtmosphereData = true;
             LWARNINGC(
-                name,
+                identifier,
                 "No Mie parameters specified for Atmosphere Effects. "
                 "Disabling atmosphere effects for this planet."
             );
@@ -762,6 +764,7 @@ void RenderableAtmosphere::update(const UpdateData& data) {
         _deferredcaster->setTime(data.time.j2000Seconds());
         glm::dmat4 modelTransform = computeModelTransformMatrix(data.modelTransform);
         _deferredcaster->setModelTransform(modelTransform);
+        _deferredcaster->update(data);
     }
 }
 
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index 734393073c..b471554177 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -99,13 +99,14 @@ const float M_PI = 3.141592657;
 uniform sampler2D transmittanceTexture;
 
 float opticalDepth(const float H, const float r, const float mu, const float d) {
-  float a    = sqrt((0.5/H)*r);
+  float invH = 1.0/H;
+  float a    = sqrt((0.5 * invH)*r);
   vec2 a01   = a*vec2(mu, mu + d / r);
   vec2 a01s  = sign(a01);
   vec2 a01sq = a01*a01;
   float x    = a01s.y > a01s.x ? exp(a01sq.x) : 0.0;
-  vec2 y     = a01s / (2.3193*abs(a01) + sqrt(1.52*a01sq + 4.0)) * vec2(1.0, exp(-d/H*(d/(2.0*r)+mu)));
-  return sqrt((6.2831*H)*r) * exp((Rg-r)/H) * (x + dot(y, vec2(1.0, -1.0)));
+  vec2 y     = a01s / (2.3193*abs(a01) + sqrt(1.52*a01sq + 4.0)) * vec2(1.0, exp(-d*invH*(d/(2.0*r)+mu)));
+  return sqrt((6.2831*H)*r) * exp((Rg-r)*invH) * (x + dot(y, vec2(1.0, -1.0)));
 }
 
 vec3 analyticTransmittance(const float r, const float mu, const float d) {
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index e924730ecd..dde78a93e0 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -84,19 +84,14 @@ uniform sampler2DMS mainPositionTexture;
 uniform sampler2DMS mainNormalTexture;
 uniform sampler2DMS mainColorTexture;
 
-// Model Transform Matrix Used for Globe Rendering
-uniform dmat4 dInverseSgctEyeToWorldTranform; // SGCT Eye to OS World
-uniform dmat4 dSgctEyeToOSEyeTranform; // SGCT Eye to OS Eye *
-uniform dmat4 dInverseSgctProjectionMatrix; // Clip to SGCT Eye *
-uniform dmat4 dInverseCamRotTransform; 
 uniform dmat4 dInverseModelTransformMatrix; 
 uniform dmat4 dModelTransformMatrix;
-//uniform dmat4 dSGCTEyeToOSWorldTransformMatrix;
+uniform dmat4 dInverseSGCTEyeToTmpRotTransformMatrix;
+uniform dmat4 dInverseSgctProjectionToModelTransformMatrix;
 
-uniform dvec4 dObjpos;
 uniform dvec3 dCampos;
+uniform dvec4 dCamPosObj;
 uniform dvec3 sunDirectionObj;
-uniform dvec3 ellipsoidRadii;
 
 /*******************************************************************************
  ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
@@ -191,12 +186,12 @@ struct dRay {
  *               intersection of the ray with atmosphere when the eye position
  *               is inside atmosphere.
  */
-bool dAtmosphereIntersection(const dvec3 planetPosition, const dRay ray, const double atmRadius,
-                             out bool inside, out double offset, out double maxLength ) {
-    dvec3  l  = planetPosition - ray.origin.xyz;
-    double s  = dot(l, ray.direction.xyz);
-    double l2 = dot(l, l);
-    double r2 = atmRadius * atmRadius; // avoiding surface acne
+bool dAtmosphereIntersection(const dvec3 planetPosition, const dRay ray, const float atmRadius,
+                             out bool inside, out float offset, out float maxLength ) {
+    vec3  l  = vec3(planetPosition) - vec3(ray.origin.xyz);
+    float s  = dot(l, vec3(ray.direction.xyz));
+    float l2 = dot(l, l);
+    float r2 = atmRadius * atmRadius; // avoiding surface acne
 
     // Ray origin (eye position) is behind sphere
     if ((s < 0.0) && (l2 > r2)) {
@@ -206,7 +201,7 @@ bool dAtmosphereIntersection(const dvec3 planetPosition, const dRay ray, const d
         return false;
     }
 
-    double m2 = l2 - s*s;
+    float m2 = l2 - s*s;
 
     // Ray misses atmospere
     if (m2 > r2) {
@@ -219,7 +214,7 @@ bool dAtmosphereIntersection(const dvec3 planetPosition, const dRay ray, const d
     // We already now the ray hits the atmosphere
 
     // If q = 0.0f, there is only one intersection
-    double q = sqrt(r2 - m2);
+    float q = sqrt(r2 - m2);
 
     // If l2 < r2, the ray origin is inside the sphere
     if (l2 > r2) {
@@ -255,32 +250,20 @@ void dCalculateRayRenderableGlobe(in int mssaSample, out dRay ray,
     // Using the interpolated coords:
     // Assuming Red Book is right: z_ndc e [0, 1] and not [-1, 1]
     dvec2 samplePos  = dvec2(msaaSamplePatter[mssaSample],
-                            msaaSamplePatter[mssaSample+1]);
+                             msaaSamplePatter[mssaSample+1]);
     dvec4 clipCoords = dvec4(interpolatedNDCPos.xy + samplePos, interpolatedNDCPos.z, 1.0) / gl_FragCoord.w; 
 
-    // Clip to SGCT Eye
-    dvec4 sgctEyeCoords = dInverseSgctProjectionMatrix * clipCoords;
-    sgctEyeCoords.w     = 1.0;
+    // Clip to Object Coords
+    dvec4 objectCoords = dInverseSgctProjectionToModelTransformMatrix * clipCoords;
     
-    // SGCT Eye to OS Eye
-    dvec4 tOSEyeCoordsInv = dSgctEyeToOSEyeTranform * sgctEyeCoords;
-    
-    // OS Eye to World coords
-    dvec4 tmpRInv     = dInverseCamRotTransform * tOSEyeCoordsInv;
-    dvec4 worldCoords = dvec4(dvec3(tmpRInv) + dCampos, 1.0);
-    
-    // World to Object
-    dvec4 objectCoords = dInverseModelTransformMatrix * worldCoords;
-
     // Planet Position in Object Space
     // JCC: Applying the inverse of the model transformation on the object postion in World 
     // space results in imprecision. 
     planetPositionObjectCoords = dvec4(0.0, 0.0, 0.0, 1.0);
-    //planetPositionObjectCoords = dInverseModelTransformMatrix * dvec4(dObjpos.xyz, 1.0);
 
     // Camera Position in Object Space
-    cameraPositionInObject = dInverseModelTransformMatrix * dvec4(dCampos, 1.0);
-      
+    cameraPositionInObject = dCamPosObj;  
+    
     // ============================
     // ====== Building Ray ========
     // Ray in object space (in KM)
@@ -390,11 +373,12 @@ vec3 inscatterRadiance(inout vec3 x, inout float t, inout float irradianceFactor
         // From cosine law where t = distance between x and x0
         // r0^2 = r^2 + t^2 - 2 * r * t * cos(PI-theta)
         r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
+        float invr0 = 1.0/r0;
         // From the dot product: cos(theta0) = (x0 dot v)/(||ro||*||v||)
         // mu0 = ((x + t) dot v) / r0
         // mu0 = (x dot v + t dot v) / r0
         // mu0 = (r*mu + t) / r0
-        mu0 = (r * mu + t) / r0;
+        mu0 = (r * mu + t) * invr0;
         vec4 inScatterAboveX  = texture4D(inscatterTexture, r, mu, muSun, nu);
         vec4 inScatterAboveXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
         // Attention for the attenuation.r value applied to the S_Mie
@@ -403,7 +387,7 @@ vec3 inscatterRadiance(inout vec3 x, inout float t, inout float irradianceFactor
         // Below Horizon
         mu  = muHorizon + INTERPOLATION_EPS;
         r0  = sqrt(r2 + t2 + 2.0f * r * t * mu);
-        mu0 = (r * mu + t) / r0;
+        mu0 = (r * mu + t) * invr0;
         vec4 inScatterBelowX  = texture4D(inscatterTexture, r, mu, muSun, nu);
         vec4 inScatterBelowXs = texture4D(inscatterTexture, r0, mu0, muSun0, nu);
         // Attention for the attenuation.r value applied to the S_Mie
@@ -468,7 +452,8 @@ vec3 groundColor(const vec3 x, const float t, const vec3 v, const vec3 s, const
     vec3  x0                 = x + t * v;
     float r0                 = length(x0);
     // Normal of intersection point.
-    vec3  n                  = normalize(normal);
+    // Normal must be normalized.
+    vec3  n                  = normal;
     //vec4 groundReflectance = groundColor * vec4(.37);
     vec4 groundReflectance   = groundColor * 
         vec4(groundRadianceEmittion, groundRadianceEmittion, groundRadianceEmittion, 1.0f);
@@ -546,25 +531,28 @@ vec3 sunColor(const vec3 x, const float t, const vec3 v, const vec3 s, const flo
     return transmittance * sunFinalColor;      
 }
 
-void main() {    
+void main() {
+    ivec2 fragCoords = ivec2(gl_FragCoord);    
     if (cullAtmosphere == 0) {
         vec4 atmosphereFinalColor = vec4(0.0f);
-
+        int nSamples = 1;
         // First we determine if the pixel is complex (different fragments on it)
         bool complex = false;
         vec4 oldColor, currentColor;
         //vec4 colorArray[16];
         //int colorIndexArray[16];
 
-        oldColor = texelFetch(mainColorTexture, ivec2(gl_FragCoord), 0);        
+        oldColor = texelFetch(mainColorTexture, fragCoords, 0);        
         //colorArray[0] = oldColor;
         //colorIndexArray[0] = 0;
         for (int i = 1; i < nAaSamples; i++) {
-            //vec4 normal = texelFetch(mainNormalTexture, ivec2(gl_FragCoord), i);
-            vec4 currentColor  = texelFetch(mainColorTexture, ivec2(gl_FragCoord), i);
+            //vec4 normal = texelFetch(mainNormalTexture, fragCoords, i);
+            vec4 currentColor  = texelFetch(mainColorTexture, fragCoords, i);
             //colorArray[i] = currentColor;
             if (currentColor != oldColor) {
                 complex = true;
+                //nSamples = nAaSamples;
+                nSamples = nAaSamples > 1 ? nAaSamples / 2 : nAaSamples;
                 break;
                 // for (int c = 0; c < nAaSamples; c++) {
                 //     if (currentColor == colorArray[c]) {
@@ -583,18 +571,10 @@ void main() {
             // }            
             oldColor = currentColor;
         }
-
-        int nSamples = 1;
-        if (complex) {
-            //nSamples = nAaSamples;
-            nSamples = nAaSamples > 1 ? nAaSamples/2 : nAaSamples;
-        }
         
         for (int i = 0; i < nSamples; i++) {
-            vec4 normal     = texelFetch(mainNormalTexture, ivec2(gl_FragCoord), i);
-            vec4 color      = texelFetch(mainColorTexture, ivec2(gl_FragCoord), i);
-            // Data in the mainPositionTexture are written in view space (view plus camera rig)
-            vec4 position   = texelFetch(mainPositionTexture, ivec2(gl_FragCoord), i);
+            // Color from G-Buffer
+            vec4 color = texelFetch(mainColorTexture, fragCoords, i);
             
             // Ray in object space
             dRay ray;
@@ -611,60 +591,52 @@ void main() {
 
             bool  intersectATM = false;
 
-            // Instead of ray-ellipsoid intersection lets transform the ray to a sphere:
-            dRay transfRay;
-            transfRay.origin    = ray.origin;
-            transfRay.direction = ray.direction;
-
-            // transfRay.origin.z *= 1000.0/ellipsoidRadii.x;
-            // transfRay.direction.z *= 1000.0/ellipsoidRadii.x;        
-            // transfRay.origin.x *= 1000.0/ellipsoidRadii.y;
-            // transfRay.direction.x *= 1000.0/ellipsoidRadii.y;    
-            // transfRay.origin.y *= 1000.0/ellipsoidRadii.z;
-            // transfRay.direction.y *= 1000.0/ellipsoidRadii.z;
-            // transfRay.direction.xyz = normalize(transfRay.direction.xyz);
-
-            intersectATM = dAtmosphereIntersection(planetPositionObjectCoords.xyz, transfRay,  
-                                                  Rt - ATM_EPSILON/100.0, insideATM, offset, maxLength );
-
+            intersectATM = dAtmosphereIntersection(planetPositionObjectCoords.xyz, ray,  
+                                                  Rt - (ATM_EPSILON * 0.001), insideATM, offset, maxLength );
+               
             if ( intersectATM ) {
                 // Now we check is if the atmosphere is occluded, i.e., if the distance to the pixel 
                 // in the depth buffer is less than the distance to the atmosphere then the atmosphere
                 // is occluded
-                // Fragments positions into G-Buffer are written in OS Eye Space (Camera Rig Coords)
+                // Fragments positions into G-Buffer are written in SGCT Eye Space (View plus Camera Rig Coords)
                 // when using their positions later, one must convert them to the planet's coords
                 
+                // Get data from G-Buffer
+                vec4 normal   = texelFetch(mainNormalTexture, fragCoords, i);
+                // Data in the mainPositionTexture are written in view space (view plus camera rig)
+                vec4 position = texelFetch(mainPositionTexture, fragCoords, i);
+               
                 // OS Eye to World coords                
-                dvec4 tmpRInvPos            = dInverseCamRotTransform * dSgctEyeToOSEyeTranform * position;        
-                dvec4 fragWorldCoords       = dvec4(dvec3(tmpRInvPos) + dCampos, 1.0);
+                dvec4 tmpRInvPos       = dInverseSGCTEyeToTmpRotTransformMatrix * position;
+                dvec4 fragWorldCoords  = dvec4(dvec3(tmpRInvPos) + dCampos, 1.0);
                 
                 // World to Object (Normal and Position in meters)
-                dvec4 fragObjectCoords       = dInverseModelTransformMatrix * fragWorldCoords;
+                dvec4 fragObjectCoords = dInverseModelTransformMatrix * fragWorldCoords;
                 
                 // Distance of the pixel in the gBuffer to the observer
                 // JCC (12/12/2017): AMD distance function is buggy.
                 //double pixelDepth = distance(cameraPositionInObject.xyz, fragObjectCoords.xyz);
                 double pixelDepth = length(cameraPositionInObject.xyz - fragObjectCoords.xyz);
                 
-                // JCC (12/13/2017): TRick to remove floating error in texture.
+                // JCC (12/13/2017): Trick to remove floating error in texture.
                 // We see a squared noise on planet's surface when seeing the planet
                 // from far away.
                 float dC = float(length(cameraPositionInObject.xyz));
                 float x1 = 1e8;
                 if (dC > x1) {
-                    pixelDepth += 1000.0;
+                    pixelDepth     += 1000.0;
                     float alpha     = 1000.0;
                     float beta      = 1000000.0;
                     float x2        = 1e9; 
                     float diffGreek = beta - alpha;
                     float diffDist  = x2 - x1;
-                    float varA = diffGreek/diffDist;
-                    float varB = (alpha - varA * x1);
-                    pixelDepth += double(varA * dC + varB); 
+                    float varA      = diffGreek/diffDist;
+                    float varB      = (alpha - varA * x1);
+                    pixelDepth     += double(varA * dC + varB); 
                 }
 
                 // All calculations are done in Km:
-                pixelDepth *= 0.001;
+                pixelDepth           *= 0.001;
                 fragObjectCoords.xyz *= 0.001;
                 
                 if (position.xyz != vec3(0.0) && (pixelDepth < offset)) {
@@ -679,9 +651,9 @@ void main() {
                     // If the observer is already inside the atm, offset = 0.0
                     // and no changes at all.
                     vec3  x  = vec3(ray.origin.xyz + t*ray.direction.xyz);
-                    float r  = 0.0;//length(x);
+                    float r  = 0.0f;//length(x);
                     vec3  v  = vec3(ray.direction.xyz);
-                    float mu = 0.0;//dot(x, v) / r;
+                    float mu = 0.0f;//dot(x, v) / r;
                     vec3  s  = vec3(sunDirectionObj);
                     float tF = float(maxLength - t);
 
@@ -690,7 +662,7 @@ void main() {
                     // next comparison with the planet's ground make sense:
                     pixelDepth -= offset;
                     
-                    dvec4 onATMPos           = dModelTransformMatrix * dvec4(x*1000.0, 1.0);
+                    dvec4 onATMPos           = dModelTransformMatrix * dvec4(x * 1000.0, 1.0);
                     vec4 eclipseShadowATM    = calcShadow(shadowDataArray, onATMPos.xyz, false);            
                     vec4 eclipseShadowPlanet = calcShadow(shadowDataArray, fragWorldCoords.xyz, true);
                   
@@ -718,7 +690,7 @@ void main() {
             else { // no intersection
                 //discard;
                 atmosphereFinalColor += vec4(HDR(color.xyz * backgroundConstant, atmExposure), color.a);
-            }
+            }           
         }  
 
         renderTarget = atmosphereFinalColor / float(nSamples);        
@@ -727,7 +699,7 @@ void main() {
         if (firstPaint) {
             vec4 bColor = vec4(0.0f);
             for (int f = 0; f < nAaSamples; f++) {
-                bColor += texelFetch(mainColorTexture, ivec2(gl_FragCoord), f);
+                bColor += texelFetch(mainColorTexture, fragCoords, f);
             }
             bColor /= float(nAaSamples);
             renderTarget = vec4(HDR(bColor.xyz * backgroundConstant, atmExposure), bColor.a);
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 517d5b8aa5..8c1e953120 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -174,7 +174,7 @@ documentation::Documentation DashboardItemAngle::Documentation() {
 }
 
 DashboardItemAngle::DashboardItemAngle(ghoul::Dictionary dictionary)
-    : DashboardItem("Distance")
+    : DashboardItem("Angle")
     , _fontName(FontNameInfo, KeyFontMono)
     , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
     , _source{
@@ -381,7 +381,7 @@ std::pair<glm::dvec3, std::string> DashboardItemAngle::positionAndLabel(
 
     switch (comp.type) {
         case Type::Node:
-            return { comp.node->worldPosition(), comp.node->name() };
+            return { comp.node->worldPosition(), comp.node->guiName() };
         case Type::Focus:
             return {
                 OsEng.navigationHandler().focusNode()->worldPosition(),
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index bba284a572..ac001d2cde 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -381,7 +381,7 @@ std::pair<glm::dvec3, std::string> DashboardItemDistance::positionAndLabel(
 
     switch (mainComp.type) {
         case Type::Node:
-            return { mainComp.node->worldPosition(), mainComp.node->name() };
+            return { mainComp.node->worldPosition(), mainComp.node->guiName() };
         case Type::NodeSurface:
         {
             glm::dvec3 otherPos;
@@ -398,7 +398,7 @@ std::pair<glm::dvec3, std::string> DashboardItemDistance::positionAndLabel(
             glm::dvec3 dir = glm::normalize(otherPos - thisPos);
             glm::dvec3 dirLength = dir * glm::dvec3(mainComp.node->boundingSphere());
 
-            return { thisPos + dirLength, "surface of " + mainComp.node->name() };
+            return { thisPos + dirLength, "surface of " + mainComp.node->guiName() };
         }
         case Type::Focus:
             return {
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index b15025ce52..60cad0df7d 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -86,7 +86,7 @@ documentation::Documentation DashboardItemParallelConnection::Documentation() {
 
 DashboardItemParallelConnection::DashboardItemParallelConnection(
                                                              ghoul::Dictionary dictionary)
-    : DashboardItem("Parallel Connection")
+    : DashboardItem("ParallelConnection", "Parallel Connection")
     , _fontName(FontNameInfo, KeyFontMono)
     , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
 {
@@ -118,9 +118,9 @@ DashboardItemParallelConnection::DashboardItemParallelConnection(
 }
 
 void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
-    ParallelConnection::Status status = OsEng.parallelConnection().status();
-    size_t nConnections = OsEng.parallelConnection().nConnections();
-    const std::string& hostName = OsEng.parallelConnection().hostName();
+    ParallelConnection::Status status = OsEng.parallelPeer().status();
+    size_t nConnections = OsEng.parallelPeer().nConnections();
+    const std::string& hostName = OsEng.parallelPeer().hostName();
 
     std::string connectionInfo = "";
     int nClients = static_cast<int>(nConnections);
@@ -169,9 +169,9 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
 }
 
 glm::vec2 DashboardItemParallelConnection::size() const {
-    ParallelConnection::Status status = OsEng.parallelConnection().status();
-    size_t nConnections = OsEng.parallelConnection().nConnections();
-    const std::string& hostName = OsEng.parallelConnection().hostName();
+    ParallelConnection::Status status = OsEng.parallelPeer().status();
+    size_t nConnections = OsEng.parallelPeer().nConnections();
+    const std::string& hostName = OsEng.parallelPeer().hostName();
 
     std::string connectionInfo = "";
     int nClients = static_cast<int>(nConnections);
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 5606e26e6a..55e18ef1c0 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -123,7 +123,7 @@ documentation::Documentation DashboardItemSimulationIncrement::Documentation() {
 
 DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
                                                              ghoul::Dictionary dictionary)
-    : DashboardItem("Simulation Increment")
+    : DashboardItem("SimulationIncrement", "Simulation Increment")
     , _fontName(FontNameInfo, KeyFontMono)
     , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
     , _doSimplification(SimplificationInfo, true)
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 7a335522ab..25dc829a86 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -112,21 +112,18 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     , _programObject(nullptr)
     , _texture(nullptr)
 {
-    ghoul_precondition(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyName),
-        "Name was not passed to RenderableModel"
-    );
-
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
         "RenderableModel"
     );
 
+    addProperty(_opacity);
+    registerUpdateRenderBinFromOpacity();
+
+
     if (dictionary.hasKey(KeyGeometry)) {
-        std::string name = dictionary.value<std::string>(SceneGraphNode::KeyName);
         ghoul::Dictionary dict = dictionary.value<ghoul::Dictionary>(KeyGeometry);
-        dict.setValue(SceneGraphNode::KeyName, name);
         _geometry = modelgeometry::ModelGeometry::createFromDictionary(dict);
     }
 
@@ -163,6 +160,7 @@ void RenderableModel::initializeGL() {
         absPath("${MODULE_BASE}/shaders/model_fs.glsl")
     );
 
+    _uniformCache.opacity = _programObject->uniformLocation("opacity");
     _uniformCache.directionToSunViewSpace = _programObject->uniformLocation(
         "directionToSunViewSpace"
     );
@@ -176,6 +174,8 @@ void RenderableModel::initializeGL() {
         "performShading"
     );
     _uniformCache.texture = _programObject->uniformLocation("texture1");
+
+
     loadTexture();
 
     _geometry->initialize(this);
@@ -197,6 +197,8 @@ void RenderableModel::deinitializeGL() {
 void RenderableModel::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
 
+    _programObject->setUniform(_uniformCache.opacity, _opacity);
+
     // Model transform and view transform needs to be in double precision
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
@@ -244,6 +246,7 @@ void RenderableModel::update(const UpdateData&) {
     if (_programObject->isDirty()) {
         _programObject->rebuildFromFile();
 
+        _uniformCache.opacity = _programObject->uniformLocation("opacity");
         _uniformCache.directionToSunViewSpace = _programObject->uniformLocation(
             "directionToSunViewSpace"
         );
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 433aa30b2a..37d41a86e5 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -74,8 +74,8 @@ private:
     properties::Mat3Property _modelTransform;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
-    UniformCache(directionToSunViewSpace, modelViewTransform, projectionTransform,
-        performShading, texture) _uniformCache;
+    UniformCache(opacity, directionToSunViewSpace, modelViewTransform,
+        projectionTransform, performShading, texture) _uniformCache;
 
     std::unique_ptr<ghoul::opengl::Texture> _texture;
 
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 071f813366..91c9da3816 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -111,6 +111,9 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
         "RenderablePlane"
     );
 
+    addProperty(_opacity);
+    registerUpdateRenderBinFromOpacity();
+
     _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
 
     if (dictionary.hasKey(BillboardInfo.identifier)) {
@@ -185,6 +188,8 @@ void RenderablePlane::deinitializeGL() {
 void RenderablePlane::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
 
+    _shader->setUniform("opacity", _opacity);
+
     // Model transform and view transform needs to be in double precision
     const glm::dmat4 rotationTransform = _billboard ?
         glm::inverse(glm::dmat4(data.camera.viewRotationMatrix())) :
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index 650ad3a3f7..f70cafedca 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -96,7 +96,6 @@ void RenderablePlaneImageLocal::deinitializeGL() {
     RenderablePlane::deinitializeGL();
 }
 
-
 void RenderablePlaneImageLocal::bindTexture() {
     _texture->bind();
 }
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index 7fc9911301..e2dbe510b9 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -71,13 +71,6 @@ namespace {
         "This value specifies the radius of the sphere in meters."
     };
 
-    static const openspace::properties::Property::PropertyInfo TransparencyInfo = {
-        "Alpha",
-        "Transparency",
-        "This value determines the transparency of the sphere. If this value is set to "
-        "1, the sphere is completely opaque. At 0, the sphere is completely transparent."
-    };
-
     static const openspace::properties::Property::PropertyInfo FadeOutThreshouldInfo = {
         "FadeOutThreshould",
         "Fade-Out Threshould",
@@ -131,12 +124,6 @@ documentation::Documentation RenderableSphere::Documentation() {
                 Optional::Yes,
                 OrientationInfo.description
             },
-            {
-                TransparencyInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 1.0),
-                Optional::Yes,
-                TransparencyInfo.description
-            },
             {
                 FadeOutThreshouldInfo.identifier,
                 new DoubleInRangeVerifier(0.0, 1.0),
@@ -166,7 +153,6 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     , _orientation(OrientationInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _size(SizeInfo, 1.f, 0.f, 1e35f)
     , _segments(SegmentsInfo, 8, 4, 1000)
-    , _transparency(TransparencyInfo, 1.f, 0.f, 1.f)
     , _disableFadeInDistance(DisableFadeInOuInfo, true)
     , _fadeOutThreshold(-1.0)
     , _fadeInThreshold(0.0)
@@ -181,6 +167,9 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
         "RenderableSphere"
     );
 
+    addProperty(_opacity);
+    registerUpdateRenderBinFromOpacity();
+
     _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
     _segments = static_cast<int>(dictionary.value<double>(SegmentsInfo.identifier));
     _texturePath = absPath(dictionary.value<std::string>(TextureInfo.identifier));
@@ -217,21 +206,6 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     addProperty(_segments);
     _segments.onChange([this](){ _sphereIsDirty = true; });
 
-    _transparency.onChange([this](){
-        if (_transparency > 0.f && _transparency < 1.f) {
-            setRenderBin(Renderable::RenderBin::Transparent);
-        }
-        else {
-            setRenderBin(Renderable::RenderBin::Opaque);
-        }
-    });
-    if (dictionary.hasKey(TransparencyInfo.identifier)) {
-        _transparency = static_cast<float>(
-            dictionary.value<double>(TransparencyInfo.identifier)
-        );
-    }
-    addProperty(_transparency);
-
     addProperty(_texturePath);
     _texturePath.onChange([this]() { loadTexture(); });
 
@@ -252,7 +226,6 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
         _disableFadeInDistance.set(false);
         addProperty(_disableFadeInDistance);
     }
-
 }
 
 bool RenderableSphere::isReady() const {
@@ -272,6 +245,11 @@ void RenderableSphere::initializeGL() {
         absPath("${MODULE_BASE}/shaders/sphere_fs.glsl")
     );
 
+    _uniformCache.opacity = _shader->uniformLocation("opacity");
+    _uniformCache.viewProjection = _shader->uniformLocation("ViewProjection");
+    _uniformCache.modelTransform = _shader->uniformLocation("ModelTransform");
+    _uniformCache.texture = _shader->uniformLocation("texture1");
+
     loadTexture();
 }
 
@@ -294,12 +272,12 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     _shader->activate();
     _shader->setIgnoreUniformLocationError(IgnoreError::Yes);
 
-    _shader->setUniform("ViewProjection", data.camera.viewProjectionMatrix());
-    _shader->setUniform("ModelTransform", transform);
+    _shader->setUniform(_uniformCache.viewProjection, data.camera.viewProjectionMatrix());
+    _shader->setUniform(_uniformCache.modelTransform, transform);
 
     setPscUniforms(*_shader.get(), data.camera, data.position);
 
-    float adjustedTransparency = _transparency;
+    float adjustedTransparency = _opacity;
 
     if (_fadeInThreshold > 0.0) {
         double distCamera = glm::length(data.camera.positionVec3());
@@ -323,16 +301,16 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
     }
 
     // Performance wise
-    if (adjustedTransparency < 0.01) {
+    if (adjustedTransparency < 0.01f) {
         return;
     }
 
-    _shader->setUniform("alpha", adjustedTransparency);
+    _shader->setUniform(_uniformCache.opacity, _opacity);
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     _texture->bind();
-    _shader->setUniform("texture1", unit);
+    _shader->setUniform(_uniformCache.texture, unit);
 
     glEnable(GL_CULL_FACE);
     glCullFace(GL_BACK);
@@ -366,6 +344,11 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
 void RenderableSphere::update(const UpdateData&) {
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
+
+        _uniformCache.opacity = _shader->uniformLocation("opacity");
+        _uniformCache.viewProjection = _shader->uniformLocation("ViewProjection");
+        _uniformCache.modelTransform = _shader->uniformLocation("ModelTransform");
+        _uniformCache.texture = _shader->uniformLocation("texture1");
     }
 
     if (_sphereIsDirty) {
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index 002954d332..f8fbf0984b 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -31,6 +31,7 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <ghoul/opengl/uniformcache.h>
 
 namespace ghoul::opengl {
     class ProgramObject;
@@ -68,8 +69,6 @@ private:
     properties::FloatProperty _size;
     properties::IntProperty _segments;
 
-    properties::FloatProperty _transparency;
-
     properties::BoolProperty _disableFadeInDistance;
 
     float _fadeOutThreshold;
@@ -80,6 +79,9 @@ private:
 
     std::unique_ptr<PowerScaledSphere> _sphere;
 
+    UniformCache(opacity, viewProjection, modelTransform, texture) _uniformCache;
+
+
     bool _sphereIsDirty;
 };
 
diff --git a/modules/base/rendering/renderablesphericalgrid.cpp b/modules/base/rendering/renderablesphericalgrid.cpp
index 1ffefbbabc..e56d8eb140 100644
--- a/modules/base/rendering/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/renderablesphericalgrid.cpp
@@ -137,6 +137,9 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
         "RenderableSphericalGrid"
     );
 
+    addProperty(_opacity);
+    registerUpdateRenderBinFromOpacity();
+
     if (dictionary.hasKey(GridMatrixInfo.identifier)) {
         _gridMatrix = dictionary.value<glm::dmat4>(GridMatrixInfo.identifier);
     }
@@ -210,6 +213,8 @@ void RenderableSphericalGrid::deinitializeGL() {
 void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
+    _gridProgram->setUniform("opacity", _opacity);
+
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
         glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 9301f7c939..5ee7b0a2be 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -169,6 +169,9 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
     , _renderingModes(RenderingModeInfo, properties::OptionProperty::DisplayType::Dropdown
     )
 {
+    addProperty(_opacity);
+    registerUpdateRenderBinFromOpacity();
+
     _translation = Translation::createFromDictionary(
         dictionary.value<ghoul::Dictionary>(KeyTranslation)
     );
@@ -226,6 +229,7 @@ void RenderableTrail::initializeGL() {
         absPath("${MODULE_BASE}/shaders/renderabletrail_fs.glsl")
     );
 
+    _uniformCache.opacity = _programObject->uniformLocation("opacity");
     _uniformCache.modelView = _programObject->uniformLocation("modelViewTransform");
     _uniformCache.projection = _programObject->uniformLocation("projectionTransform");
     _uniformCache.color = _programObject->uniformLocation("color");
@@ -255,6 +259,7 @@ bool RenderableTrail::isReady() const {
 
 void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     _programObject->activate();
+    _programObject->setUniform(_uniformCache.opacity, _opacity);
 
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 70ae56812f..62ea0d466d 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -160,8 +160,8 @@ private:
     /// Program object used to render the data stored in RenderInformation
     std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
 
-    UniformCache(modelView, projection, color, useLineFade, lineFade, vertexSorting,
-        idOffset, nVertices, stride, pointSize, renderPhase) _uniformCache;
+    UniformCache(opacity, modelView, projection, color, useLineFade, lineFade,
+        vertexSorting, idOffset, nVertices, stride, pointSize, renderPhase) _uniformCache;
 };
 
 } // namespace openspace
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index c6d2529e5c..2956b57807 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -159,20 +159,25 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
         "ScreenSpaceDashboard"
     );
 
-    if (dictionary.hasKey(KeyName)) {
-        setName(dictionary.value<std::string>(KeyName));
-    }
-    else {
+    int iIdentifier = 0;
+    if (_identifier.empty()) {
         static int id = 0;
-        if (id == 0) {
-            setName("ScreenSpaceDashboard");
+        iIdentifier = id;
+
+        if (iIdentifier == 0) {
+            setIdentifier("ScreenSpaceDashboard");
         }
         else {
-            setName("ScreenSpaceDashboard" + std::to_string(id));
+            setIdentifier("ScreenSpaceDashboard" + std::to_string(iIdentifier));
         }
         ++id;
     }
 
+    if (_guiName.empty()) {
+        // Adding an extra space to the user-facing name as it looks nicer
+        setGuiName("ScreenSpaceDashboard " + std::to_string(iIdentifier));
+    }
+
     if (dictionary.hasKey(UseMainInfo.identifier)) {
         _useMainDashboard = dictionary.value<bool>(UseMainInfo.identifier);
     }
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index e5559d0b66..066afe7fa9 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -65,12 +65,21 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer(const ghoul::Dictionary& dictiona
         "ScreenSpaceFramebuffer"
     );
 
-    _id = id();
-    if (_id == 0) {
-        setName("ScreenSpaceFramebuffer");
+    int iIdentifier = 0;
+    if (_identifier.empty()) {
+        iIdentifier = id();
+
+        if (iIdentifier == 0) {
+            setIdentifier("ScreenSpaceFramebuffer");
+        }
+        else {
+            setIdentifier("ScreenSpaceFramebuffer" + std::to_string(iIdentifier));
+        }
     }
-    else {
-        setName("ScreenSpaceFramebuffer " + std::to_string(_id));
+
+    if (_guiName.empty()) {
+        // Adding an extra space to the user-facing name as it looks nicer
+        setGuiName("ScreenSpaceFramebuffer " + std::to_string(iIdentifier));
     }
 
     glm::vec2 resolution = OsEng.windowWrapper().currentWindowResolution();
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index ac99ac1956..157c7ce007 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -74,8 +74,6 @@ private:
     std::vector<std::function<void()>> _renderFunctions;
 
     std::unique_ptr<ghoul::opengl::Texture> _texture;
-
-    int _id;
 };
 
 } //namespace openspace
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index c8e040ce1a..e42c33db64 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -84,20 +84,25 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
         "ScreenSpaceImageLocal"
     );
 
-    if (dictionary.hasKey(KeyName)) {
-        setName(dictionary.value<std::string>(KeyName));
-    }
-    else {
+    int iIdentifier = 0;
+    if (_identifier.empty()) {
         static int id = 0;
-        if (id == 0) {
-            setName("ScreenSpaceImageLocal");
+        iIdentifier = id;
+
+        if (iIdentifier == 0) {
+            setIdentifier("ScreenSpaceImageLocal");
         }
         else {
-            setName("ScreenSpaceImageLocal " + std::to_string(id));
+            setIdentifier("ScreenSpaceImageLocal" + std::to_string(iIdentifier));
         }
         ++id;
     }
 
+    if (_guiName.empty()) {
+        // Adding an extra space to the user-facing name as it looks nicer
+        setGuiName("ScreenSpaceImageLocal " + std::to_string(iIdentifier));
+    }
+
     _texturePath.onChange([this]() { _textureIsDirty = true; });
     addProperty(_texturePath);
 
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index cad4a48541..4df3149a8e 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -80,23 +80,28 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
-        "ScreenSpaceImage"
+        "ScreenSpaceImageOnline"
     );
 
-    if (dictionary.hasKey(KeyName)) {
-        setName(dictionary.value<std::string>(KeyName));
-    }
-    else {
+    int iIdentifier = 0;
+    if (_identifier.empty()) {
         static int id = 0;
-        if (id == 0) {
-            setName("ScreenSpaceImageOnline");
+        iIdentifier = id;
+
+        if (iIdentifier == 0) {
+            setIdentifier("ScreenSpaceImageOnline");
         }
         else {
-            setName("ScreenSpaceImageOnline " + std::to_string(id));
+            setIdentifier("ScreenSpaceImageOnline" + std::to_string(iIdentifier));
         }
         ++id;
     }
 
+    if (_guiName.empty()) {
+        // Adding an extra space to the user-facing name as it looks nicer
+        setGuiName("ScreenSpaceImageOnline " + std::to_string(iIdentifier));
+    }
+
     _texturePath.onChange([this]() { _textureIsDirty = true; });
     addProperty(_texturePath);
 
@@ -104,7 +109,6 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
     if (dictionary.hasKey(TextureInfo.identifier)) {
         _texturePath = dictionary.value<std::string>(TextureInfo.identifier);
     }
-
 }
 
 void ScreenSpaceImageOnline::update() {
diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl
index 51e0973d20..89dd564e57 100644
--- a/modules/base/shaders/grid_fs.glsl
+++ b/modules/base/shaders/grid_fs.glsl
@@ -29,10 +29,12 @@ in float vs_screenSpaceDepth;
 in vec4 vs_positionViewSpace;
 
 uniform vec4 gridColor;
+uniform float opacity;
 
 Fragment getFragment() {
     Fragment frag;
     frag.color      = gridColor;
+    frag.color.a    *= opacity;
     frag.depth      = vs_screenSpaceDepth;
     frag.gPosition  = vs_positionViewSpace;
     frag.gNormal    = vec4(0.0, 0.0, 0.0, 1.0);
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index ed24bf14c1..f84b508a0c 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -28,11 +28,11 @@ in vec2 vs_st;
 in vec3 vs_normalViewSpace;
 in vec4 vs_positionCameraSpace;
 in float vs_screenSpaceDepth;
-in vec3 vs_normalObjSpace;
 
 uniform bool performShading = true;
 uniform vec3 directionToSunViewSpace;
 uniform sampler2D texture1;
+uniform float opacity = 1.0;
 
 const vec3 SpecularAlbedo = vec3(1.0);
 
@@ -69,10 +69,10 @@ Fragment getFragment() {
         frag.color.rgb = diffuseAlbedo;
     }
 
-    frag.color.a    = 1.0;
+    frag.color.a    = opacity;
     frag.depth      = vs_screenSpaceDepth;
     frag.gPosition  = vs_positionCameraSpace;
-    frag.gNormal    = vec4(vs_normalObjSpace, 1.0);
+    frag.gNormal    = vec4(vs_normalViewSpace, 1.0);
 
 
     return frag;
diff --git a/modules/base/shaders/model_vs.glsl b/modules/base/shaders/model_vs.glsl
index 3a1be7e6e2..0c1c036c5d 100644
--- a/modules/base/shaders/model_vs.glsl
+++ b/modules/base/shaders/model_vs.glsl
@@ -34,7 +34,6 @@ out vec2 vs_st;
 out vec3 vs_normalViewSpace;
 out float vs_screenSpaceDepth;
 out vec4 vs_positionCameraSpace;
-out vec3 vs_normalObjSpace;
 
 uniform mat4 modelViewTransform;
 uniform mat4 projectionTransform;
diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl
index d03102727a..20e48b82fd 100644
--- a/modules/base/shaders/plane_fs.glsl
+++ b/modules/base/shaders/plane_fs.glsl
@@ -31,6 +31,7 @@ in vec3 vs_gNormal;
 
 uniform sampler2D texture1;
 uniform bool additiveBlending;
+uniform float opacity = 1.0;
 
 
 Fragment getFragment() {
@@ -42,6 +43,7 @@ Fragment getFragment() {
         frag.color = texture(texture1, vec2(1 - vs_st.s, vs_st.t));
     }
 
+    frag.color.a *= opacity;
     if (frag.color.a == 0.0) {
         discard;
     }
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index 6e005164f0..979aa32445 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -30,6 +30,7 @@ in float fade;
 
 uniform vec3 color;
 uniform int renderPhase;
+uniform float opacity = 1.0;
 
 // Fragile! Keep in sync with RenderableTrail::render::RenderPhase 
 #define RenderPhaseLines 0
@@ -40,7 +41,7 @@ uniform int renderPhase;
 
 Fragment getFragment() {
     Fragment frag;
-    frag.color = vec4(color * fade, fade);
+    frag.color = vec4(color * fade, fade * opacity);
     frag.depth = vs_positionScreenSpace.w;
     frag.blend = BLEND_MODE_ADDITIVE;
 
diff --git a/modules/base/shaders/sphere_fs.glsl b/modules/base/shaders/sphere_fs.glsl
index 47488304a7..e536a60184 100644
--- a/modules/base/shaders/sphere_fs.glsl
+++ b/modules/base/shaders/sphere_fs.glsl
@@ -31,7 +31,7 @@ in vec4 vs_gPosition;
 
 uniform float time;
 uniform sampler2D texture1;
-uniform float alpha;
+uniform float opacity;
 
 
 Fragment getFragment() {
@@ -42,7 +42,7 @@ Fragment getFragment() {
     texCoord.t = 1 - texCoord.y;
 
     Fragment frag;
-    frag.color = texture(texture1, texCoord) * vec4(1.0, 1.0, 1.0, alpha);
+    frag.color = texture(texture1, texCoord) * vec4(1.0, 1.0, 1.0, opacity);
     frag.depth = pscDepth(position);
 
     // G-Buffer
diff --git a/modules/cefwebgui/CMakeLists.txt b/modules/cefwebgui/CMakeLists.txt
new file mode 100644
index 0000000000..32f763226c
--- /dev/null
+++ b/modules/cefwebgui/CMakeLists.txt
@@ -0,0 +1,47 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2017                                                                #
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/module_definition.cmake)
+set(CEFWEBGUI_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "CEFWEBGUI_MODULE_PATH")
+set(CEFWEBGUI_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/web CACHE INTERNAL "CEFWEBGUI_MODULE_PATH")
+
+set(OPENSPACE_HEADER_FILES
+    cefwebguimodule.h
+    include/guirenderhandler.h
+    )
+source_group("Header Files" FILES ${OPENSPACE_HEADER_FILES})
+
+set(OPENSPACE_SOURCE_FILES
+    cefwebguimodule.cpp
+    src/guirenderhandler.cpp
+    )
+source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+create_new_module(
+    CefWebGui
+    cefwebgui_module
+    ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES}
+)
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
new file mode 100644
index 0000000000..123b69cd34
--- /dev/null
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -0,0 +1,80 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/webbrowser/webbrowsermodule.h>
+#include "cefwebguimodule.h"
+
+namespace {
+const std::string _loggerCat = "CefWebGui";
+}
+
+namespace openspace {
+
+CefWebGuiModule::CefWebGuiModule()
+    : OpenSpaceModule(CefWebGuiModule::Name)
+{}
+
+void CefWebGuiModule::internalInitialize(const ghoul::Dictionary&) {
+    _guiInstance = std::make_shared<BrowserInstance>(new GUIRenderHandler());
+    _guiLocation = OsEng.configurationManager().value<std::string>(
+        ConfigurationManager::KeyCefWebGuiUrl);
+
+    OsEng.registerModuleCallback(
+            OpenSpaceEngine::CallbackOption::Initialize,
+            [this]() {
+                LDEBUGC("WebBrowser", fmt::format("Loading GUI from {}", _guiLocation));
+                _guiInstance->loadUrl(_guiLocation);
+                auto webBrowserModule = OsEng.moduleEngine().module<WebBrowserModule>();
+                if (webBrowserModule != nullptr) {
+                    webBrowserModule->attachEventHandler(_guiInstance);
+                    webBrowserModule->addBrowser(_guiInstance);
+                }
+            }
+    );
+    OsEng.registerModuleCallback(
+            OpenSpaceEngine::CallbackOption::Render,
+            [this](){
+                WindowWrapper& wrapper = OsEng.windowWrapper();
+                if (wrapper.isMaster()) {
+                    if (wrapper.windowHasResized()) {
+                        _guiInstance->reshape(wrapper.currentWindowSize());
+                    }
+
+                    _guiInstance->draw();
+                }
+            });
+    OsEng.registerModuleCallback(
+            OpenSpaceEngine::CallbackOption::Deinitialize,
+            [this](){
+                _guiInstance->close(true);
+                auto webBrowserModule = OsEng.moduleEngine().module<WebBrowserModule>();
+                if (webBrowserModule != nullptr) {
+                    webBrowserModule->removeBrowser(_guiInstance);
+                }
+                _guiInstance.reset();
+            });
+}
+
+}
+
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
new file mode 100644
index 0000000000..576bc39927
--- /dev/null
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -0,0 +1,48 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_CEFWEBGUIMODULE_H
+#define OPENSPACE_CEFWEBGUIMODULE_H
+
+#include <openspace/util/openspacemodule.h>
+#include <include/openspace/engine/configurationmanager.h>
+#include "modules/webbrowser/include/browserinstance.h"
+#include "modules/cefwebgui/include/guirenderhandler.h"
+
+namespace openspace {
+
+class CefWebGuiModule : public OpenSpaceModule {
+public:
+    static constexpr const char* Name = "CefWebGui";
+    CefWebGuiModule();
+    void internalInitialize(const ghoul::Dictionary& configuration) override;
+
+private:
+    std::shared_ptr<BrowserInstance> _guiInstance;
+    std::string _guiLocation;
+};
+
+}
+
+#endif //OPENSPACE_WEBGUIMODULE_H
diff --git a/modules/cefwebgui/include.cmake b/modules/cefwebgui/include.cmake
new file mode 100644
index 0000000000..2a4812472d
--- /dev/null
+++ b/modules/cefwebgui/include.cmake
@@ -0,0 +1,7 @@
+set(DEFAULT_MODULE OFF)
+
+set(OPEMSPACE_DEPENCENCIES
+    webbrowser
+    webgui
+    server
+    )
\ No newline at end of file
diff --git a/modules/cefwebgui/include/guirenderhandler.h b/modules/cefwebgui/include/guirenderhandler.h
new file mode 100644
index 0000000000..88da19389e
--- /dev/null
+++ b/modules/cefwebgui/include/guirenderhandler.h
@@ -0,0 +1,54 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER___GUI_RENDER_HANDLER___H__
+#define __OPENSPACE_MODULE_WEBBROWSER___GUI_RENDER_HANDLER___H__
+
+#include <memory>
+#include <include/openspace/engine/openspaceengine.h>
+#include <include/openspace/rendering/renderengine.h>
+#include <include/openspace/engine/wrapper/windowwrapper.h>
+#include <ghoul/opengl/ghoul_gl.h>
+#include <fmt/format.h>
+#include <include/cef_app.h>
+#include "modules/webbrowser/include/webrenderhandler.h"
+
+namespace openspace {
+
+class GUIRenderHandler : public WebRenderHandler {
+public:
+    GUIRenderHandler();
+
+    void initializeGL();
+    void draw(void);
+    void render() {};
+
+private:
+    std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
+    GLuint _program, _vao, _vbo;
+};
+
+} // namespace openspace
+
+#endif  // __OPENSPACE_MODULE_WEBBROWSER___GUI_RENDER_HANDLER___H__
diff --git a/modules/cefwebgui/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl
new file mode 100644
index 0000000000..0a9946a42f
--- /dev/null
+++ b/modules/cefwebgui/shaders/gui_fs.glsl
@@ -0,0 +1,35 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+in vec2 Texcoord;
+
+out vec4 outputColor;
+
+uniform sampler2D tex;
+
+void main() {
+  outputColor = texture2D(tex, Texcoord);
+}
diff --git a/modules/cefwebgui/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl
new file mode 100644
index 0000000000..70cb0858a5
--- /dev/null
+++ b/modules/cefwebgui/shaders/gui_vs.glsl
@@ -0,0 +1,38 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+layout(location = 0) in vec2 position;
+
+uniform mat4 ortho;
+
+out vec2 Texcoord;
+
+void main() {
+  Texcoord = (vec2(position.x + 1.0f, position.y - 1.0f) * 0.5);
+  Texcoord.y *= -1.0f;
+  gl_Position = vec4(position, 0.0, 1.0);
+}
+
diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp
new file mode 100644
index 0000000000..047c632e0e
--- /dev/null
+++ b/modules/cefwebgui/src/guirenderhandler.cpp
@@ -0,0 +1,95 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 <glm/gtc/matrix_transform.hpp>
+#include <ghoul/filesystem/filesystem.h>
+#include "modules/cefwebgui/include/guirenderhandler.h"
+
+namespace {
+    std::string _loggerCat = "WebGUI:RenderHandler";
+}
+
+namespace openspace {
+
+GUIRenderHandler::GUIRenderHandler() {
+    OsEng.registerModuleCallback(
+            OpenSpaceEngine::CallbackOption::InitializeGL,
+            [this](){
+                LDEBUG("Initializing WebGUI RenderHandler OpenGL");
+                initializeGL();
+            }
+    );
+}
+
+void GUIRenderHandler::initializeGL() {
+    LDEBUG("Initializing CEF GL environment...");
+    _programObject = ghoul::opengl::ProgramObject::Build(
+            "WebGUICEFProgram",
+            absPath("${MODULE_CEFWEBGUI}/shaders/gui_vs.glsl"),
+            absPath("${MODULE_CEFWEBGUI}/shaders/gui_fs.glsl")
+    );
+    float data[] = {-1.0f, -1.0f, -1.0f,
+                     1.0f,  1.0f, -1.0f,
+                     1.0f, -1.0f, -1.0f,
+                     1.0f,  1.0f,  1.0f};
+    glGenVertexArrays(1, &_vao);
+    glBindVertexArray(_vao);
+    glGenBuffers(1, &_vbo);
+    glGenTextures(1, &_texture);
+    glBindBuffer(GL_ARRAY_BUFFER, _vbo);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(GLfloat), 0);
+    glBindVertexArray(0);
+    LDEBUG("Initializing CEF GL environment... done!");
+}
+
+void GUIRenderHandler::draw(void) {
+    if (_programObject->isDirty()) {
+        _programObject->rebuildFromFile();
+    }
+
+    glEnable(GL_BLEND);
+    glBlendEquation(GL_FUNC_ADD);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+
+    _programObject->activate();
+
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
+    glBindTexture(GL_TEXTURE_2D, _texture);
+    _programObject->setUniform("tex", unit);
+
+    glBindVertexArray(_vao);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
+    glBindVertexArray(0);
+
+    _programObject->deactivate();
+
+    glEnable(GL_CULL_FACE);
+}
+
+} // namespace openspace
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
index cfda8dbff7..dcac27b3f1 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
@@ -1111,7 +1111,7 @@ bool RenderableBillboardsCloud::loadSpeckData() {
 
         std::string cachedFile = FileSys.cacheManager()->cachedFilename(
             ghoul::filesystem::File(_file),
-            "RenderableDUMeshes|" + name(),
+            "RenderableDUMeshes|" + identifier(),
             ghoul::filesystem::CacheManager::Persistent::Yes
         );
 
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index 823eeebaf9..b636be2c7c 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -123,16 +123,10 @@ RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
     , _fieldlineVAO(0)
     , _vertexPositionBuffer(0)
 {
-    ghoul_assert(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyName),
-        "Renderable does not have a name"
-    );
+    std::string identifier = dictionary.value<std::string>(SceneGraphNode::KeyIdentifier);
+    setIdentifier(identifier);
 
-    std::string name;
-    dictionary.getValue(SceneGraphNode::KeyName, name);
-    setName(name);
-
-    _loggerCat = "RenderableFieldlines [" + name + "]";
+    _loggerCat = "RenderableFieldlines [" + identifier + "]";
 
     bool success = dictionary.getValue(keyVectorField, _vectorFieldInfo);
     if (!success) {
@@ -355,7 +349,7 @@ void RenderableFieldlines::update(const UpdateData&) {
             GL_FLOAT,
             GL_FALSE,
             sizeof(LinePoint),
-            (void*)(sizeof(glm::vec3))
+            reinterpret_cast<void*>(sizeof(glm::vec3))
         );
 
         glBindBuffer(GL_ARRAY_BUFFER, 0);
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index c39cb3dd3e..5ff44d90ae 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -374,13 +374,13 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
                                                            SourceFileType& sourceFileType)
 {
 
-    _dictionary->getValue(SceneGraphNode::KeyName, _name);
+    _dictionary->getValue(SceneGraphNode::KeyIdentifier, _identifier);
 
     // ------------------- EXTRACT MANDATORY VALUES FROM DICTIONARY ------------------- //
     std::string inputFileTypeString;
     if (!_dictionary->getValue(KeyInputFileType, inputFileTypeString)) {
         LERROR(fmt::format(
-            "{}: The field {} is missing", _name, KeyInputFileType
+            "{}: The field {} is missing", _identifier, KeyInputFileType
         ));
     }
     else {
@@ -403,7 +403,7 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
         else {
             LERROR(fmt::format(
                 "{}: {} is not a recognized {}",
-                _name, inputFileTypeString, KeyInputFileType
+                _identifier, inputFileTypeString, KeyInputFileType
             ));
             sourceFileType = SourceFileType::Invalid;
             return false;
@@ -413,7 +413,7 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
     std::string sourceFolderPath;
     if (!_dictionary->getValue(KeySourceFolder, sourceFolderPath)) {
         LERROR(fmt::format(
-            "{}: The field {} is missing", _name, KeySourceFolder
+            "{}: The field {} is missing", _identifier, KeySourceFolder
         ));
         return false;
     }
@@ -445,14 +445,14 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
         if (_sourceFiles.empty()) {
             LERROR(fmt::format(
                 "{}: {} contains no {} files",
-                _name, sourceFolderPath, inputFileTypeString
+                _identifier, sourceFolderPath, inputFileTypeString
             ));
             return false;
         }
     }
     else {
         LERROR(fmt::format(
-            "{}: FieldlinesSequence {} is not a valid directory", _name, sourceFolderPath
+            "{}: FieldlinesSequence {} is not a valid directory", _identifier, sourceFolderPath
         ));
         return false;
     }
@@ -472,7 +472,7 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
         else {
             LERROR(fmt::format(
                 "{}: The specified output path: '{}', does not exist",
-                _name, outputFolderPath
+                _identifier, outputFolderPath
             ));
             outputFolderPath = "";
         }
@@ -532,7 +532,7 @@ bool RenderableFieldlinesSequence::extractJsonInfoFromDictionary(fls::Model& mod
     }
     else {
         LERROR(fmt::format(
-            "{}: Must specify '{}'", _name, KeyJsonSimulationModel
+            "{}: Must specify '{}'", _identifier, KeyJsonSimulationModel
         ));
         return false;
     }
@@ -544,7 +544,7 @@ bool RenderableFieldlinesSequence::extractJsonInfoFromDictionary(fls::Model& mod
     else {
         LWARNING(fmt::format(
             "{}: Does not provide scalingFactor. Assumes coordinates are in meters",
-            _name
+            _identifier
         ));
     }
     return true;
@@ -588,7 +588,7 @@ bool RenderableFieldlinesSequence::prepareForOsflsStreaming() {
 void RenderableFieldlinesSequence::loadOsflsStatesIntoRAM(const std::string& outputFolder)
 {
     // Load states from .osfls files into RAM!
-    for (const std::string filePath : _sourceFiles) {
+    for (const std::string& filePath : _sourceFiles) {
         FieldlinesState newState;
         if (newState.loadStateFromOsfls(filePath)) {
             addStateToSequence(newState);
@@ -611,7 +611,7 @@ void RenderableFieldlinesSequence::extractOsflsInfoFromDictionary() {
     else {
         LWARNING(fmt::format(
             "{}: {} is not specified. States will be stored in RAM",
-            _name, KeyOslfsLoadAtRuntime
+            _identifier, KeyOslfsLoadAtRuntime
         ));
     }
 }
@@ -666,7 +666,7 @@ void RenderableFieldlinesSequence::setupProperties() {
         // the given sequence have the same extra quantities! */
         const size_t nExtraQuantities = _states[0].nExtraQuantities();
         const std::vector<std::string>& extraNamesVec = _states[0].extraQuantityNames();
-        for (int i = 0; i < nExtraQuantities; ++i) {
+        for (int i = 0; i < static_cast<int>(nExtraQuantities); ++i) {
             _pColorQuantity.addOption(i, extraNamesVec[i]);
             _pMaskingQuantity.addOption(i, extraNamesVec[i]);
         }
@@ -746,10 +746,10 @@ void RenderableFieldlinesSequence::definePropertyCallbackFunctions() {
     }
 
     _pFocusOnOriginBtn.onChange([this] {
-        SceneGraphNode* node = OsEng.renderEngine().scene()->sceneGraphNode(_name);
+        SceneGraphNode* node = OsEng.renderEngine().scene()->sceneGraphNode(_identifier);
         if (!node) {
             LWARNING(fmt::format(
-                "Could not find a node in scenegraph called '{}'", _name
+                "Could not find a node in scenegraph called '{}'", _identifier
             ));
             return;
         }
@@ -899,20 +899,20 @@ bool RenderableFieldlinesSequence::extractCdfInfoFromDictionary(std::string& see
         else {
             LERROR(fmt::format(
                 "{}: The specified seed poitn file: '{}' does not exist",
-                _name, seedFilePath
+                _identifier, seedFilePath
             ));
             return false;
         }
     }
     else {
-        LERROR(fmt::format("{}: Must specify '{}'", _name, KeyCdfSeedPointFile));
+        LERROR(fmt::format("{}: Must specify '{}'", _identifier, KeyCdfSeedPointFile));
         return false;
     }
 
     if (!_dictionary->getValue(KeyCdfTracingVariable, tracingVar)) {
         tracingVar = "b"; //  Magnetic field variable as default
         LWARNING(fmt::format("{}: No '{}', using default '{}'",
-            _name, KeyCdfTracingVariable, tracingVar
+            _identifier, KeyCdfTracingVariable, tracingVar
         ));
     }
 
@@ -962,7 +962,7 @@ void RenderableFieldlinesSequence::extractMagnitudeVarsFromStrings(
                                                    std::vector<std::string>& extraMagVars)
 {
 
-    for (int i = 0; i < extraVars.size(); i++) {
+    for (int i = 0; i < static_cast<int>(extraVars.size()); i++) {
         const std::string str = extraVars[i];
         // Check if string is in the format specified for magnitude variables
         if (str.substr(0, 2) == "|(" && str.substr(str.size() - 2, 2) == ")|") {
@@ -1120,7 +1120,7 @@ void RenderableFieldlinesSequence::update(const UpdateData& data) {
 
     // Check if current time in OpenSpace is within sequence interval
     if (isInInterval) {
-        const int nextIdx = _activeTriggerTimeIndex + 1;
+        const size_t nextIdx = _activeTriggerTimeIndex + 1;
         if (
             // true => Previous frame was not within the sequence interval
             _activeTriggerTimeIndex < 0
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
index 54cca77b1b..93236d7d76 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
@@ -62,7 +62,7 @@ private:
     };
 
     // ------------------------------------ STRINGS ------------------------------------//
-    std::string       _name;                               // Name of the Node!
+    std::string       _identifier;                               // Name of the Node!
 
     // ------------------------------------- FLAGS -------------------------------------//
     // Used for 'runtime-states'. True when loading a new state from disk on another
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
index d7976413db..ee93ca17a3 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
@@ -67,14 +67,14 @@ out float vs_depth;
 
 vec4 getTransferFunctionColor() {
     // Remap the color scalar to a [0,1] range
-    const float lookUpVal = (in_color_scalar - colorTableRange.x) /
+    float lookUpVal = (in_color_scalar - colorTableRange.x) /
                             (colorTableRange.y - colorTableRange.x);
     return texture(colorTable, lookUpVal);
 }
 
 bool isPartOfParticle(const double time, const int vertexId, const int particleSize,
                       const int particleSpeed, const int particleSpacing) {
-    const int modulusResult = int(double(particleSpeed) * time + vertexId) % particleSpacing;
+    int modulusResult = int(double(particleSpeed) * time + vertexId) % particleSpacing;
     return modulusResult > 0 && modulusResult <= particleSize;
 }
 
@@ -88,7 +88,7 @@ void main() {
     }
 
     if (usingDomain && hasColor) {
-        const float radius = length(in_position);
+        float radius = length(in_position);
 
         if (in_position.x < domainLimX.x || in_position.x > domainLimX.y ||
             in_position.y < domainLimY.x || in_position.y > domainLimY.y ||
@@ -100,7 +100,7 @@ void main() {
     }
 
     if (hasColor) {
-        const bool isParticle = usingParticles && isPartOfParticle(time, gl_VertexID,
+        bool isParticle = usingParticles && isPartOfParticle(time, gl_VertexID,
                                                                     particleSize,
                                                                     particleSpeed,
                                                                     particleSpacing);
@@ -112,7 +112,7 @@ void main() {
         }
 
         if (colorMethod == colorByQuantity) {
-            const vec4 quantityColor = getTransferFunctionColor();
+            vec4 quantityColor = getTransferFunctionColor();
             vs_color = vec4(quantityColor.xyz, vs_color.a * quantityColor.a);
         }
     } else {
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 5fa896e29a..92262b454e 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -345,13 +345,13 @@ void FieldlinesState::saveStateToJson(const std::string& absPath) {
 
     const std::string timeStr = Time(_triggerTime).ISO8601();
     const size_t nLines       = _lineStart.size();
-    const size_t nPoints      = _vertexPositions.size();
+    // const size_t nPoints      = _vertexPositions.size();
     const size_t nExtras      = _extraQuantities.size();
 
     size_t pointIndex = 0;
     for (size_t lineIndex = 0; lineIndex < nLines; ++lineIndex) {
         json jData = json::array();
-        for (size_t i = 0; i < _lineCount[lineIndex]; i++, ++pointIndex) {
+        for (GLsizei i = 0; i < _lineCount[lineIndex]; i++, ++pointIndex) {
             const glm::vec3 pos = _vertexPositions[pointIndex];
             json jDataElement = {pos.x, pos.y, pos.z};
 
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 50faa35468..81ae066664 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -231,7 +231,7 @@ void addExtraQuantities(ccmc::Kameleon* kameleon,
             std::make_unique<ccmc::KameleonInterpolator>(kameleon->model);
 
     // ------ Extract all the extraQuantities from kameleon and store in state! ------ //
-    for (const glm::vec3 p : state.vertexPositions()) {
+    for (const glm::vec3& p : state.vertexPositions()) {
         // Load the scalars!
         for (size_t i = 0; i < nXtraScalars; i++) {
             float val;
@@ -298,7 +298,7 @@ void prepareStateAndKameleonForExtras(ccmc::Kameleon* kameleon,
 
     // Load the existing SCALAR variables into kameleon.
     // Remove non-existing variables from vector
-    for (int i = 0; i < extraScalarVars.size(); ++i) {
+    for (int i = 0; i < static_cast<int>(extraScalarVars.size()); ++i) {
         std::string& str = extraScalarVars[i];
         bool success = kameleon->doesVariableExist(str) && kameleon->loadVariable(str);
         if (!success &&
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index 5f3b11139c..ae0e1fb401 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -85,7 +85,7 @@ void MilkywayConversionTask::perform(const Task::ProgressCallback& progressCallb
     using namespace openspace::volume;
 
     std::vector<std::string> filenames;
-    for (int i = 0; i < _inNSlices; i++) {
+    for (size_t i = 0; i < _inNSlices; i++) {
         filenames.push_back(
             _inFilenamePrefix + std::to_string(i + _inFirstIndex) + _inFilenameSuffix
         );
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index 412667d56e..c6900b915e 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -521,10 +521,10 @@ std::string GlobeBrowsingModule::layerGroupNamesList() {
     std::string listLayerGroups("");
     for (int i = 0; i < globebrowsing::layergroupid::NUM_LAYER_GROUPS - 1; ++i) {
         listLayerGroups +=
-            globebrowsing::layergroupid::LAYER_GROUP_NAMES[i] + std::string(", ");
+            globebrowsing::layergroupid::LAYER_GROUP_IDENTIFIERS[i] + std::string(", ");
     }
     listLayerGroups +=
-        std::string(" and ") + globebrowsing::layergroupid::LAYER_GROUP_NAMES[
+        std::string(" and ") + globebrowsing::layergroupid::LAYER_GROUP_IDENTIFIERS[
             globebrowsing::layergroupid::NUM_LAYER_GROUPS - 1];
     return listLayerGroups;
 }
diff --git a/modules/globebrowsing/globes/chunkedlodglobe.cpp b/modules/globebrowsing/globes/chunkedlodglobe.cpp
index 3803a7a988..6528d563fb 100644
--- a/modules/globebrowsing/globes/chunkedlodglobe.cpp
+++ b/modules/globebrowsing/globes/chunkedlodglobe.cpp
@@ -57,7 +57,7 @@ const GeodeticPatch ChunkedLodGlobe::COVERAGE = GeodeticPatch(0, 0, 90, 180);
 
 ChunkedLodGlobe::ChunkedLodGlobe(const RenderableGlobe& owner, size_t segmentsPerPatch,
                                  std::shared_ptr<LayerManager> layerManager)
-    : Renderable({ { "Name", owner.name() } })
+    : Renderable({ { "Identifier", owner.identifier() }, { "Name", owner.guiName() } })
     , minSplitDepth(2)
     , maxSplitDepth(22)
     , stats(StatsCollector(absPath("test_stats"), 1, StatsCollector::Enabled::No))
diff --git a/modules/globebrowsing/globes/pointglobe.cpp b/modules/globebrowsing/globes/pointglobe.cpp
index 74ba4ed7d0..cdfd6f73ab 100644
--- a/modules/globebrowsing/globes/pointglobe.cpp
+++ b/modules/globebrowsing/globes/pointglobe.cpp
@@ -51,7 +51,7 @@ namespace {
 namespace openspace::globebrowsing {
 
 PointGlobe::PointGlobe(const RenderableGlobe& owner)
-    : Renderable({ { "Name", owner.name() } })
+    : Renderable({ { "Identifier", owner.identifier() },  { "Name", owner.guiName() } })
     , _owner(owner)
     , _intensityClamp(IntensityClampInfo, 1.f, 0.f, 1.f)
     , _lightIntensity(LightIntensityInfo, 1.f, 0.f, 50.f)
diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp
index de951c7da5..a3f7e406f4 100644
--- a/modules/globebrowsing/globes/renderableglobe.cpp
+++ b/modules/globebrowsing/globes/renderableglobe.cpp
@@ -29,7 +29,6 @@
 #include <modules/globebrowsing/globes/pointglobe.h>
 #include <modules/globebrowsing/rendering/layer/layermanager.h>
 
-
 namespace {
     const char* keyFrame = "Frame";
     const char* keyRadii = "Radii";
@@ -199,7 +198,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     })
     , _debugPropertyOwner({ "Debug" })
 {
-    setName("RenderableGlobe");
+    setIdentifier("RenderableGlobe");
 
     dictionary.getValue(keyFrame, _frame);
 
@@ -220,6 +219,10 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     dictionary.getValue(keySegmentsPerPatch, patchSegmentsd);
     int patchSegments = static_cast<int>(patchSegmentsd);
 
+    if (dictionary.hasValue<bool>("PerformShading")) {
+        _generalProperties.performShading = dictionary.value<bool>("PerformShading");
+    }
+
     // Init layer manager
     ghoul::Dictionary layersDictionary;
     if (!dictionary.getValue(keyLayers, layersDictionary)) {
diff --git a/modules/globebrowsing/rendering/gpu/gpulayermanager.cpp b/modules/globebrowsing/rendering/gpu/gpulayermanager.cpp
index eef71124a8..ab2497822f 100644
--- a/modules/globebrowsing/rendering/gpu/gpulayermanager.cpp
+++ b/modules/globebrowsing/rendering/gpu/gpulayermanager.cpp
@@ -50,7 +50,7 @@ void GPULayerManager::bind(ghoul::opengl::ProgramObject* programObject,
     }
 
     for (size_t i = 0; i < layerGroups.size(); ++i) {
-        const std::string& nameBase = layergroupid::LAYER_GROUP_NAMES[i];
+        const std::string& nameBase = layergroupid::LAYER_GROUP_IDENTIFIERS[i];
         _gpuLayerGroups[i]->bind(
             programObject,
             *layerGroups[i],
diff --git a/modules/globebrowsing/rendering/layer/layer.cpp b/modules/globebrowsing/rendering/layer/layer.cpp
index e00b8df158..6c15ecd2b7 100644
--- a/modules/globebrowsing/rendering/layer/layer.cpp
+++ b/modules/globebrowsing/rendering/layer/layer.cpp
@@ -34,6 +34,7 @@ namespace openspace::globebrowsing {
 namespace {
     constexpr const char* _loggerCat = "Layer";
 
+    constexpr const char* keyIdentifier = "Identifier";
     constexpr const char* keyName = "Name";
     constexpr const char* keyDescription = "Description";
     constexpr const char* keyEnabled = "Enabled";
@@ -90,7 +91,8 @@ namespace {
 Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
              LayerGroup& parent)
     : properties::PropertyOwner({
-        layerDict.value<std::string>(keyName),
+        layerDict.value<std::string>(keyIdentifier),
+        layerDict.hasKey(keyName) ? layerDict.value<std::string>(keyName) : "",
         layerDict.hasKey(keyDescription) ?
             layerDict.value<std::string>(keyDescription) :
             ""
@@ -180,7 +182,7 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
             }
         }
         catch (...) {
-            _parent.deleteLayer(name());
+            _parent.deleteLayer(identifier());
             throw;
         }
     });
diff --git a/modules/globebrowsing/rendering/layer/layergroup.cpp b/modules/globebrowsing/rendering/layer/layergroup.cpp
index 25578eb278..578d5885b0 100644
--- a/modules/globebrowsing/rendering/layer/layergroup.cpp
+++ b/modules/globebrowsing/rendering/layer/layergroup.cpp
@@ -43,7 +43,10 @@ namespace {
 namespace openspace::globebrowsing {
 
 LayerGroup::LayerGroup(layergroupid::GroupID id)
-    : properties::PropertyOwner({ std::move(layergroupid::LAYER_GROUP_NAMES[id]) })
+    : properties::PropertyOwner({
+        layergroupid::LAYER_GROUP_IDENTIFIERS[id],
+        layergroupid::LAYER_GROUP_NAMES[id]
+    })
     , _groupId(id)
     , _levelBlendingEnabled(BlendTileInfo, true)
 {
@@ -104,14 +107,14 @@ void LayerGroup::update() {
 }
 
 std::shared_ptr<Layer> LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
-    if (!layerDict.hasKeyAndValue<std::string>("Name")) {
-        LERROR("'Name' must be specified for layer.");
+    if (!layerDict.hasKeyAndValue<std::string>("Identifier")) {
+        LERROR("'Identifier' must be specified for layer.");
         return nullptr;
     }
     auto layer = std::make_shared<Layer>(_groupId, layerDict, *this);
     layer->onChange(_onChangeCallback);
-    if (hasPropertySubOwner(layer->name())) {
-        LINFO("Layer with name " + layer->name() + " already exists.");
+    if (hasPropertySubOwner(layer->identifier())) {
+        LINFO("Layer with identifier " + layer->identifier() + " already exists.");
         _levelBlendingEnabled.setVisibility(properties::Property::Visibility::User);
         return nullptr;
     }
@@ -132,7 +135,7 @@ void LayerGroup::deleteLayer(const std::string& layerName) {
          it != _layers.end();
          ++it)
     {
-        if (it->get()->name() == layerName) {
+        if (it->get()->identifier() == layerName) {
             removePropertySubOwner(it->get());
             (*it)->deinitialize();
             _layers.erase(it);
diff --git a/modules/globebrowsing/rendering/layer/layergroupid.cpp b/modules/globebrowsing/rendering/layer/layergroupid.cpp
index 6951935f36..3776411018 100644
--- a/modules/globebrowsing/rendering/layer/layergroupid.cpp
+++ b/modules/globebrowsing/rendering/layer/layergroupid.cpp
@@ -37,7 +37,7 @@ TypeID getTypeIDFromTypeString(const std::string& typeString) {
 
 layergroupid::GroupID getGroupIDFromName(const std::string& layerGroupName) {
     for (int i = 0; i < layergroupid::NUM_LAYER_GROUPS; ++i) {
-        if (layerGroupName == layergroupid::LAYER_GROUP_NAMES[i]) {
+        if (layerGroupName == layergroupid::LAYER_GROUP_IDENTIFIERS[i]) {
             return static_cast<layergroupid::GroupID>(i);
         }
     }
diff --git a/modules/globebrowsing/rendering/layer/layergroupid.h b/modules/globebrowsing/rendering/layer/layergroupid.h
index 2308dfdebe..f851d85814 100644
--- a/modules/globebrowsing/rendering/layer/layergroupid.h
+++ b/modules/globebrowsing/rendering/layer/layergroupid.h
@@ -30,7 +30,7 @@
 namespace openspace::globebrowsing::layergroupid {
 
 static constexpr int NUM_LAYER_GROUPS = 5;
-static constexpr const char* LAYER_GROUP_NAMES[NUM_LAYER_GROUPS] = {
+static constexpr const char* LAYER_GROUP_IDENTIFIERS[NUM_LAYER_GROUPS] = {
     "HeightLayers",
     "ColorLayers",
     "Overlays",
@@ -38,6 +38,14 @@ static constexpr const char* LAYER_GROUP_NAMES[NUM_LAYER_GROUPS] = {
     "WaterMasks"
 };
 
+static constexpr const char* LAYER_GROUP_NAMES[NUM_LAYER_GROUPS] = {
+    "Height Layers",
+    "Color Layers",
+    "Overlays",
+    "Night Layers",
+    "Water Masks"
+};
+
 enum GroupID {
     HeightLayers,
     ColorLayers,
diff --git a/modules/globebrowsing/rendering/layershadermanager.cpp b/modules/globebrowsing/rendering/layershadermanager.cpp
index 538ed46fb8..753b38bb7d 100644
--- a/modules/globebrowsing/rendering/layershadermanager.cpp
+++ b/modules/globebrowsing/rendering/layershadermanager.cpp
@@ -166,7 +166,7 @@ void LayerShaderManager::recompileShaderProgram(
     for (size_t i = 0; i < textureTypes.size(); i++) {
         // lastLayerIndex must be at least 0 for the shader to compile,
         // the layer type is inactivated by setting use to false
-        std::string groupName = layergroupid::LAYER_GROUP_NAMES[i];
+        std::string groupName = layergroupid::LAYER_GROUP_IDENTIFIERS[i];
         shaderDictionary.setValue(
             "lastLayerIndex" + groupName,
             glm::max(textureTypes[i].lastLayerIdx, 0)
@@ -219,7 +219,7 @@ void LayerShaderManager::recompileShaderProgram(
 
     ghoul::Dictionary layerGroupNames;
     for (int i = 0; i < layergroupid::NUM_LAYER_GROUPS; ++i) {
-        layerGroupNames.setValue(std::to_string(i), layergroupid::LAYER_GROUP_NAMES[i]);
+        layerGroupNames.setValue(std::to_string(i), layergroupid::LAYER_GROUP_IDENTIFIERS[i]);
     }
     shaderDictionary.setValue("layerGroups", layerGroupNames);
 
diff --git a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
index 7d736e064b..a32980bcc4 100644
--- a/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
+++ b/modules/globebrowsing/tile/tileprovider/tileproviderbylevel.cpp
@@ -29,18 +29,15 @@
 #include <ghoul/logging/logmanager.h>
 
 namespace {
-    const char* KeyProviders = "LevelTileProviders";
-    const char* KeyMaxLevel = "MaxLevel";
-    const char* KeyTileProvider = "TileProvider";
-    const char* KeyLayerGroupID = "LayerGroupID";
+    constexpr const char* KeyProviders = "LevelTileProviders";
+    constexpr const char* KeyMaxLevel = "MaxLevel";
+    constexpr const char* KeyTileProvider = "TileProvider";
+    constexpr const char* KeyLayerGroupID = "LayerGroupID";
 } // namespace
 
 namespace openspace::globebrowsing::tileprovider {
 
 TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
-    std::string name = "Name unspecified";
-    dictionary.getValue("Name", name);
-
     layergroupid::GroupID layerGroupID;
     dictionary.getValue(KeyLayerGroupID, layerGroupID);
 
@@ -93,9 +90,14 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
             ))
         );
 
+        std::string providerIdentifier;
+        providerDict.getValue("Identifier", providerIdentifier);
+        _levelTileProviders.back()->setIdentifier(providerIdentifier);
+
         std::string providerName;
         providerDict.getValue("Name", providerName);
-        _levelTileProviders.back()->setName(providerName);
+        _levelTileProviders.back()->setGuiName(providerName);
+
         addPropertySubOwner(_levelTileProviders.back().get());
 
         // Ensure we can represent the max level
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 0a17c7da73..9d1dda9c23 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -69,7 +69,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
                         &(OsEng.windowWrapper()),
                         &(OsEng.navigationHandler()),
                         &(OsEng.renderEngine()),
-                        &(OsEng.parallelConnection()),
+                        &(OsEng.parallelPeer()),
                         &(OsEng.console()),
                         &(OsEng.dashboard())
                     };
@@ -79,9 +79,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
 
             gui._screenSpaceProperty.setSource(
                 []() {
-                   const std::vector<ScreenSpaceRenderable*>& ssr =
-                       OsEng.renderEngine().screenSpaceRenderables();
-                   return std::vector<properties::PropertyOwner*>(ssr.begin(), ssr.end());
+                    return OsEng.renderEngine().screenSpaceOwner().propertySubOwners();
                 }
             );
 
diff --git a/modules/imgui/include/guicomponent.h b/modules/imgui/include/guicomponent.h
index 5412450da4..e7547e5997 100644
--- a/modules/imgui/include/guicomponent.h
+++ b/modules/imgui/include/guicomponent.h
@@ -38,7 +38,7 @@ class GUI;
 class GuiComponent : public properties::PropertyOwner {
 public:
     /// Constructor that initializes this components member variables
-    GuiComponent(std::string name);
+    GuiComponent(std::string identifier, std::string guiName = "");
 
     /**
      * Returns if this component is enabled, that is, if it is currently active and
diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h
index f0a3b80772..5c8adaee73 100644
--- a/modules/imgui/include/guiparallelcomponent.h
+++ b/modules/imgui/include/guiparallelcomponent.h
@@ -38,6 +38,7 @@ public:
     void render() override;
 private:
     void renderDisconnected();
+    void renderConnecting();
     void renderClientWithHost();
     void renderClientWithoutHost();
     void renderClientCommon();
diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h
index 62ad4f06fe..8475dfad06 100644
--- a/modules/imgui/include/guipropertycomponent.h
+++ b/modules/imgui/include/guipropertycomponent.h
@@ -51,7 +51,8 @@ public:
     using UseTreeLayout = ghoul::Boolean;
 
 
-    GuiPropertyComponent(std::string name, UseTreeLayout useTree = UseTreeLayout::No);
+    GuiPropertyComponent(std::string identifier, std::string guiName = "",
+        UseTreeLayout useTree = UseTreeLayout::No);
 
     // This is the function that evaluates to the list of Propertyowners that this
     // component should render
@@ -66,7 +67,7 @@ protected:
     void renderPropertyOwner(properties::PropertyOwner* owner);
     void renderProperty(properties::Property* prop, properties::PropertyOwner* owner);
 
-    properties::Property::Visibility _visibility;
+    properties::Property::Visibility _visibility = properties::Property::Visibility::User;
 
     SourceFunction _function;
     /// This is set to \c true if all properties contained in this GUIPropertyComponent
@@ -76,6 +77,7 @@ protected:
 
     properties::BoolProperty _useTreeLayout;
     properties::StringListProperty _treeOrdering;
+    properties::BoolProperty _ignoreHiddenHint;
 };
 
 } // namespace openspace::gui
diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp
index 2d9c07ef40..0e1ec88796 100644
--- a/modules/imgui/src/gui.cpp
+++ b/modules/imgui/src/gui.cpp
@@ -219,7 +219,6 @@ static void RenderDrawLists(ImDrawData* drawData) {
     glDisable(GL_SCISSOR_TEST);
 }
 
-
 void addScreenSpaceRenderableLocal(std::string texturePath) {
     if (!FileSys.fileExists(absPath(texturePath))) {
         LWARNING(fmt::format("Could not find image '{}'", texturePath));
@@ -280,15 +279,19 @@ void CaptionText(const char* text) {
 
 GUI::GUI()
     : GuiComponent("Main")
-    , _globalProperty("Global Properties")
-    , _moduleProperty("Module Properties")
+    , _globalProperty("Global", "Global Properties")
     , _sceneProperty(
-        "Scene Properties",
+        "SceneProperties", "Scene Properties",
         GuiPropertyComponent::UseTreeLayout::Yes
     )
-    , _screenSpaceProperty("ScreenSpace Properties")
-    , _virtualProperty("Virtual Properties")
-    , _featuredProperties("Featured Properties", GuiPropertyComponent::UseTreeLayout::No)
+    , _screenSpaceProperty("ScreenSpaceProperties", "ScreenSpace Properties")
+    , _moduleProperty("ModuleProperties", "Module Properties")
+    , _virtualProperty("VirtualProperties", "Virtual Properties")
+    , _featuredProperties(
+        "FeaturedProperties",
+        "Featured Properties",
+        GuiPropertyComponent::UseTreeLayout::No
+    )
     , _showInternals(false)
     , _showHelpText(ShowHelpInfo, true)
     , _helpTextDelay(HelpTextDelayInfo, 1.0, 0.0, 10.0)
@@ -926,6 +929,7 @@ void GUI::render() {
         addImageBufferSize,
         ImGuiInputTextFlags_EnterReturnsTrue
     );
+
     if (addImageOnline) {
         addScreenSpaceRenderableOnline(std::string(addImageOnlineBuffer));
     }
@@ -948,6 +952,7 @@ void GUI::render() {
         );
     }
 
+#ifdef SHOW_IMGUI_HELPERS
     ImGui::Checkbox("ImGUI Internals", &_showInternals);
     if (_showInternals) {
         ImGui::Begin("Style Editor");
@@ -962,6 +967,7 @@ void GUI::render() {
         ImGui::ShowMetricsWindow();
         ImGui::End();
     }
+#endif
 
     ImGui::End();
 }
diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp
index c468d84ff1..69c116023f 100644
--- a/modules/imgui/src/guicomponent.cpp
+++ b/modules/imgui/src/guicomponent.cpp
@@ -40,8 +40,8 @@ namespace {
 
 namespace openspace::gui {
 
-GuiComponent::GuiComponent(std::string name)
-    : properties::PropertyOwner({ std::move(name) })
+GuiComponent::GuiComponent(std::string identifier, std::string guiName)
+    : properties::PropertyOwner({ std::move(identifier), std::move(guiName) })
     , _isEnabled(EnabledInfo, false)
     , _isCollapsed(CollapsedInfo, false)
 {
diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp
index 87267ae31f..a2369e4891 100644
--- a/modules/imgui/src/guifilepathcomponent.cpp
+++ b/modules/imgui/src/guifilepathcomponent.cpp
@@ -31,7 +31,7 @@
 namespace openspace::gui {
 
 GuiFilePathComponent::GuiFilePathComponent()
-    : GuiComponent("File Path")
+    : GuiComponent("FilePath", "File Path")
 {}
 
 void GuiFilePathComponent::render() {
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index 27bdbdfe25..988435433a 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -53,7 +53,7 @@ namespace {
 namespace openspace::gui {
 
 GuiGlobeBrowsingComponent::GuiGlobeBrowsingComponent()
-    : GuiPropertyComponent("GlobeBrowsing")
+    : GuiPropertyComponent("GlobeBrowsing", "Globe Browsing")
 {}
 
 void GuiGlobeBrowsingComponent::render() {
@@ -80,7 +80,8 @@ void GuiGlobeBrowsingComponent::render() {
             nodes.begin(),
             nodes.end(),
             [](SceneGraphNode* n) {
-                return !(n->renderable() && n->renderable()->name() == "RenderableGlobe");
+                return !(n->renderable() &&
+                         n->renderable()->identifier() == "RenderableGlobe");
             }
         ),
         nodes.end()
@@ -88,11 +89,13 @@ void GuiGlobeBrowsingComponent::render() {
     std::sort(
         nodes.begin(),
         nodes.end(),
-        [](SceneGraphNode* lhs, SceneGraphNode* rhs) { return lhs->name() < rhs->name(); }
+        [](SceneGraphNode* lhs, SceneGraphNode* rhs) {
+            return lhs->guiName() < rhs->guiName();
+        }
     );
     std::string nodeNames;
     for (SceneGraphNode* n : nodes) {
-        nodeNames += n->name() + '\0';
+        nodeNames += n->identifier() + '\0';
     }
 
     int iNode = -1;
@@ -104,7 +107,7 @@ void GuiGlobeBrowsingComponent::render() {
         const SceneGraphNode* const focus = OsEng.navigationHandler().focusNode();
         auto it = std::find(nodes.cbegin(), nodes.cend(), focus);
         if (it != nodes.end()) {
-            _currentNode = focus->name();
+            _currentNode = focus->identifier();
             iNode = static_cast<int>(std::distance(nodes.cbegin(), it));
         }
     }
@@ -113,7 +116,7 @@ void GuiGlobeBrowsingComponent::render() {
             nodes.cbegin(),
             nodes.cend(),
             [this](SceneGraphNode* lhs) {
-                return lhs->name() == _currentNode;
+                return lhs->identifier() == _currentNode;
             }
         );
         iNode = static_cast<int>(std::distance(nodes.cbegin(), it));
@@ -127,7 +130,7 @@ void GuiGlobeBrowsingComponent::render() {
         const SceneGraphNode* const focus = OsEng.navigationHandler().focusNode();
         auto it = std::find(nodes.cbegin(), nodes.cend(), focus);
         if (it != nodes.end()) {
-            _currentNode = focus->name();
+            _currentNode = focus->identifier();
             iNode = static_cast<int>(std::distance(nodes.cbegin(), it));
             nodeChanged = true;
         }
@@ -138,7 +141,7 @@ void GuiGlobeBrowsingComponent::render() {
         // or if there are no nodes
         return;
     }
-    _currentNode = nodes[iNode]->name();
+    _currentNode = nodes[iNode]->identifier();
 
     if (nodeChanged) {
         _currentServer = "";
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index 64d3f8c7ca..3db84dd342 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -95,12 +95,14 @@ namespace {
 
 namespace openspace::gui {
 
-GuiMissionComponent::GuiMissionComponent() : GuiComponent("Mission Information") {}
+GuiMissionComponent::GuiMissionComponent() :
+    GuiComponent("Missions", "Mission Information")
+{}
 
 void GuiMissionComponent::render() {
     ImGui::SetNextWindowCollapsed(_isCollapsed);
     bool v = _isEnabled;
-    ImGui::Begin(name().c_str(), &v, Size, 0.75f);
+    ImGui::Begin(guiName().c_str(), &v, Size, 0.75f);
     _isEnabled = v;
 
     _isCollapsed = ImGui::IsWindowCollapsed();
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index 01fca59684..505476000a 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -29,7 +29,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/interaction/navigationhandler.h>
-#include <openspace/network/parallelconnection.h>
+#include <openspace/network/parallelpeer.h>
 #include <openspace/network/messagestructures.h>
 
 #include <ghoul/fmt.h>
@@ -40,7 +40,7 @@
 namespace openspace::gui {
 
 GuiParallelComponent::GuiParallelComponent()
-    : GuiPropertyComponent("GuiParallelComponent")
+    : GuiPropertyComponent("Parallel", "Parallel Connection")
 {
     setVisibility(properties::Property::Visibility::All);
 }
@@ -51,12 +51,22 @@ void GuiParallelComponent::renderDisconnected() {
     const bool connect = ImGui::Button("Connect");
 
     if (connect) {
-        OsEng.parallelConnection().clientConnect();
+        OsEng.parallelPeer().connect();
+    }
+}
+
+void GuiParallelComponent::renderConnecting() {
+    ImGui::Text("Connecting...");
+
+    const bool cancel = ImGui::Button("Cancel connection");
+
+    if (cancel) {
+        OsEng.parallelPeer().disconnect();
     }
 }
 
 void GuiParallelComponent::renderClientWithHost() {
-    ParallelConnection& parallel = OsEng.parallelConnection();
+    ParallelPeer& parallel = OsEng.parallelPeer();
 
     std::string connectionInfo = "Session hosted by \"" + parallel.hostName() + "\"\n";
     size_t nConnections = parallel.nConnections();
@@ -98,7 +108,7 @@ void GuiParallelComponent::renderClientWithHost() {
 }
 
 void GuiParallelComponent::renderClientWithoutHost() {
-    ParallelConnection& parallel = OsEng.parallelConnection();
+    ParallelPeer& parallel = OsEng.parallelPeer();
 
     std::string connectionInfo = "Connected to parallel session with no host\n";
     size_t nConnections = parallel.nConnections();
@@ -122,7 +132,7 @@ void GuiParallelComponent::renderClientWithoutHost() {
 }
 
 void GuiParallelComponent::renderClientCommon() {
-    ParallelConnection& parallel = OsEng.parallelConnection();
+    ParallelPeer& parallel = OsEng.parallelPeer();
 
     bool requestHostship = ImGui::Button("Request hostship");
     const bool disconnect = ImGui::Button("Disconnect");
@@ -132,12 +142,12 @@ void GuiParallelComponent::renderClientCommon() {
     }
 
     if (disconnect) {
-        parallel.signalDisconnect();
+        parallel.disconnect();
     }
 }
 
 void GuiParallelComponent::renderHost() {
-    ParallelConnection& parallel = OsEng.parallelConnection();
+    ParallelPeer& parallel = OsEng.parallelPeer();
     size_t nConnections = parallel.nConnections();
 
     std::string connectionInfo = "";
@@ -165,12 +175,15 @@ void GuiParallelComponent::render() {
     _isEnabled = v;
     _isCollapsed = ImGui::IsWindowCollapsed();
 
-    ParallelConnection::Status status = OsEng.parallelConnection().status();
+    ParallelConnection::Status status = OsEng.parallelPeer().status();
 
     switch (status) {
     case ParallelConnection::Status::Disconnected:
         renderDisconnected();
         break;
+    case ParallelConnection::Status::Connecting:
+        renderConnecting();
+        break;
     case ParallelConnection::Status::ClientWithHost:
         renderClientWithHost();
         break;
@@ -182,7 +195,7 @@ void GuiParallelComponent::render() {
         break;
     }
 
-    GuiPropertyComponent::renderPropertyOwner(&OsEng.parallelConnection());
+    GuiPropertyComponent::renderPropertyOwner(&OsEng.parallelPeer());
     ImGui::End();
 }
 
diff --git a/modules/imgui/src/guiperformancecomponent.cpp b/modules/imgui/src/guiperformancecomponent.cpp
index e954958bf1..10b4f4f348 100644
--- a/modules/imgui/src/guiperformancecomponent.cpp
+++ b/modules/imgui/src/guiperformancecomponent.cpp
@@ -80,7 +80,7 @@ namespace {
 namespace openspace::gui {
 
 GuiPerformanceComponent::GuiPerformanceComponent()
-    : GuiComponent("PerformanceComponent")
+    : GuiComponent("PerformanceComponent", "Performance Component")
     , _sortingSelection(SortingSelectionInfo, -1, -1, 6)
     , _sceneGraphIsEnabled(SceneGraphEnabledInfo, false)
     , _functionsIsEnabled(FunctionsEnabledInfo, false)
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 1669b9f84a..1656a3a263 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -53,6 +53,14 @@ namespace {
         "elements not listed."
     };
 
+    static const openspace::properties::Property::PropertyInfo IgnoreHiddenInfo = {
+        "IgnoreHidden",
+        "Ignore Hidden Hint",
+        "If this value is 'true', all 'Hidden' hints passed into the SceneGraphNodes are "
+        "ignored and thus all SceneGraphNodes are displayed. If this value is 'false', "
+        "the hidden hints are followed."
+    };
+
     int nVisibleProperties(const std::vector<openspace::properties::Property*>& props,
         openspace::properties::Property::Visibility visibility)
     {
@@ -98,8 +106,8 @@ namespace {
             node.children.begin(),
             node.children.end(),
             [p = *path.begin()](const std::unique_ptr<TreeNode>& c) {
-            return c.get()->path == p;
-        }
+                return c.get()->path == p;
+            }
         );
 
         TreeNode* n;
@@ -112,7 +120,6 @@ namespace {
             std::unique_ptr<TreeNode> newNode = std::make_unique<TreeNode>(*path.begin());
             n = newNode.get();
             node.children.push_back(std::move(newNode));
-
         }
 
         // Recurse into the tree and chop off the first path
@@ -162,13 +169,16 @@ namespace {
 
 namespace openspace::gui {
 
-GuiPropertyComponent::GuiPropertyComponent(std::string name, UseTreeLayout useTree)
-    : GuiComponent(std::move(name))
+GuiPropertyComponent::GuiPropertyComponent(std::string identifier, std::string guiName,
+                                           UseTreeLayout useTree)
+    : GuiComponent(std::move(identifier), std::move(guiName))
     , _useTreeLayout(UseTreeInfo, useTree)
     , _treeOrdering(OrderingInfo)
+    , _ignoreHiddenHint(IgnoreHiddenInfo)
 {
     addProperty(_useTreeLayout);
     addProperty(_treeOrdering);
+    addProperty(_ignoreHiddenHint);
 }
 
 void GuiPropertyComponent::setSource(SourceFunction function) {
@@ -189,7 +199,7 @@ void GuiPropertyComponent::renderPropertyOwner(properties::PropertyOwner* owner)
     }
 
     int nThisProperty = nVisibleProperties(owner->properties(), _visibility);
-    ImGui::PushID(owner->name().c_str());
+    ImGui::PushID(owner->identifier().c_str());
     const auto& subOwners = owner->propertySubOwners();
     for (properties::PropertyOwner* subOwner : subOwners) {
         std::vector<properties::Property*> properties = subOwner->propertiesRecursive();
@@ -201,7 +211,7 @@ void GuiPropertyComponent::renderPropertyOwner(properties::PropertyOwner* owner)
             renderPropertyOwner(subOwner);
         }
         else {
-            bool opened = ImGui::TreeNode(subOwner->name().c_str());
+            bool opened = ImGui::TreeNode(subOwner->guiName().c_str());
             renderTooltip(subOwner);
             if (opened) {
                 renderPropertyOwner(subOwner);
@@ -252,7 +262,7 @@ void GuiPropertyComponent::render() {
     ImGui::SetNextWindowCollapsed(_isCollapsed);
 
     bool v = _isEnabled;
-    ImGui::Begin(name().c_str(), &v, Size, 0.75f);
+    ImGui::Begin(guiName().c_str(), &v, Size, 0.75f);
     _isEnabled = v;
 
     _isCollapsed = ImGui::IsWindowCollapsed();
@@ -265,7 +275,7 @@ void GuiPropertyComponent::render() {
             owners.begin(),
             owners.end(),
             [](properties::PropertyOwner* lhs, properties::PropertyOwner* rhs) {
-                return lhs->name() < rhs->name();
+                return lhs->guiName() < rhs->guiName();
             }
         );
 
@@ -358,11 +368,11 @@ void GuiPropertyComponent::render() {
             auto header = [&]() -> bool {
                 if (owners.size() > 1) {
                     // Create a header in case we have multiple owners
-                    return ImGui::CollapsingHeader(pOwner->name().c_str());
+                    return ImGui::CollapsingHeader(pOwner->guiName().c_str());
                 }
-                else if (!pOwner->name().empty()) {
+                else if (!pOwner->identifier().empty()) {
                     // If the owner has a name, print it first
-                    ImGui::Text("%s", pOwner->name().c_str());
+                    ImGui::Text("%s", pOwner->guiName().c_str());
                     ImGui::Spacing();
                     return true;
                 }
@@ -378,6 +388,25 @@ void GuiPropertyComponent::render() {
         };
 
         if (!_useTreeLayout || noGuiGroups) {
+            if (!_ignoreHiddenHint) {
+                // Remove all of the nodes that we want hidden first
+                owners.erase(
+                    std::remove_if(
+                        owners.begin(),
+                        owners.end(),
+                        [](properties::PropertyOwner* p) {
+                    SceneGraphNode* s = dynamic_cast<SceneGraphNode*>(p);
+                    if (s && s->hasGuiHintHidden()) {
+                        return true;
+                    }
+                    else {
+                        return false;
+                    }
+                }
+                    ),
+                    owners.end()
+                    );
+            }
             std::for_each(owners.begin(), owners.end(), renderProp);
         }
         else { // _useTreeLayout && gui groups exist
@@ -386,6 +415,9 @@ void GuiPropertyComponent::render() {
             for (properties::PropertyOwner* pOwner : owners) {
                 // We checked above that pOwner is a SceneGraphNode
                 SceneGraphNode* nOwner = static_cast<SceneGraphNode*>(pOwner);
+                if (!_ignoreHiddenHint && nOwner->hasGuiHintHidden()) {
+                    continue;
+                }
 
                 if (nOwner->guiPath().empty()) {
                     // We know that we are done now since we stable_sort:ed them above
@@ -463,7 +495,7 @@ void GuiPropertyComponent::renderProperty(properties::Property* prop,
             if (owner) {
                 it->second(
                     prop,
-                    owner->name(),
+                    owner->identifier(),
                     IsRegularProperty(_hasOnlyRegularProperties),
                     ShowToolTip(_showHelpTooltip),
                     _tooltipDelay
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 41f5104e52..a0a05bab04 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -76,7 +76,7 @@ namespace {
 namespace openspace::gui {
 
 GuiSpaceTimeComponent::GuiSpaceTimeComponent()
-    : GuiComponent("Space/Time")
+    : GuiComponent("SpaceTime", "Space/Time")
     , _deltaTime(0.f)
     , _deltaTimeUnit(static_cast<int>(TimeUnit::Second))
     , _accelerationDelta(0.f)
@@ -95,7 +95,7 @@ GuiSpaceTimeComponent::GuiSpaceTimeComponent()
 void GuiSpaceTimeComponent::render() {
     ImGui::SetNextWindowCollapsed(_isCollapsed);
     bool v = _isEnabled;
-    ImGui::Begin(name().c_str(), &v, Size, 0.5f, ImGuiWindowFlags_AlwaysAutoResize);
+    ImGui::Begin(guiName().c_str(), &v, Size, 0.5f, ImGuiWindowFlags_AlwaysAutoResize);
     _isEnabled = v;
     _isCollapsed = ImGui::IsWindowCollapsed();
 
@@ -106,7 +106,7 @@ void GuiSpaceTimeComponent::render() {
         nodes.begin(),
         nodes.end(),
         [](SceneGraphNode* lhs, SceneGraphNode* rhs) {
-            return lhs->name() < rhs->name();
+            return lhs->guiName() < rhs->guiName();
         }
     );
 
@@ -119,12 +119,12 @@ void GuiSpaceTimeComponent::render() {
         const std::vector<std::string>& tags = n->tags();
         auto it = std::find(tags.begin(), tags.end(), "GUI.Interesting");
         if (it != tags.end()) {
-            bool pressed = ImGui::Button(n->name().c_str());
+            bool pressed = ImGui::Button(n->guiName().c_str());
             ImGui::SameLine();
             if (pressed) {
                 OsEng.scriptEngine().queueScript(
                     "openspace.setPropertyValue('NavigationHandler.Origin', '" +
-                    n->name() + "');",
+                    n->identifier() + "');",
                     scripting::ScriptEngine::RemoteScripting::Yes
                 );
             }
@@ -138,7 +138,7 @@ void GuiSpaceTimeComponent::render() {
 
     std::string nodeNames = "";
     for (SceneGraphNode* n : nodes) {
-        nodeNames += n->name() + '\0';
+        nodeNames += n->identifier() + '\0';
     }
 
     auto iCurrentFocus = std::find(nodes.begin(), nodes.end(), currentFocus);
@@ -153,7 +153,7 @@ void GuiSpaceTimeComponent::render() {
     if (hasChanged) {
         OsEng.scriptEngine().queueScript(
             "openspace.setPropertyValue('NavigationHandler.Origin', '" +
-            nodes[currentPosition]->name() + "');",
+            nodes[currentPosition]->identifier() + "');",
             scripting::ScriptEngine::RemoteScripting::Yes
         );
     }
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index 696a38649a..5a0ec6ceee 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -106,13 +106,14 @@ DataCygnet::DataCygnet(const ghoul::Dictionary& dictionary)
     registerProperties();
 }
 
-DataCygnet::~DataCygnet(){}
+DataCygnet::~DataCygnet() {}
 
-bool DataCygnet::updateTexture(){
+bool DataCygnet::updateTexture() {
     std::vector<float*> data = textureData();
 
-    if(data.empty())
+    if (data.empty()) {
         return false;
+    }
 
     bool texturesReady = false;
     std::vector<int> selectedOptions = _dataOptions.value();
@@ -148,16 +149,17 @@ bool DataCygnet::updateTexture(){
     return texturesReady;
 }
 
-bool DataCygnet::downloadTextureResource(double timestamp){
-    if(_futureObject.valid())
+bool DataCygnet::downloadTextureResource(double timestamp) {
+    if (_futureObject.valid()) {
         return false;
+    }
 
     std::future<DownloadManager::MemoryFile> future = IswaManager::ref().fetchDataCygnet(
         _data->id,
         timestamp
     );
 
-    if(future.valid()){
+    if (future.valid()) {
         _futureObject = std::move(future);
         return true;
     }
@@ -168,8 +170,9 @@ bool DataCygnet::downloadTextureResource(double timestamp){
 bool DataCygnet::updateTextureResource(){
     DownloadManager::MemoryFile dataFile = _futureObject.get();
 
-     if(dataFile.corrupted)
+     if (dataFile.corrupted) {
         return false;
+    }
 
     _dataBuffer = std::string(dataFile.buffer, dataFile.size);
     delete[] dataFile.buffer;
@@ -197,8 +200,8 @@ void DataCygnet::setTextureUniforms(){
     // Set Textures
     ghoul::opengl::TextureUnit txUnits[MAX_TEXTURES];
     int j = 0;
-    for(int option : selectedOptions){
-        if(_textures[option]){
+    for (int option : selectedOptions) {
+        if (_textures[option]) {
             txUnits[j].activate();
             _textures[option]->bind();
             _shader->setUniform(
@@ -207,7 +210,9 @@ void DataCygnet::setTextureUniforms(){
             );
 
             j++;
-            if(j >= MAX_TEXTURES) break;
+            if (j >= MAX_TEXTURES) {
+                break;
+            }
         }
     }
 
@@ -220,17 +225,16 @@ void DataCygnet::setTextureUniforms(){
     ghoul::opengl::TextureUnit tfUnits[MAX_TEXTURES];
     j = 0;
 
-    if((activeTransferfunctions == 1)){
+    if (activeTransferfunctions == 1) {
         tfUnits[0].activate();
         _transferFunctions[0]->bind();
         _shader->setUniform(
             "transferFunctions[0]",
             tfUnits[0]
         );
-    }else{
-        for(int option : selectedOptions){
-
-            if(_transferFunctions[option]){
+    } else {
+        for (int option : selectedOptions) {
+            if (_transferFunctions[option]) {
                 tfUnits[j].activate();
                 _transferFunctions[option]->bind();
                 _shader->setUniform(
@@ -248,7 +252,6 @@ void DataCygnet::setTextureUniforms(){
     _shader->setUniform("numTextures", activeTextures);
 }
 
-
 void DataCygnet::readTransferFunctions(std::string tfPath){
     std::string line;
     std::ifstream tfFile(absPath(tfPath));
@@ -280,7 +283,7 @@ void DataCygnet::fillOptions(std::string& source) {
         _textureDimensions
     );
 
-    for (int i = 0; i < options.size(); i++) {
+    for (int i = 0; i < static_cast<int>(options.size()); i++) {
         _dataOptions.addOption({i, options[i]});
         _textures.push_back(nullptr);
     }
@@ -297,93 +300,126 @@ void DataCygnet::fillOptions(std::string& source) {
     }
 }
 
-void DataCygnet::setPropertyCallbacks(){
-    _normValues.onChange([this](){
+void DataCygnet::setPropertyCallbacks() {
+    _normValues.onChange([this]() {
         _dataProcessor->normValues(_normValues.value());
         updateTexture();
     });
 
-    _useLog.onChange([this](){
+    _useLog.onChange([this]() {
         _dataProcessor->useLog(_useLog.value());
         updateTexture();
     });
 
-    _useHistogram.onChange([this](){
+    _useHistogram.onChange([this]() {
         _dataProcessor->useHistogram(_useHistogram.value());
         updateTexture();
-        if(_autoFilter.value())
+        if (_autoFilter.value()) {
             _backgroundValues.setValue(_dataProcessor->filterValues());
+        }
     });
 
-    _dataOptions.onChange([this](){
-        if(_dataOptions.value().size() > MAX_TEXTURES)
+    _dataOptions.onChange([this]() {
+        if (_dataOptions.value().size() > MAX_TEXTURES) {
             LWARNING("Too many options chosen, max is " + std::to_string(MAX_TEXTURES));
+        }
         updateTexture();
     });
 
-    _transferFunctionsFile.onChange([this](){
+    _transferFunctionsFile.onChange([this]() {
         readTransferFunctions(_transferFunctionsFile.value());
     });
 }
 
-void DataCygnet::subscribeToGroup(){
+void DataCygnet::subscribeToGroup() {
     auto groupEvent = _group->groupEvent();
 
-    groupEvent->subscribe(name(), "dataOptionsChanged", [&](ghoul::Dictionary dict){
-        LDEBUG(name() + " Event dataOptionsChanged");
-        std::vector<int> values;
-        bool success = dict.getValue<std::vector<int> >("dataOptions", values);
-        if(success){
-            _dataOptions.setValue(values);
+    groupEvent->subscribe(
+        identifier(),
+        "dataOptionsChanged",
+        [&](ghoul::Dictionary dict) {
+            LDEBUG(identifier() + " Event dataOptionsChanged");
+            std::vector<int> values;
+            bool success = dict.getValue<std::vector<int> >("dataOptions", values);
+            if (success) {
+                _dataOptions.setValue(values);
+            }
         }
-    });
+    );
 
-    groupEvent->subscribe(name(), "normValuesChanged", [&](ghoul::Dictionary dict){
-        LDEBUG(name() + " Event normValuesChanged");
-        glm::vec2 values;
-        bool success = dict.getValue("normValues", values);
-        if(success){
-            _normValues.setValue(values);
+    groupEvent->subscribe(
+        identifier(),
+        "normValuesChanged",
+        [&](ghoul::Dictionary dict) {
+            LDEBUG(identifier() + " Event normValuesChanged");
+            glm::vec2 values;
+            bool success = dict.getValue("normValues", values);
+            if (success) {
+                _normValues.setValue(values);
+            }
         }
-    });
+    );
 
-    groupEvent->subscribe(name(), "backgroundValuesChanged", [&](ghoul::Dictionary dict) {
-        LDEBUG(name() + " Event backgroundValuesChanged");
-        glm::vec2 values;
-        bool success = dict.getValue("backgroundValues", values);
-        if(success){
-            _backgroundValues.setValue(values);
+    groupEvent->subscribe(
+        identifier(),
+        "backgroundValuesChanged",
+        [&](ghoul::Dictionary dict) {
+            LDEBUG(identifier() + " Event backgroundValuesChanged");
+            glm::vec2 values;
+            bool success = dict.getValue("backgroundValues", values);
+            if (success) {
+                _backgroundValues.setValue(values);
+            }
         }
-    });
+    );
 
-    groupEvent->subscribe(name(), "transferFunctionsChanged", [&](ghoul::Dictionary dict)
-    {
-        LDEBUG(name() + " Event transferFunctionsChanged");
-        _transferFunctionsFile.setValue(dict.value<std::string>("transferFunctions"));
-    });
+    groupEvent->subscribe(
+        identifier(),
+        "transferFunctionsChanged",
+        [&](ghoul::Dictionary dict) {
+            LDEBUG(identifier() + " Event transferFunctionsChanged");
+            _transferFunctionsFile.setValue(dict.value<std::string>("transferFunctions"));
+        }
+    );
 
-    groupEvent->subscribe(name(), "useLogChanged", [&](const ghoul::Dictionary& dict) {
-        LDEBUG(name() + " Event useLogChanged");
-        _useLog.setValue(dict.value<bool>("useLog"));
-    });
+    groupEvent->subscribe(
+        identifier(),
+        "useLogChanged",
+        [&](const ghoul::Dictionary& dict) {
+            LDEBUG(identifier() + " Event useLogChanged");
+            _useLog.setValue(dict.value<bool>("useLog"));
+        }
+    );
 
-    groupEvent->subscribe(name(), "useHistogramChanged", [&](ghoul::Dictionary dict) {
-        LDEBUG(name() + " Event useHistogramChanged");
-        _useHistogram.setValue(dict.value<bool>("useHistogram"));
-    });
+    groupEvent->subscribe(
+        identifier(),
+        "useHistogramChanged",
+        [&](ghoul::Dictionary dict) {
+            LDEBUG(identifier() + " Event useHistogramChanged");
+            _useHistogram.setValue(dict.value<bool>("useHistogram"));
+        }
+    );
 
-    groupEvent->subscribe(name(), "autoFilterChanged", [&](ghoul::Dictionary dict) {
-        LDEBUG(name() + " Event autoFilterChanged");
-        _autoFilter.setValue(dict.value<bool>("autoFilter"));
-    });
-
-    groupEvent->subscribe(name(), "updateGroup", [&](ghoul::Dictionary dict) {
-        LDEBUG(name() + " Event updateGroup");
-        if(_autoFilter.value())
-            _backgroundValues.setValue(_dataProcessor->filterValues());
-        updateTexture();
-    });
+    groupEvent->subscribe(
+        identifier(),
+        "autoFilterChanged",
+        [&](ghoul::Dictionary dict) {
+            LDEBUG(identifier() + " Event autoFilterChanged");
+            _autoFilter.setValue(dict.value<bool>("autoFilter"));
+        }
+    );
 
+    groupEvent->subscribe(
+        identifier(),
+        "updateGroup",
+        [&](ghoul::Dictionary) {
+            LDEBUG(identifier() + " Event updateGroup");
+            if (_autoFilter.value()) {
+                _backgroundValues.setValue(_dataProcessor->filterValues());
+            }
+            updateTexture();
+        }
+    );
 }
 
 } //namespace openspace
diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index 85e10128d4..0cdd0f53c9 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -178,7 +178,7 @@ std::vector<float*> DataPlane::textureData(){
     std::chrono::duration<double> elapsed_seconds = end-start;
     _avgBenchmarkTime = ((_avgBenchmarkTime * (_numOfBenchmarks - 1))
                          + elapsed_seconds.count()) / _numOfBenchmarks;
-    std::cout << " processData() " << name() << std::endl;
+    std::cout << " processData() " << identifier() << std::endl;
     std::cout << "avg elapsed time: " << _avgBenchmarkTime << "s\n";
     std::cout << "num Benchmarks: " << _numOfBenchmarks << "\n";
     // ===========
diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp
index 8b7f3a91f3..6aa0d1e378 100644
--- a/modules/iswa/rendering/datasphere.cpp
+++ b/modules/iswa/rendering/datasphere.cpp
@@ -33,10 +33,6 @@
 #include <math.h>
 #endif
 
-namespace {
-    constexpr const char* _loggerCat = "DataSphere";
-} // namespace
-
 namespace openspace {
 
 DataSphere::DataSphere(const ghoul::Dictionary& dictionary)
@@ -58,7 +54,11 @@ void DataSphere::initialize() {
     IswaCygnet::initialize();
 
     //rotate 90 degrees because of the texture coordinates in PowerScaledSphere
-    _rotation = glm::rotate(_rotation, (float)M_PI_2, glm::vec3(1.0, 0.0, 0.0));
+    _rotation = glm::rotate(
+        _rotation,
+        static_cast<float>(M_PI_2),
+        glm::vec3(1.0, 0.0, 0.0)
+    );
 
     if (_group) {
         _dataProcessor = _group->dataProcessor();
diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp
index cfa763871c..7c55f3f374 100644
--- a/modules/iswa/rendering/iswabasegroup.cpp
+++ b/modules/iswa/rendering/iswabasegroup.cpp
@@ -85,14 +85,14 @@ bool IswaBaseGroup::isType(std::string type){
 }
 
 void IswaBaseGroup::updateGroup(){
-    LDEBUG("Group " + name() + " published updateGroup");
+    LDEBUG("Group " + identifier() + " published updateGroup");
     _groupEvent->publish("updateGroup", ghoul::Dictionary());
 
 }
 
 void IswaBaseGroup::clearGroup(){
     _groupEvent->publish("clearGroup", ghoul::Dictionary());
-    LDEBUG("Group " + name() + " published clearGroup");
+    LDEBUG("Group " + identifier() + " published clearGroup");
     unregisterProperties();
 }
 
@@ -106,7 +106,7 @@ std::shared_ptr<ghoul::Event<ghoul::Dictionary> > IswaBaseGroup::groupEvent() {
 
 void IswaBaseGroup::registerProperties(){
     _enabled.onChange([this]{
-        LDEBUG("Group " + name() + " published enabledChanged");
+        LDEBUG("Group " + identifier() + " published enabledChanged");
         _groupEvent->publish(
             "enabledChanged",
             ghoul::Dictionary({{"enabled", _enabled.value()}})
@@ -114,7 +114,7 @@ void IswaBaseGroup::registerProperties(){
     });
 
     _alpha.onChange([this]{
-        LDEBUG("Group " + name() + " published alphaChanged");
+        LDEBUG("Group " + identifier() + " published alphaChanged");
         _groupEvent->publish(
             "alphaChanged",
             ghoul::Dictionary({{"alpha", _alpha.value()}})
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 8aed4c1d4c..f0d76ae17a 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -53,16 +53,17 @@ namespace openspace {
 
 IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _delete(DeleteInfo)
     , _alpha(AlphaInfo, 0.9f, 0.f, 1.f)
+    , _delete(DeleteInfo)
     , _shader(nullptr)
     , _group(nullptr)
     , _textureDirty(false)
     , _rotation(glm::mat4(1.0f))
 {
+    // This changed from setIdentifier to setGuiName, 2018-03-14 ---abock
     std::string name;
     dictionary.getValue("Name", name);
-    setName(name);
+    setGuiName(name);
 
     _data = std::make_shared<Metadata>();
 
@@ -124,7 +125,7 @@ void IswaCygnet::initialize() {
         _delete.onChange([this]() {
             deinitialize();
             OsEng.scriptEngine().queueScript(
-                "openspace.removeSceneGraphNode('" + name() + "')",
+                "openspace.removeSceneGraphNode('" + identifier() + "')",
                 scripting::ScriptEngine::RemoteScripting::Yes
             );
         });
@@ -138,7 +139,7 @@ void IswaCygnet::initialize() {
 
 void IswaCygnet::deinitialize() {
     if (!_data->groupName.empty()) {
-        _group->groupEvent()->unsubscribe(name());
+        _group->groupEvent()->unsubscribe(identifier());
     }
 
     unregisterProperties();
@@ -282,20 +283,28 @@ void IswaCygnet::initializeGroup() {
 
     //Subscribe to enable and delete property
     auto groupEvent = _group->groupEvent();
-    groupEvent->subscribe(name(), "enabledChanged", [&](const ghoul::Dictionary& dict) {
-        LDEBUG(name() + " Event enabledChanged");
-        _enabled.setValue(dict.value<bool>("enabled"));
-    });
+    groupEvent->subscribe(
+        identifier(),
+        "enabledChanged",
+        [&](const ghoul::Dictionary& dict) {
+            LDEBUG(identifier() + " Event enabledChanged");
+            _enabled.setValue(dict.value<bool>("enabled"));
+        }
+    );
 
-    groupEvent->subscribe(name(), "alphaChanged", [&](const ghoul::Dictionary& dict) {
-        LDEBUG(name() + " Event alphaChanged");
-        _alpha.setValue(dict.value<float>("alpha"));
-    });
+    groupEvent->subscribe(
+        identifier(),
+        "alphaChanged",
+        [&](const ghoul::Dictionary& dict) {
+            LDEBUG(identifier() + " Event alphaChanged");
+            _alpha.setValue(dict.value<float>("alpha"));
+        }
+    );
 
-    groupEvent->subscribe(name(), "clearGroup", [&](ghoul::Dictionary){
-        LDEBUG(name() + " Event clearGroup");
+    groupEvent->subscribe(identifier(), "clearGroup", [&](ghoul::Dictionary) {
+        LDEBUG(identifier() + " Event clearGroup");
         OsEng.scriptEngine().queueScript(
-            "openspace.removeSceneGraphNode('" + name() + "')",
+            "openspace.removeSceneGraphNode('" + identifier() + "')",
             scripting::ScriptEngine::RemoteScripting::Yes
         );
     });
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index 238dae34b3..a4fe36bba7 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -147,6 +147,7 @@ protected:
     std::string _programName;
 
     glm::mat4 _rotation; //to rotate objects with fliped texture coordniates
+
 private:
     bool destroyShader();
     glm::dmat3 _stateMatrix;
diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp
index e3338691c3..2382e1eb70 100644
--- a/modules/iswa/rendering/iswadatagroup.cpp
+++ b/modules/iswa/rendering/iswadatagroup.cpp
@@ -121,7 +121,7 @@ void IswaDataGroup::registerProperties(){
 
 
     _useLog.onChange([this]{
-        LDEBUG("Group " + name() + " published useLogChanged");
+        LDEBUG("Group " + identifier() + " published useLogChanged");
         _groupEvent->publish(
             "useLogChanged",
             ghoul::Dictionary({{"useLog", _useLog.value()}})
@@ -129,7 +129,7 @@ void IswaDataGroup::registerProperties(){
     });
 
     _useHistogram.onChange([this]{
-        LDEBUG("Group " + name() + " published useHistogramChanged");
+        LDEBUG("Group " + identifier() + " published useHistogramChanged");
         _groupEvent->publish(
             "useHistogramChanged",
             ghoul::Dictionary({{"useHistogram", _useHistogram.value()}})
@@ -138,7 +138,7 @@ void IswaDataGroup::registerProperties(){
 
     //If autofiler is on, background values property should be hidden
     _autoFilter.onChange([this](){
-        LDEBUG("Group " + name() + " published autoFilterChanged");
+        LDEBUG("Group " + identifier() + " published autoFilterChanged");
         // If autofiler is selected, use _dataProcessor to set backgroundValues
         // and unregister backgroundvalues property.
         if(_autoFilter.value()){
@@ -157,7 +157,7 @@ void IswaDataGroup::registerProperties(){
     });
 
     _normValues.onChange([this]{
-        LDEBUG("Group " + name() + " published normValuesChanged");
+        LDEBUG("Group " + identifier() + " published normValuesChanged");
         _groupEvent->publish(
             "normValuesChanged",
             ghoul::Dictionary({{"normValues", _normValues.value()}})
@@ -165,7 +165,7 @@ void IswaDataGroup::registerProperties(){
     });
 
     _backgroundValues.onChange([this]{
-        LDEBUG("Group " + name() + " published backgroundValuesChanged");
+        LDEBUG("Group " + identifier() + " published backgroundValuesChanged");
         _groupEvent->publish(
             "backgroundValuesChanged",
             ghoul::Dictionary({{"backgroundValues", _backgroundValues.value()}})
@@ -173,7 +173,7 @@ void IswaDataGroup::registerProperties(){
     });
 
     _transferFunctionsFile.onChange([this]{
-        LDEBUG("Group " + name() + " published transferFunctionsChanged");
+        LDEBUG("Group " + identifier() + " published transferFunctionsChanged");
         _groupEvent->publish(
             "transferFunctionsChanged",
             ghoul::Dictionary({{"transferFunctions", _transferFunctionsFile.value()}})
@@ -181,7 +181,7 @@ void IswaDataGroup::registerProperties(){
     });
 
     _dataOptions.onChange([this]{
-        LDEBUG("Group " + name() + " published dataOptionsChanged");
+        LDEBUG("Group " + identifier() + " published dataOptionsChanged");
         ghoul::Dictionary dict;
         dict.setValue<std::vector<int>>("dataOptions", _dataOptions.value());
         _groupEvent->publish("dataOptionsChanged", dict);
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 7b9ebd6b0f..d375bb73d9 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -98,7 +98,7 @@ void IswaKameleonGroup::registerProperties() {
     //OsEng.gui()._iswa.registerProperty(&_fieldlines);
 
     _resolution.onChange([this]{
-        LDEBUG("Group " + name() + " published resolutionChanged");
+        LDEBUG("Group " + identifier() + " published resolutionChanged");
         _groupEvent->publish(
             "resolutionChanged",
             ghoul::Dictionary({{"resolution", _resolution.value()}})
@@ -132,7 +132,7 @@ void IswaKameleonGroup::readFieldlinePaths(std::string indexFile) {
             for (json::iterator it = fieldlines.begin(); it != fieldlines.end(); ++it) {
                 _fieldlines.addOption({i, it.key()});
                 _fieldlineState[i] = std::make_tuple<std::string, std::string, bool>(
-                    name() + "/" + it.key(),
+                    identifier() + "/" + it.key(),
                     it.value(),
                     false
                 );
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index a81bcd5fde..5e01a38fa2 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -27,13 +27,17 @@
 #include <modules/iswa/util/dataprocessorkameleon.h>
 #include <ghoul/filesystem/filesystem.h>
 
-#ifdef __GNUC__
+#ifdef __clang__
+#elif defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif // __GNUC__
 
 #include <modules/iswa/ext/json.h>
-#ifdef __GNUC__
+
+#ifdef __clang__
+
+#elif defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif // __GNUC__
 
@@ -337,7 +341,7 @@ void KameleonPlane::readFieldlinePaths(std::string indexFile) {
             //Parse and add each fieldline as an selection
             json fieldlines = json::parse(seedFile);
             int i = 0;
-            std::string fullName = name();
+            std::string fullName = identifier();
             std::string partName = fullName.substr(0,fullName.find_last_of("-"));
             for (json::iterator it = fieldlines.begin(); it != fieldlines.end(); ++it) {
                 _fieldlines.addOption({i, it.key()});
@@ -363,8 +367,8 @@ void KameleonPlane::subscribeToGroup() {
 
     //Add additional Events specific to KameleonPlane
     auto groupEvent = _group->groupEvent();
-    groupEvent->subscribe(name(), "resolutionChanged", [&](ghoul::Dictionary dict) {
-        LDEBUG(name() + " Event resolutionChanged");
+    groupEvent->subscribe(identifier(), "resolutionChanged", [&](ghoul::Dictionary dict) {
+        LDEBUG(identifier() + " Event resolutionChanged");
         float resolution;
         bool success = dict.getValue("resolution", resolution);
         if (success) {
@@ -372,8 +376,8 @@ void KameleonPlane::subscribeToGroup() {
         }
     });
 
-    groupEvent->subscribe(name(), "cdfChanged", [&](ghoul::Dictionary dict) {
-        LDEBUG(name() + " Event cdfChanged");
+    groupEvent->subscribe(identifier(), "cdfChanged", [&](ghoul::Dictionary dict) {
+        LDEBUG(identifier() + " Event cdfChanged");
         std::string path;
         bool success = dict.getValue("path", path);
         if (success) {
diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp
index 9c3a925666..b12464f100 100644
--- a/modules/iswa/rendering/textureplane.cpp
+++ b/modules/iswa/rendering/textureplane.cpp
@@ -28,10 +28,6 @@
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/programobject.h>
 
-namespace {
-    constexpr const char* _loggerCat = "TexturePlane";
-} // namespace
-
 namespace openspace {
 
 TexturePlane::TexturePlane(const ghoul::Dictionary& dictionary)
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index b01334e895..65d2c45b2e 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -27,10 +27,6 @@
 
 #include <fstream>
 
-namespace {
-    constexpr const char* _loggerCat = "DataProcessor";
-} // namespace
-
 namespace openspace {
 
 DataProcessor::DataProcessor()
diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp
index 37a3ac5a56..c2616c85d0 100644
--- a/modules/iswa/util/dataprocessorjson.cpp
+++ b/modules/iswa/util/dataprocessorjson.cpp
@@ -85,7 +85,7 @@ void DataProcessorJson::addDataValues(std::string data,
             json row = variables[options[i].description];
 //            int rowsize = row.size();
 
-            for(int y=0; y<row.size(); y++){
+            for(size_t y = 0; y < row.size(); ++y) {
                 json col = row.at(y);
                 int colsize = static_cast<int>(col.size());
 
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 29eb1b7439..2c2a6e5738 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -28,10 +28,6 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/glm.h>
 
-namespace {
-    constexpr const char* _loggerCat = "DataProcessorKameleon";
-} // namespace
-
 namespace openspace {
 
 DataProcessorKameleon::DataProcessorKameleon()
@@ -165,10 +161,12 @@ void DataProcessorKameleon::dimensions(glm::size3_t dimensions) {
     _dimensions = dimensions;
 }
 
-void DataProcessorKameleon::initializeKameleonWrapper(std::string path){
+void DataProcessorKameleon::initializeKameleonWrapper(std::string path) {
     const std::string& extension = ghoul::filesystem::File(absPath(path)).fileExtension();
-    if(FileSys.fileExists(absPath(path)) && extension == "cdf"){
-        if(_kw) _kw->close();
+    if (FileSys.fileExists(absPath(path)) && extension == "cdf") {
+        if (_kw) {
+            _kw->close();
+        }
 
         _kwPath = path;
         _kw = std::make_shared<KameleonWrapper>(absPath(_kwPath));
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index acbaf7622e..7bd07d484d 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -51,8 +51,8 @@
 
 #ifdef __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wuseless-cast"
-#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+// #pragma clang diagnostic ignored "-Wuseless-cast"
+// #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 #elif (defined __GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wuseless-cast"
@@ -661,7 +661,7 @@ void IswaManager::fillCygnetInfo(std::string jsonString) {
 
         for (auto list : lists) {
             json jsonList = j[list];
-            for (int i=0; i<jsonList.size(); i++) {
+            for (size_t i = 0; i < jsonList.size(); ++i) {
                 json jCygnet = jsonList.at(i);
 
                 std::string name = jCygnet["cygnetDisplayTitle"];
@@ -689,7 +689,7 @@ void IswaManager::addCdfFiles(std::string cdfpath) {
 
         if (jsonFile.is_open()) {
             json cdfGroups = json::parse(jsonFile);
-            for(int i=0; i<cdfGroups.size(); i++){
+            for(size_t i = 0; i < cdfGroups.size(); ++i) {
                 json cdfGroup = cdfGroups.at(i);
 
                 std::string groupName = cdfGroup["group"];
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 886b13756b..621a6c45ae 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -45,7 +45,9 @@
 #pragma warning (pop)
 #endif // WIN32
 
+#ifdef WIN32
 #define _USE_MATH_DEFINES
+#endif // WIN32
 #include <math.h>
 #include <cstdio>
 #include <cstdlib>
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 0541b12009..bbf9b30caa 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -65,7 +65,6 @@ KameleonVolumeReader::KameleonVolumeReader(const std::string& path)
     if (status != ccmc::FileReader::OK) {
         LERROR(fmt::format("Failed to open file '{}' with Kameleon", _path));
         throw ghoul::RuntimeError("Failed to open file: " + _path + " with Kameleon");
-        return;
     }
 
     _model = _kameleon.model;
@@ -327,6 +326,10 @@ std::string KameleonVolumeReader::simulationEnd() const {
     return _model->getGlobalAttribute("end_time").getAttributeString();
 }
 
+std::string KameleonVolumeReader::getVisUnit(const std::string& variable) const {
+    return _model->getNativeUnit(variable);
+}
+
 std::string KameleonVolumeReader::time() const {
     double start =
         ccmc::Time(simulationStart()).getEpoch();
diff --git a/modules/kameleonvolume/kameleonvolumereader.h b/modules/kameleonvolume/kameleonvolumereader.h
index e2f5e2e719..96d49b1931 100644
--- a/modules/kameleonvolume/kameleonvolumereader.h
+++ b/modules/kameleonvolume/kameleonvolumereader.h
@@ -72,8 +72,9 @@ public:
     std::string time() const;
     std::string simulationStart() const;
     std::string simulationEnd() const;
+    std::string getVisUnit(const std::string& variable) const;
     float elapsedTime() const;
-
+    
     double minValue(const std::string& variable) const;
     double maxValue(const std::string& variable) const;
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 91ee83a814..c0c16da95a 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -153,7 +153,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     , _transferFunctionPath(TransferFunctionInfo)
     , _cache(CacheInfo)
     , _raycaster(nullptr)
-    , _transferFunction(nullptr)
+    , _transferFunctionHandler(nullptr)
 {
 
     glm::vec3 dimensions;
@@ -172,9 +172,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     std::string transferFunctionPath;
     if (dictionary.getValue(KeyTransferFunction, transferFunctionPath)) {
         _transferFunctionPath = transferFunctionPath;
-        _transferFunction = std::make_shared<TransferFunction>(
-            absPath(transferFunctionPath)
-        );
+        _transferFunctionHandler = std::make_shared<volume::TransferFunctionHandler>(_transferFunctionPath);
     }
 
     std::string sourcePath;
@@ -229,7 +227,8 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     ghoul::Dictionary clipPlanesDictionary;
     dictionary.getValue(KeyClipPlanes, clipPlanesDictionary);
     _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDictionary);
-    _clipPlanes->setName("clipPlanes");
+    _clipPlanes->setIdentifier("clipPlanes");
+    _clipPlanes->setGuiName("Clip Planes");
 
     bool cache;
     if (dictionary.getValue(KeyCache, cache)) {
@@ -262,13 +261,9 @@ void RenderableKameleonVolume::initializeGL() {
     load();
 
     _volumeTexture->uploadTexture();
-    _transferFunction->update();
+    _transferFunctionHandler->initialize();
 
-    _raycaster = std::make_unique<volume::BasicVolumeRaycaster>(
-        _volumeTexture,
-        _transferFunction,
-        _clipPlanes
-    );
+    _raycaster = std::make_unique<volume::BasicVolumeRaycaster>(_volumeTexture, _transferFunctionHandler, _clipPlanes);
 
     _raycaster->setStepSize(_stepSize);
     _gridType.onChange([this] {
@@ -317,6 +312,7 @@ void RenderableKameleonVolume::initializeGL() {
     addProperty(_gridType);
     addProperty(_cache);
     addPropertySubOwner(_clipPlanes.get());
+    addPropertySubOwner(_transferFunctionHandler.get());
 }
 
 void RenderableKameleonVolume::updateRaycasterModelTransform() {
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
index 96f7a1f3bf..e95a83b6fb 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
@@ -30,8 +30,7 @@
 #include <openspace/properties/stringproperty.h>
 #include <openspace/util/boxgeometry.h>
 #include <openspace/rendering/renderable.h>
-#include <openspace/rendering/transferfunction.h>
-
+#include <modules/volume/transferfunctionhandler.h>
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <modules/volume/rawvolume.h>
 #include <modules/volume/rendering/basicvolumeraycaster.h>
@@ -94,7 +93,7 @@ private:
     std::unique_ptr<volume::BasicVolumeRaycaster> _raycaster;
 
     std::shared_ptr<ghoul::opengl::Texture> _volumeTexture;
-    std::shared_ptr<TransferFunction> _transferFunction;
+    std::shared_ptr<volume::TransferFunctionHandler> _transferFunctionHandler;
 };
 
 } // namespace kameleonvolume
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index a545b9ef4b..2fdd160b73 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -50,7 +50,9 @@ namespace {
     constexpr const char* KeyMinValue = "MinValue";
     constexpr const char* KeyMaxValue = "MaxValue";
 
+    constexpr const char* KeyVisUnit = "VisUnit";
     constexpr const char* _loggerCat = "KameleonVolumeToRawTask";
+
 } // namespace
 
 namespace openspace {
@@ -102,7 +104,6 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
             reader.maxValue(variables[2]));
     }
 
-
     std::unique_ptr<volume::RawVolume<float>> rawVolume = reader.readFloatVolume(
         _dimensions,
         _variable,
@@ -130,6 +131,7 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
     outputMetadata.setValue<glm::vec3>(KeyDimensions, _dimensions);
     outputMetadata.setValue<glm::vec3>(KeyLowerDomainBound, _lowerDomainBound);
     outputMetadata.setValue<glm::vec3>(KeyUpperDomainBound, _upperDomainBound);
+
     outputMetadata.setValue<float>(
         KeyMinValue,
         static_cast<float>(reader.minValue(_variable))
@@ -138,6 +140,10 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
         KeyMaxValue,
         static_cast<float>(reader.maxValue(_variable))
     );
+    outputMetadata.setValue<std::string>(
+        KeyVisUnit,
+        static_cast<std::string>(reader.getVisUnit(_variable))
+    );
 
     ghoul::DictionaryLuaFormatter formatter;
     std::string metadataString = formatter.format(outputMetadata);
@@ -203,7 +209,13 @@ documentation::Documentation KameleonVolumeToRawTask::documentation() {
                 new DoubleVector3Verifier,
                 Optional::Yes,
                 "A vector representing the lower bound of the domain, "
-                "in the native kameleon grid units",
+                "in the native kameleon grid units"
+            },
+            {
+                KeyVisUnit,
+                new StringAnnotationVerifier("A valid kameleon unit"),
+                Optional::Yes,
+                "The unit of the data",
             }
         }
     };
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
index d153d2a417..eb52b43ab0 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
@@ -47,6 +47,7 @@ private:
     std::string  _dictionaryOutputPath;
 
     std::string _variable;
+    std::string _units;
     glm::uvec3 _dimensions;
     bool _autoDomainBounds;
     glm::vec3 _lowerDomainBound;
diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp
index a2675df9cb..945d638acd 100644
--- a/modules/multiresvolume/rendering/atlasmanager.cpp
+++ b/modules/multiresvolume/rendering/atlasmanager.cpp
@@ -140,7 +140,7 @@ void AtlasManager::updateAtlas(BUFFER_INDEX bufferIndex, std::vector<int>& brick
     glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 
-    for (int i = 0; i < nBrickIndices; i++) {
+    for (size_t i = 0; i < nBrickIndices; i++) {
         _atlasMap[i] = _brickMap[brickIndices[i]];
     }
 
diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp
index 40a75fc836..14512c7ec4 100644
--- a/modules/multiresvolume/rendering/histogrammanager.cpp
+++ b/modules/multiresvolume/rendering/histogrammanager.cpp
@@ -22,17 +22,13 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <modules/multiresvolume/rendering/histogrammanager.h>
+
+#include <openspace/util/histogram.h>
+#include <cassert>
 #include <float.h>
 #include <math.h>
 #include <string.h>
-#include <cassert>
-
-#include <modules/multiresvolume/rendering/histogrammanager.h>
-#include <openspace/util/histogram.h>
-
-namespace {
-    constexpr const char* _loggerCat = "HistogramManager";
-} // namespace
 
 namespace openspace {
 
@@ -173,11 +169,11 @@ bool HistogramManager::saveToFile(const std::string& filename) {
     file.write(reinterpret_cast<char*>(&_minBin), sizeof(float));
     file.write(reinterpret_cast<char*>(&_maxBin), sizeof(float));
 
-    int nFloats = numHistograms * _numBins;
+    size_t nFloats = numHistograms * _numBins;
     float* histogramData = new float[nFloats];
 
     for (size_t i = 0; i < numHistograms; ++i) {
-        int offset = i*_numBins;
+        size_t offset = i*_numBins;
         memcpy(&histogramData[offset], _histograms[i].data(), sizeof(float) * _numBins);
     }
 
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp
index 11b458abe1..3f3ff53d10 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp
@@ -30,10 +30,6 @@
 #include <algorithm>
 #include <cassert>
 
-namespace {
-    constexpr const char* _loggerCat = "LocalTfBrickSelector";
-} // namespace
-
 namespace openspace {
 
 LocalTfBrickSelector::LocalTfBrickSelector(TSP* tsp, LocalErrorHistogramManager* hm,
@@ -355,7 +351,7 @@ bool LocalTfBrickSelector::calculateBrickErrors() {
                 brickIndex
             );
             float error = 0;
-            for (int i = 0; i < gradients.size(); i++) {
+            for (size_t i = 0; i < gradients.size(); i++) {
                 float x = (i + 0.5f) / tfWidth;
                 float sample = histogram->interpolate(x);
                 ghoul_assert(sample >= 0, "@MISSING");
@@ -372,7 +368,7 @@ bool LocalTfBrickSelector::calculateBrickErrors() {
                 brickIndex
             );
             float error = 0;
-            for (int i = 0; i < gradients.size(); i++) {
+            for (size_t i = 0; i < gradients.size(); i++) {
                 float x = (i + 0.5f) / tfWidth;
                 float sample = histogram->interpolate(x);
                 ghoul_assert(sample >= 0, "@MISSING");
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index fd45e52ecd..e409f25451 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -48,10 +48,10 @@ namespace openspace {
 MultiresVolumeRaycaster::MultiresVolumeRaycaster(std::shared_ptr<TSP> tsp,
                                                std::shared_ptr<AtlasManager> atlasManager,
                                        std::shared_ptr<TransferFunction> transferFunction)
-    : _tsp(tsp)
+    : _boundingBox(glm::vec3(1.0))
+    , _tsp(tsp)
     , _atlasManager(atlasManager)
     , _transferFunction(transferFunction)
-    , _boundingBox(glm::vec3(1.0))
 {}
 
 MultiresVolumeRaycaster::~MultiresVolumeRaycaster() {}
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
index 0df134ae2f..27b0263aef 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
@@ -77,11 +77,11 @@ public:
     void setModelTransform(glm::mat4 transform);
     //void setTime(double time);
     void setStepSizeCoefficient(float coefficient);
+
 private:
     BoxGeometry _boundingBox;
     glm::mat4 _modelTransform;
     float _stepSizeCoefficient;
-    double _time;
 
     std::shared_ptr<TSP> _tsp;
     std::shared_ptr<AtlasManager> _atlasManager;
diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp
index 5dfabb71b8..366409b9e2 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.cpp
+++ b/modules/multiresvolume/rendering/shenbrickselector.cpp
@@ -24,10 +24,6 @@
 
 #include <modules/multiresvolume/rendering/shenbrickselector.h>
 
-namespace {
-    constexpr const char* _loggerCat = "ShenBrickSelector";
-} // namespace
-
 namespace openspace {
 
 ShenBrickSelector::ShenBrickSelector(TSP* tsp, float spatialTolerance, float temporalTolerance)
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
index faf1e4ad46..e1a64d0810 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
@@ -307,7 +307,7 @@ bool SimpleTfBrickSelector::calculateBrickImportances() {
         }
 
         float dotProduct = 0;
-        for (int i = 0; i < tf->width(); i++) {
+        for (size_t i = 0; i < tf->width(); i++) {
             float x = static_cast<float>(i) / static_cast<float>(tfWidth);
             float sample = histogram->interpolate(x);
 
diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp
index 34b691ba23..e4daac6e62 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/tfbrickselector.cpp
@@ -30,10 +30,6 @@
 #include <algorithm>
 #include <cassert>
 
-namespace {
-    constexpr const char* _loggerCat = "TfBrickSelector";
-} // namespace
-
 namespace openspace {
 
 TfBrickSelector::TfBrickSelector(TSP* tsp, ErrorHistogramManager* hm,
@@ -364,7 +360,7 @@ bool TfBrickSelector::calculateBrickErrors() {
         } else {
             const Histogram* histogram = _histogramManager->getHistogram(brickIndex);
             float error = 0;
-            for (int i = 0; i < gradients.size(); i++) {
+            for (size_t i = 0; i < gradients.size(); i++) {
                 float x = (i + 0.5f) / tfWidth;
                 float sample = histogram->interpolate(x);
                 ghoul_assert(sample >= 0, "@MISSING");
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
new file mode 100644
index 0000000000..848a3001a7
--- /dev/null
+++ b/modules/server/CMakeLists.txt
@@ -0,0 +1,64 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2017                                                                #
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/module_definition.cmake)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(HEADER_FILES
+    include/connectionpool.h
+    include/connection.h
+    include/jsonconverters.h
+    include/topic.h
+    include/authorizationtopic.h
+    include/getpropertytopic.h
+    include/luascripttopic.h
+    include/subscriptiontopic.h
+    include/setpropertytopic.h
+    include/timetopic.h
+    include/triggerpropertytopic.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/servermodule.h
+)
+source_group("Header Files" FILES ${HEADER_FILES})
+
+set(SOURCE_FILES
+    src/connectionpool.cpp
+    src/connection.cpp
+    src/jsonconverters.cpp
+    src/topics/topic.cpp
+    src/topics/authorizationtopic.cpp
+    src/topics/getpropertytopic.cpp
+    src/topics/luascripttopic.cpp
+    src/topics/subscriptiontopic.cpp
+    src/topics/setpropertytopic.cpp
+    src/topics/timetopic.cpp
+    src/topics/triggerpropertytopic.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/servermodule.cpp
+)
+source_group("Source Files" FILES ${SOURCE_FILES})
+
+create_new_module(
+    "Server"
+    server_module
+    ${HEADER_FILES} ${SOURCE_FILES}
+)
diff --git a/modules/server/include.cmake b/modules/server/include.cmake
new file mode 100644
index 0000000000..ffea0ac430
--- /dev/null
+++ b/modules/server/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_MODULE ON)
diff --git a/modules/server/include/authorizationtopic.h b/modules/server/include/authorizationtopic.h
new file mode 100644
index 0000000000..ed33713003
--- /dev/null
+++ b/modules/server/include/authorizationtopic.h
@@ -0,0 +1,68 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__AUTHENTICATION_TOPIC_H
+#define OPENSPACE_MODULES_SERVER__AUTHENTICATION_TOPIC_H
+
+#include <ctime>
+#include <ext/json/json.hpp>
+#include <ghoul/logging/logmanager.h>
+#include <fmt/format.h>
+
+#include "topic.h"
+#include "connection.h"
+
+namespace openspace {
+
+class AuthorizationTopic : public Topic {
+public:
+    AuthorizationTopic();
+    ~AuthorizationTopic() {};
+    void handleJson(nlohmann::json json);
+    bool isDone();
+
+    /* https://httpstatuses.com/ */
+    static const struct Statuses {
+        enum StatusCode {
+            OK            = 200,
+            Accepted      = 202,
+
+            BadRequest    = 400,
+            Unauthorized  = 401,
+            NotAcceptable = 406,
+
+            NotImplemented = 501
+        };
+    };
+private:
+    bool _isAuthenticated;
+
+    const std::string getKey() const;
+    bool authorize(const std::string key);
+    nlohmann::json message(const std::string &message, const int &statusCode = Statuses::NotImplemented);
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__AUTHENTICATION_TOPIC_H
diff --git a/modules/server/include/connection.h b/modules/server/include/connection.h
new file mode 100644
index 0000000000..9c9097ddb6
--- /dev/null
+++ b/modules/server/include/connection.h
@@ -0,0 +1,79 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODOULES_SERVER__CONNECTION_H
+#define OPENSPACE_MODOULES_SERVER__CONNECTION_H
+
+#include <memory>
+#include <string>
+#include <ghoul/io/socket/tcpsocketserver.h>
+#include <ghoul/io/socket/websocketserver.h>
+#include <ghoul/misc/templatefactory.h>
+#include <ext/json/json.hpp>
+#include <ghoul/logging/logmanager.h>
+#include <fmt/format.h>
+#include <include/openspace/engine/openspaceengine.h>
+#include <include/openspace/engine/configurationmanager.h>
+
+#include "topic.h"
+
+namespace openspace {
+
+using TopicId = size_t;
+
+class Connection {
+public:
+    Connection(std::shared_ptr<ghoul::io::Socket> s, const std::string &address);
+
+    void handleMessage(std::string message);
+    void sendMessage(const std::string& message);
+    void handleJson(nlohmann::json json);
+    void sendJson(const nlohmann::json& json);
+    void setAuthorized(const bool status);
+
+    bool isAuthorized();
+    
+    
+    std::shared_ptr<ghoul::io::Socket> socket();
+    std::thread& thread();
+    void setThread(std::thread&& thread);
+
+private:
+    ghoul::TemplateFactory<Topic> _topicFactory;
+    std::map<TopicId, std::unique_ptr<Topic>> _topics;
+    std::shared_ptr<ghoul::io::Socket> _socket;
+    std::thread _thread;
+
+    std::string _address;
+    bool _requireAuthorization;
+    bool _isAuthorized;
+    std::map <TopicId, std::string> _messageQueue;
+    std::map <TopicId, std::chrono::system_clock::time_point> _sentMessages;
+
+    bool isWhitelisted();
+};
+
+}
+
+#endif //OPENSPACE_MODOULES_SERVER__CONNECTION_H
diff --git a/modules/server/include/connectionpool.h b/modules/server/include/connectionpool.h
new file mode 100644
index 0000000000..f040cc9ff5
--- /dev/null
+++ b/modules/server/include/connectionpool.h
@@ -0,0 +1,65 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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___CONNECTIONPOOL___H__
+#define __OPENSPACE_MODULE_SERVER___CONNECTIONPOOL___H__
+
+#include <ghoul/io/socket/socketserver.h>
+
+
+#include <memory>
+#include <thread>
+#include <mutex>
+#include <map>
+#include <functional>
+#include <vector>
+#include <atomic>
+
+
+namespace openspace {
+
+class ConnectionPool {
+public:
+    ConnectionPool(std::function<void(std::shared_ptr<ghoul::io::Socket> socket)> handleSocket);
+    ~ConnectionPool();
+    void addServer(std::shared_ptr<ghoul::io::SocketServer> server);
+    void removeServer(ghoul::io::SocketServer* server);
+    void clearServers();
+    void updateConnections();
+    
+private:
+
+    void disconnectAllConnections();
+    std::mutex _connectionMutex;
+    void removeDisconnectedSockets();
+    void acceptNewSockets();
+    
+    std::function<void(std::shared_ptr<ghoul::io::Socket>)> _handleSocket;
+    std::vector<std::shared_ptr<ghoul::io::SocketServer>> _socketServers;
+    std::vector<std::shared_ptr<ghoul::io::Socket>> _sockets;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___CONNECTIONPOOL___H__
diff --git a/modules/server/include/getpropertytopic.h b/modules/server/include/getpropertytopic.h
new file mode 100644
index 0000000000..fe00c2dcec
--- /dev/null
+++ b/modules/server/include/getpropertytopic.h
@@ -0,0 +1,48 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__GETPROPERTY_TOPIC_H
+#define OPENSPACE_MODULES_SERVER__GETPROPERTY_TOPIC_H
+
+#include <openspace/query/query.h>
+#include "topic.h"
+#include "connection.h"
+
+namespace openspace {
+
+class GetPropertyTopic : public Topic {
+public:
+    GetPropertyTopic();
+    ~GetPropertyTopic() {};
+    void handleJson(nlohmann::json json);
+    bool isDone();
+
+private:
+    nlohmann::json getAllProperties();
+    nlohmann::json getPropertyFromKey(const std::string& key);
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__GETPROPERTY_TOPIC_H
diff --git a/modules/server/include/jsonconverters.h b/modules/server/include/jsonconverters.h
new file mode 100644
index 0000000000..b3009ddefb
--- /dev/null
+++ b/modules/server/include/jsonconverters.h
@@ -0,0 +1,61 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__JSON_CONVERTERS_INL
+#define OPENSPACE_MODULES_SERVER__JSON_CONVERTERS_INL
+
+#include <openspace/properties/property.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/rendering/renderable.h>
+#include <ext/json/json.hpp>
+#include <ghoul/glm.h>
+
+using json = nlohmann::json;
+
+namespace openspace::properties {
+
+void to_json(json &j, const Property &p);
+void to_json(json &j, const Property* pP);
+void to_json(json &j, const PropertyOwner &p);
+void to_json(json &j, const PropertyOwner *p);
+
+} // namespace openspace::properties
+
+namespace openspace {
+
+void to_json(json &j, const SceneGraphNode &n);
+void to_json(json &j, const SceneGraphNode* pN);
+
+void to_json(json &j, const Renderable &r);
+void to_json(json &j, const Renderable* pR);
+
+} // namespace openspace
+
+namespace glm {
+
+void to_json(json &j, const dvec3 &v);
+
+}
+
+#endif
diff --git a/modules/server/include/luascripttopic.h b/modules/server/include/luascripttopic.h
new file mode 100644
index 0000000000..0312259d17
--- /dev/null
+++ b/modules/server/include/luascripttopic.h
@@ -0,0 +1,43 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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_MODULES_SERVER__LUASCRIPTTOPIC_H
+#define OPENSPACE_MODULES_SERVER__LUASCRIPTTOPIC_H
+
+#include <ext/json/json.hpp>
+#include <modules/server/include/topic.h>
+
+namespace openspace {
+
+class LuaScriptTopic : public Topic {
+public:
+    LuaScriptTopic() : Topic() {};
+    ~LuaScriptTopic() {};
+    void handleJson(nlohmann::json json);
+    bool isDone() { return true; };
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__LUASCRIPTTOPIC_H
diff --git a/modules/server/include/setpropertytopic.h b/modules/server/include/setpropertytopic.h
new file mode 100644
index 0000000000..45d760a50e
--- /dev/null
+++ b/modules/server/include/setpropertytopic.h
@@ -0,0 +1,46 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__SETPROPERTYTOPIC_H
+#define OPENSPACE_MODULES_SERVER__SETPROPERTYTOPIC_H
+
+#include <ext/json/json.hpp>
+#include <modules/server/include/topic.h>
+
+namespace openspace {
+
+class SetPropertyTopic : public Topic {
+public:
+    SetPropertyTopic() : Topic() {};
+    ~SetPropertyTopic() {};
+    void handleJson(nlohmann::json json);
+    bool isDone() { return true; };
+
+private:
+    void setTime(const std::string& value);
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__SETPROPERTYTOPIC_H
diff --git a/modules/server/include/subscriptiontopic.h b/modules/server/include/subscriptiontopic.h
new file mode 100644
index 0000000000..ec7190887b
--- /dev/null
+++ b/modules/server/include/subscriptiontopic.h
@@ -0,0 +1,52 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__SUBSCRIPTION_TOPIC_H
+#define OPENSPACE_MODULES_SERVER__SUBSCRIPTION_TOPIC_H
+
+#include <openspace/util/timemanager.h>
+#include <openspace/query/query.h>
+#include "topic.h"
+#include "connection.h"
+
+namespace openspace {
+class property;
+class SubscriptionTopic : public Topic {
+public:
+    SubscriptionTopic();
+    ~SubscriptionTopic();
+    void handleJson(nlohmann::json json);
+    bool isDone();
+
+private:
+    bool _requestedResourceIsSubscribable;
+    bool _isSubscribedTo;
+    int _onChangeHandle;
+    int _onDeleteHandle;
+    properties::Property* _prop;
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__SUBSCRIPTION_TOPIC_H
diff --git a/modules/server/include/timetopic.h b/modules/server/include/timetopic.h
new file mode 100644
index 0000000000..884223380d
--- /dev/null
+++ b/modules/server/include/timetopic.h
@@ -0,0 +1,50 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__TIME_TOPIC_H
+#define OPENSPACE_MODULES_SERVER__TIME_TOPIC_H
+
+#include <openspace/util/timemanager.h>
+#include "topic.h"
+
+namespace openspace {
+
+class TimeTopic : public Topic {
+public:
+    TimeTopic();
+    ~TimeTopic();
+    void handleJson(nlohmann::json json);
+    bool isDone();
+private: 
+    nlohmann::json currentTime();
+    nlohmann::json deltaTime();
+
+    int _timeCallbackHandle;
+    int _deltaTimeCallbackHandle;
+    std::chrono::system_clock::time_point _lastUpdateTime;
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__TIME_TOPIC_H
diff --git a/modules/server/include/topic.h b/modules/server/include/topic.h
new file mode 100644
index 0000000000..7f233ef0a1
--- /dev/null
+++ b/modules/server/include/topic.h
@@ -0,0 +1,59 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_MODULES_SERVER__TOPIC_H
+#define OPENSPACE_MODULES_SERVER__TOPIC_H
+
+#include <ext/json/json.hpp>
+
+namespace openspace {
+
+class Connection;
+
+class Topic {
+public:
+    Topic() {};
+    virtual ~Topic() {};
+    void initialize(Connection* connection, size_t topicId);
+    nlohmann::json wrappedPayload(const nlohmann::json &payload) const;
+    nlohmann::json wrappedError(std::string message = "Could not complete request.", int code = 500);
+    virtual void handleJson(nlohmann::json json) = 0;
+    virtual bool isDone() = 0;
+
+protected:
+    size_t _topicId;
+    Connection* _connection;
+};
+
+class BounceTopic : public Topic {
+public:
+    BounceTopic() : Topic() {};
+    ~BounceTopic() {};
+    void handleJson(nlohmann::json json);
+    bool isDone() { return false; }
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__TOPIC_H
diff --git a/modules/server/include/triggerpropertytopic.h b/modules/server/include/triggerpropertytopic.h
new file mode 100644
index 0000000000..67ebc74e1b
--- /dev/null
+++ b/modules/server/include/triggerpropertytopic.h
@@ -0,0 +1,43 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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_MODULES_SERVER__TRIGGERPROPERTYTOPIC_H
+#define OPENSPACE_MODULES_SERVER__TRIGGERPROPERTYTOPIC_H
+
+#include <ext/json/json.hpp>
+#include <modules/server/include/topic.h>
+
+namespace openspace {
+
+class TriggerPropertyTopic : public Topic {
+public:
+    TriggerPropertyTopic() : Topic() {};
+    ~TriggerPropertyTopic() {};
+    void handleJson(nlohmann::json json);
+    bool isDone() { return true; };
+};
+
+}
+
+#endif //OPENSPACE_MODULES_SERVER__TRIGGERPROPERTYTOPIC_H
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
new file mode 100644
index 0000000000..7e2882e884
--- /dev/null
+++ b/modules/server/servermodule.cpp
@@ -0,0 +1,143 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/servermodule.h>
+#include <ghoul/io/socket/websocket.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/scripting/scriptengine.h>
+
+namespace {
+    const char* _loggerCat = "ServerModule";
+}
+
+namespace openspace {
+
+ServerModule::ServerModule()
+    : OpenSpaceModule(ServerModule::Name)
+{}
+
+ServerModule::~ServerModule() {
+    disconnectAll();
+    cleanUpFinishedThreads();
+}
+
+void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
+    using namespace ghoul::io;
+
+    std::unique_ptr<TcpSocketServer> tcpServer = std::make_unique<TcpSocketServer>();
+    std::unique_ptr<WebSocketServer> wsServer = std::make_unique<WebSocketServer>();
+
+    // Temporary hard coded addresses and ports.
+    tcpServer->listen("localhost", 8000);
+    wsServer->listen("localhost", 8001);
+    LDEBUG(fmt::format("TCP Server listening on {}:{}",
+        tcpServer->address(), tcpServer->port()));
+
+    LDEBUG(fmt::format("WS Server listening on {}:{}",
+        wsServer->address(), wsServer->port()));
+
+    _servers.push_back(std::move(tcpServer));
+    _servers.push_back(std::move(wsServer));
+
+    OsEng.registerModuleCallback(
+        OpenSpaceEngine::CallbackOption::PreSync,
+        [this]() { preSync(); }
+    );
+}
+
+void ServerModule::preSync() {
+    // Set up new connections.
+    for (auto& server : _servers) {
+        std::shared_ptr<ghoul::io::Socket> socket;
+        while ((socket = server->nextPendingSocket())) {
+            socket->startStreams();
+            std::shared_ptr<Connection> connection =
+                std::make_shared<Connection>(socket, server->address());
+            connection->setThread(
+                std::thread([this, connection] () { handleConnection(connection); })
+            );
+            _connections.push_back({ std::move(connection), false });
+        }
+    }
+
+    // Consume all messages put into the message queue by the socket threads.
+    consumeMessages();
+
+    // Join threads for sockets that disconnected.
+    cleanUpFinishedThreads();
+}
+                               
+void ServerModule::cleanUpFinishedThreads() {
+    for (auto& connectionData : _connections) {
+        std::shared_ptr<Connection>& connection = connectionData.connection;
+        if (!connection->socket() || !connection->socket()->isConnected()) {
+            if (connection->thread().joinable()) {
+                connection->thread().join();
+                connectionData.markedForRemoval = true;
+            }
+        }
+    }
+    _connections.erase(std::remove_if(
+        _connections.begin(),
+        _connections.end(),
+        [](const auto& connectionData) {
+            return connectionData.markedForRemoval;
+        }
+    ), _connections.end());
+}
+    
+void ServerModule::disconnectAll() {
+    for (auto& connectionData : _connections) {
+        std::shared_ptr<Connection>& connection = connectionData.connection;
+        if (connection->socket() && connection->socket()->isConnected()) {
+            connection->socket()->disconnect(
+                static_cast<int>(ghoul::io::WebSocket::ClosingReason::ClosingAll)
+            );
+        }
+    }
+}
+    
+void ServerModule::handleConnection(std::shared_ptr<Connection> connection) {
+    std::string messageString;
+    while (connection->socket()->getMessage(messageString)) {
+        std::lock_guard<std::mutex> lock(_messageQueueMutex);
+        _messageQueue.push_back(Message({
+            connection,
+            std::move(messageString)
+        }));
+    }
+}
+
+void ServerModule::consumeMessages() {
+    std::lock_guard<std::mutex> lock(_messageQueueMutex);
+    while (_messageQueue.size() > 0) {
+        Message m = _messageQueue.front();
+        _messageQueue.pop_front();
+        if (std::shared_ptr<Connection> c = m.connection.lock()) {
+            c->handleMessage(m.messageString);
+        }
+    }
+}
+
+} // namespace openspace
diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h
new file mode 100644
index 0000000000..2996e7fa5f
--- /dev/null
+++ b/modules/server/servermodule.h
@@ -0,0 +1,80 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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___SERVERMODULE___H__
+#define __OPENSPACE_MODULE_SERVER___SERVERMODULE___H__
+
+#include <openspace/util/openspacemodule.h>
+
+#include <ghoul/io/socket/tcpsocketserver.h>
+#include <ghoul/misc/templatefactory.h>
+
+#include <deque>
+#include <memory>
+#include <thread>
+#include <mutex>
+#include <cstdint>
+#include <map>
+#include <ext/json/json.hpp>
+#include <fmt/format.h>
+
+#include "include/connection.h"
+#include "include/topic.h"
+
+namespace openspace {
+
+struct Message {
+    std::weak_ptr<Connection> connection;
+    std::string messageString;
+};
+
+class ServerModule : public OpenSpaceModule {
+public:
+    static constexpr const char* Name = "Server";
+    ServerModule();
+    virtual ~ServerModule();
+protected:
+    void internalInitialize(const ghoul::Dictionary& configuration) override;
+private:
+    struct ConnectionData {
+        std::shared_ptr<Connection> connection;
+        bool markedForRemoval = false;
+    };
+
+    void handleConnection(std::shared_ptr<Connection> connection);
+    void cleanUpFinishedThreads();
+    void consumeMessages();
+    void disconnectAll();
+    void preSync();
+
+    std::mutex _messageQueueMutex;
+    std::deque<Message> _messageQueue;
+
+    std::vector<ConnectionData> _connections;
+    std::vector<std::unique_ptr<ghoul::io::SocketServer>> _servers;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_SERVER___SERVERMODULE___H__
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
new file mode 100644
index 0000000000..b584d245dc
--- /dev/null
+++ b/modules/server/src/connection.cpp
@@ -0,0 +1,200 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/connection.h>
+#include <modules/server/include/authorizationtopic.h>
+#include <modules/server/include/getpropertytopic.h>
+#include <modules/server/include/luascripttopic.h>
+#include <modules/server/include/setpropertytopic.h>
+#include <modules/server/include/subscriptiontopic.h>
+#include <modules/server/include/timetopic.h>
+#include <modules/server/include/triggerpropertytopic.h>
+
+namespace {
+const char* _loggerCat = "ServerModule: Connection";
+
+const char* MessageKeyType = "type";
+const char* MessageKeyPayload = "payload";
+const char* MessageKeyTopic = "topic";
+
+const char* AuthenticationTopicKey = "authorize";
+const char* GetPropertyTopicKey = "get";
+const char* LuaScriptTopicKey = "luascript";
+const char* SetPropertyTopicKey = "set";
+const char* SubscriptionTopicKey = "subscribe";
+const char* TimeTopicKey = "time";
+const char* TriggerPropertyTopicKey = "trigger";
+const char* BounceTopicKey = "bounce";
+
+const int ThrottleMessageWaitInMs = 100;
+}
+
+namespace openspace {
+
+Connection::Connection(std::shared_ptr<ghoul::io::Socket> s, const std::string &address)
+    : _socket(s)
+    , _isAuthorized(false)
+    , _address(address)
+{
+    _topicFactory.registerClass<AuthorizationTopic>(AuthenticationTopicKey);
+    _topicFactory.registerClass<GetPropertyTopic>(GetPropertyTopicKey);
+    _topicFactory.registerClass<LuaScriptTopic>(LuaScriptTopicKey);
+    _topicFactory.registerClass<SetPropertyTopic>(SetPropertyTopicKey);
+    _topicFactory.registerClass<SubscriptionTopic>(SubscriptionTopicKey);
+    _topicFactory.registerClass<TimeTopic>(TimeTopicKey);
+    _topicFactory.registerClass<TriggerPropertyTopic>(TriggerPropertyTopicKey);
+    _topicFactory.registerClass<BounceTopic>(BounceTopicKey);
+
+    // see if the default config for requiring auth (on) is overwritten
+    const bool hasAuthenticationConfiguration = OsEng.configurationManager().hasKeyAndValue<bool>(
+            ConfigurationManager::KeyRequireSocketAuthentication);
+    if (hasAuthenticationConfiguration) {
+        _requireAuthorization = OsEng.configurationManager().value<bool>(
+                ConfigurationManager::KeyRequireSocketAuthentication);
+    } else {
+        _requireAuthorization = true;
+    }
+}
+
+void Connection::handleMessage(std::string message) {
+    try {
+        nlohmann::json j = nlohmann::json::parse(message.c_str());
+        try {
+            handleJson(j);
+        }
+        catch (...) {
+            LERROR(fmt::format("JSON handling error from: {}", message));
+        }
+    } catch (...) {
+        if (!isAuthorized()) {
+            LERROR("");
+            _socket->disconnect();
+            LERROR(fmt::format(
+                "Could not parse JSON: '{}'. Connection is unauthorized. Disconnecting.",
+                message
+            ));
+            return;
+        } else {
+            LERROR(fmt::format("Could not parse JSON: '{}'", message));
+        }
+    }
+}
+
+void Connection::handleJson(nlohmann::json j) {
+    auto topicJson = j.find(MessageKeyTopic);
+    auto payloadJson = j.find(MessageKeyPayload);
+
+    if (topicJson == j.end() || !topicJson->is_number_integer()) {
+        LERROR("Topic must be an integer");
+        return;
+    }
+
+    if (payloadJson == j.end() || !payloadJson->is_object()) {
+        LERROR("Payload must be an object");
+        return;
+    }
+
+    // The topic id may be an already discussed topic, or a new one.
+    TopicId topicId = *topicJson;
+    auto topicIt = _topics.find(topicId);
+
+    if (topicIt == _topics.end()) {
+        // The topic id is not registered: Initialize a new topic.
+        auto typeJson = j.find(MessageKeyType);
+        if (typeJson == j.end() || !typeJson->is_string()) {
+            LERROR(fmt::format("A type must be specified (`{}`) as a string when "
+                               "a new topic is initialized", MessageKeyType));
+            return;
+        }
+        std::string type = *typeJson;
+
+        if (!isAuthorized() && type != AuthenticationTopicKey) {
+            LERROR("Connection isn't authorized.");
+            return;
+        }
+
+        std::unique_ptr<Topic> topic = _topicFactory.create(type);
+        topic->initialize(this, topicId);
+        topic->handleJson(*payloadJson);
+        if (!topic->isDone()) {
+            _topics.emplace(topicId, std::move(topic));
+        }
+    } else {
+        if (!isAuthorized()) {
+            LERROR("Connection isn't authorized.");
+            return;
+        }
+
+        // Dispatch the message to the existing topic.
+        std::unique_ptr<Topic> &topic = topicIt->second;
+        topic->handleJson(*payloadJson);
+        if (topic->isDone()) {
+            _topics.erase(topicIt);
+        }
+    }
+}
+
+void Connection::sendMessage(const std::string &message) {
+    _socket->putMessage(message);
+}
+
+void Connection::sendJson(const nlohmann::json &j) {
+    sendMessage(j.dump());
+}
+
+bool Connection::isAuthorized() {
+    // require either auth to be disabled or client to be authenticated
+    return !_requireAuthorization || isWhitelisted() || _isAuthorized;
+}
+
+void Connection::setThread(std::thread&& thread) {
+    _thread = std::move(thread);
+}
+
+std::thread& Connection::thread() {
+    return _thread;
+}
+
+std::shared_ptr<ghoul::io::Socket> Connection::socket() {
+    return _socket;
+}
+
+void Connection::setAuthorized(const bool status) {
+    _isAuthorized = status;
+}
+
+bool Connection::isWhitelisted() {
+    const bool hasWhitelist = OsEng.configurationManager().hasKeyAndValue<std::string>(
+        ConfigurationManager::KeyServerClientAddressWhitelist);
+
+    if (!hasWhitelist) {
+        return false;
+    }
+
+    const auto whitelist = OsEng.configurationManager().value<std::string>(
+        ConfigurationManager::KeyServerClientAddressWhitelist);
+    return whitelist.find(_address) != std::string::npos;
+}
+
+} // namespace openspace
diff --git a/modules/server/src/connectionpool.cpp b/modules/server/src/connectionpool.cpp
new file mode 100644
index 0000000000..28db0f4d00
--- /dev/null
+++ b/modules/server/src/connectionpool.cpp
@@ -0,0 +1,87 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/connectionpool.h>
+#include <ghoul/io/socket/socket.h>
+
+#include <vector>
+#include <algorithm>
+
+
+namespace openspace {
+
+ConnectionPool::ConnectionPool(std::function<void(std::shared_ptr<ghoul::io::Socket> socket)> handleSocket)
+    : _handleSocket(std::move(handleSocket))
+{}
+
+ConnectionPool::~ConnectionPool() {
+    disconnectAllConnections();
+}
+
+void ConnectionPool::addServer(std::shared_ptr<ghoul::io::SocketServer> server) {
+    _socketServers.push_back(server);
+}
+
+void ConnectionPool::removeServer(ghoul::io::SocketServer* server) {
+    std::remove_if(_socketServers.begin(), _socketServers.end(), [server](const auto& s) {
+        return s.get() == server;
+    });
+}
+
+void ConnectionPool::clearServers() {
+    _socketServers.clear();
+}
+
+void ConnectionPool::updateConnections() {
+    removeDisconnectedSockets();
+    acceptNewSockets();
+}
+
+void ConnectionPool::acceptNewSockets() {
+    for (auto& server : _socketServers) {
+        std::shared_ptr<ghoul::io::Socket> socket;
+        while (socket = server->nextPendingSocket()) {
+            _handleSocket(socket);
+            _sockets.push_back(socket);
+        }
+    }
+}
+
+void ConnectionPool::removeDisconnectedSockets() {
+    std::remove_if(_sockets.begin(), _sockets.end(), [](const std::shared_ptr<ghoul::io::Socket> socket) {
+        return !socket || !socket->isConnected();
+    });
+}
+
+void ConnectionPool::disconnectAllConnections() {
+    for (auto& socket : _sockets) {
+        if (socket && socket->isConnected()) {
+            socket->disconnect();
+        }
+    }
+    _sockets.clear();
+}
+
+
+} // namespace openspace
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
new file mode 100644
index 0000000000..72d355647a
--- /dev/null
+++ b/modules/server/src/jsonconverters.cpp
@@ -0,0 +1,121 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/jsonconverters.h>
+#include <openspace/properties/property.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/rendering/renderable.h>
+#include <ghoul/logging/logmanager.h>
+#include <ext/json/json.hpp>
+
+using json = nlohmann::json;
+
+namespace openspace::properties {
+
+void to_json(json &j, const Property &p) {
+    j = {
+        { "Description", json::parse(p.generateBaseJsonDescription()) },
+        { "Value", p.jsonValue() }
+    };
+    j["Description"]["description"] = p.description();
+}
+
+void to_json(json &j, const Property* pP) {
+    j = *pP;
+}
+
+void to_json(json &j, const PropertyOwner &p) {
+    j = {
+        { "identifier", p.identifier() },
+        { "description", p.description() },
+        { "properties", p.properties() },
+        { "subowners", p.propertySubOwners() },
+        { "tag", p.tags() }
+    };
+}
+
+void to_json(json &j, const PropertyOwner* p) {
+    j = *p;
+}
+
+} // namespace openspace::properties
+
+namespace openspace {
+
+void to_json(json &j, const SceneGraphNode &n) {
+    j = {
+        { "identifier", n.identifier() },
+        { "worldPosition", n.worldPosition() },
+        { "position", n.position() },
+        { "tags", n.tags() },
+
+        { "propertiesCount", n.properties().size() },
+        { "properties", n.properties() },
+
+        { "subowners", n.propertySubOwners() }
+    };
+/*
+    auto renderable = n.renderable();
+    if (renderable != nullptr) {
+        j["renderable"] = renderable;
+    }*/
+
+    auto parent = n.parent();
+    if (parent != nullptr) {
+        j["parent"] = {
+            { "identifier", parent->identifier() }
+        };
+    }
+}
+
+void to_json(json &j, const SceneGraphNode* pN) {
+    // Use reference converter instead of pointer
+    j = *pN;
+}
+
+void to_json(json &j, const Renderable &r) {
+    j = {
+        { "properties", r.properties() },
+        { "enabled", r.isEnabled() }
+    };
+}
+
+void to_json(json &j, const Renderable* pR) {
+    // Use reference converter instead of pointer
+    j = *pR;
+}
+
+
+} // namespace openspace
+
+namespace glm {
+
+void to_json(json &j, const dvec3 &v) {
+    j = {
+        { "value", {v.x, v.y, v.z} },
+        { "type", "vec3" }
+    };
+}
+
+}
diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp
new file mode 100644
index 0000000000..9b9939fcbd
--- /dev/null
+++ b/modules/server/src/topics/authorizationtopic.cpp
@@ -0,0 +1,83 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 "include/authorizationtopic.h"
+
+namespace {
+std::string _loggerCat = "AuthorizationTopic";
+}
+
+namespace openspace {
+
+    AuthorizationTopic::AuthorizationTopic()
+        : Topic()
+        , _isAuthenticated(false) {};
+
+bool AuthorizationTopic::isDone() {
+    return _isAuthenticated;
+}
+
+void AuthorizationTopic::handleJson(nlohmann::json json) {
+    if (isDone()) {
+        _connection->sendJson(message("Already authorized.", Statuses::OK));
+    } else {
+        try {
+            auto providedKey = json.at("key").get<std::string>();
+            if (authorize(providedKey)) {
+                _connection->sendJson(message("Authorization OK.", Statuses::Accepted));
+                _connection->setAuthorized(true);
+                LINFO("Client successfully authorized.");
+            } else {
+                _connection->sendJson(message("Invalid key", Statuses::NotAcceptable));
+            }
+        } catch (const std::out_of_range& e) {
+            _connection->sendJson(message("Invalid request, key must be provided.", Statuses::BadRequest));
+        } catch (const std::domain_error& e) {
+            _connection->sendJson(message("Invalid request, invalid key format.", Statuses::BadRequest));
+        }
+    }
+};
+
+bool AuthorizationTopic::authorize(const std::string key) {
+    _isAuthenticated = key == getKey();
+    return _isAuthenticated;
+}
+
+const std::string AuthorizationTopic::getKey() const {
+    const bool hasConfigPassword = OsEng.configurationManager().hasKeyAndValue<std::string>(
+        ConfigurationManager::KeyServerPasskey);
+    if (hasConfigPassword) {
+        return OsEng.configurationManager().value<std::string>(
+            ConfigurationManager::KeyServerPasskey);
+    }
+
+    return "17308";
+}
+
+nlohmann::json AuthorizationTopic::message(const std::string &message, const int &statusCode) {
+    nlohmann::json error = {{"message", message}, {"code", statusCode}};
+    return error;
+}
+
+}
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
new file mode 100644
index 0000000000..1297e9e422
--- /dev/null
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -0,0 +1,102 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/jsonconverters.h>
+#include <openspace/properties/property.h>
+#include <openspace/interaction/luaconsole.h>
+#include <openspace/network/parallelconnection.h>
+#include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/interaction/navigationhandler.h>
+#include <openspace/engine/virtualpropertymanager.h>
+#include <openspace/rendering/screenspacerenderable.h>
+#include <openspace/scene/scene.h>
+#include <modules/server/include/getpropertytopic.h>
+#include <modules/volume/transferfunctionhandler.h>
+
+using nlohmann::json;
+
+namespace {
+const char* _loggerCat = "GetPropertyTopic";
+const char* AllPropertiesValue = "__allProperties";
+const char* AllNodesValue = "__allNodes";
+const char* AllScreenSpaceRenderablesValue = "__screenSpaceRenderables";
+const char* PropertyKey = "property";
+const char* RootPropertyOwner = "__rootOwner";
+}
+
+namespace openspace {
+
+GetPropertyTopic::GetPropertyTopic()
+        : Topic() {}
+
+bool GetPropertyTopic::isDone() {
+    return true;
+}
+
+void GetPropertyTopic::handleJson(json j) {
+    std::string requestedKey = j.at(PropertyKey).get<std::string>();
+    LDEBUG("Getting property '" + requestedKey + "'...");
+    json response;
+    if (requestedKey == AllPropertiesValue) {
+        response = getAllProperties();
+    }
+    else if (requestedKey == AllNodesValue) {
+        response = wrappedPayload(sceneGraph()->allSceneGraphNodes());
+    }
+    else if (requestedKey == AllScreenSpaceRenderablesValue) {
+        response = wrappedPayload({ { "value", OsEng.renderEngine().screenSpaceRenderables() } });
+    }
+    else if (requestedKey == RootPropertyOwner) {
+        response = wrappedPayload(OsEng.rootPropertyOwner());
+    }
+    else {
+        response = getPropertyFromKey(requestedKey);
+    }
+    _connection->sendJson(response);
+}
+
+json GetPropertyTopic::getAllProperties() {
+    json payload{
+        { "value", {
+            OsEng.renderEngine(),
+            OsEng.console(),
+            OsEng.parallelPeer(),
+            OsEng.windowWrapper(),
+            OsEng.navigationHandler(),
+            OsEng.virtualPropertyManager(),
+        }}
+    };
+    return wrappedPayload(payload);
+}
+
+json GetPropertyTopic::getPropertyFromKey(const std::string& key) {
+    properties::Property* prop = property(key);
+    if (prop != nullptr) {
+        return wrappedPayload(prop);
+    }
+
+    return wrappedError(fmt::format("property '{}' not found", key), 404);
+}
+
+} // namespace openspace
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
new file mode 100644
index 0000000000..21c4bb3d9a
--- /dev/null
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/engine/openspaceengine.h>
+#include <openspace/scripting/scriptengine.h>
+#include <ghoul/logging/logmanager.h>
+#include <modules/server/include/luascripttopic.h>
+
+namespace {
+const std::string ScriptKey = "script";
+const std::string _loggerCat = "LuaScriptTopic";
+}
+
+namespace openspace {
+
+void LuaScriptTopic::handleJson(nlohmann::json json) {
+    try {
+        auto script = json.at(ScriptKey).get<std::string>();
+        LDEBUG("Queueing Lua script: " + script);
+        OsEng.scriptEngine().queueScript(script, scripting::ScriptEngine::RemoteScripting::No);
+    }
+    catch (std::out_of_range& e) {
+        LERROR("Could run script -- key or value is missing in payload");
+        LERROR(e.what());
+    }
+}
+
+}
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
new file mode 100644
index 0000000000..a371afcaed
--- /dev/null
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -0,0 +1,73 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/query/query.h>
+#include <openspace/properties/property.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/util/timemanager.h>
+#include <ghoul/logging/logmanager.h>
+#include <modules/server/include/setpropertytopic.h>
+
+namespace {
+const std::string PropertyKey = "property";
+const std::string ValueKey = "value";
+const std::string _loggerCat = "SetPropertyTopic";
+const std::string SpecialKeyTime = "__time";
+}
+
+namespace openspace {
+
+void SetPropertyTopic::handleJson(nlohmann::json json) {
+    try {
+        auto propertyKey = json.at(PropertyKey).get<std::string>();
+        auto value = json.at(ValueKey).get<std::string>();
+
+        if (propertyKey == SpecialKeyTime) {
+            setTime(value);
+        }
+        else {
+            auto prop = property(propertyKey);
+            if (prop != nullptr) {
+                LDEBUG("Setting " + propertyKey + " to " + value + ".");
+                if (!prop->setStringValue(value)) {
+                    LERROR("Failed!");
+                }
+            }
+        }
+    }
+    catch (std::out_of_range& e) {
+        LERROR("Could not set property -- key or value is missing in payload");
+        LERROR(e.what());
+    }
+    catch (ghoul::RuntimeError e) {
+        LERROR("Could not set property -- runtime error:");
+        LERROR(e.what());
+    }
+}
+
+void SetPropertyTopic::setTime(const std::string& timeValue) {
+    OsEng.timeManager().time().setTime(timeValue);
+}
+
+}
diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp
new file mode 100644
index 0000000000..bc1bd1845b
--- /dev/null
+++ b/modules/server/src/topics/subscriptiontopic.cpp
@@ -0,0 +1,98 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/query/query.h>
+#include <openspace/properties/property.h>
+#include <modules/server/include/jsonconverters.h>
+#include "include/subscriptiontopic.h"
+
+namespace {
+const char* _loggerCat = "SubscriptionTopic";
+const char* PropertyKey = "property";
+const char* EventKey = "event";
+
+const char* StartSubscription = "start_subscription";
+const char* StopSubscription = "stop_subscription";
+
+const int UnsetCallbackHandle = -1;
+}
+
+using nlohmann::json;
+
+namespace openspace {
+
+    SubscriptionTopic::SubscriptionTopic()
+        : Topic()
+        , _requestedResourceIsSubscribable(false)
+        , _onChangeHandle(UnsetCallbackHandle)
+        , _onDeleteHandle(UnsetCallbackHandle) {}
+
+SubscriptionTopic::~SubscriptionTopic() {
+    if (_onChangeHandle != UnsetCallbackHandle) {
+        _prop->removeOnChange(_onChangeHandle);
+    }
+    if (!_onDeleteHandle) {
+        _prop->removeOnDelete(_onDeleteHandle);
+    }
+}
+
+bool SubscriptionTopic::isDone() {
+    return !_requestedResourceIsSubscribable || !_isSubscribedTo;
+}
+
+void SubscriptionTopic::handleJson(json j) {
+    std::string key = j.at(PropertyKey).get<std::string>();
+    std::string event = j.at(EventKey).get<std::string>();
+
+    if (event == StartSubscription) {
+        LDEBUG("Subscribing to property '" + key + "'...");
+
+        _prop = property(key);
+        if (_prop != nullptr) {
+            _requestedResourceIsSubscribable = true;
+            _isSubscribedTo = true;
+            auto onChange = [this, key]() {
+                LDEBUG("Updating subscription '" + key + "'.");
+                _connection->sendJson(wrappedPayload(_prop));
+            };
+            _onChangeHandle = _prop->onChange(onChange);
+            _prop->onDelete([this]() {
+                _onChangeHandle = UnsetCallbackHandle;
+                _onDeleteHandle = UnsetCallbackHandle;
+                _isSubscribedTo = false;
+            });
+
+            // immediately send the value
+            onChange();
+        }
+        else {
+            LWARNING("Could not subscribe. Property '" + key + "' not found.");
+        }
+    }
+    if (event == StopSubscription) {
+        _isSubscribedTo = false;
+    }
+}
+
+} // namespace openspace
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
new file mode 100644
index 0000000000..2f0f7419b2
--- /dev/null
+++ b/modules/server/src/topics/timetopic.cpp
@@ -0,0 +1,108 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/query/query.h>
+#include <openspace/properties/property.h>
+#include "modules/server/include/connection.h"
+#include "modules/server/include/timetopic.h"
+#include <chrono>
+
+namespace {
+const char* _loggerCat = "TimeTopic";
+const char* PropertyKey = "property";
+const char* CurrentTimeKey = "currentTime";
+const char* DeltaTimeKey = "deltaTime";
+const int UNSET_ONCHANGE_HANDLE = -1;
+const std::chrono::milliseconds TimeUpdateInterval(100);
+}
+
+using nlohmann::json;
+
+namespace openspace {
+
+TimeTopic::TimeTopic()
+    : Topic()
+    , _timeCallbackHandle(UNSET_ONCHANGE_HANDLE)
+    , _deltaTimeCallbackHandle(UNSET_ONCHANGE_HANDLE)
+    , _lastUpdateTime(std::chrono::system_clock::now())
+{
+    LDEBUG("Starting new time subscription");
+}
+
+TimeTopic::~TimeTopic() {
+    if (_timeCallbackHandle != UNSET_ONCHANGE_HANDLE) {
+        OsEng.timeManager().removeTimeChangeCallback(_timeCallbackHandle);
+    }
+    if (_deltaTimeCallbackHandle != UNSET_ONCHANGE_HANDLE) {
+        OsEng.timeManager().removeDeltaTimeChangeCallback(_deltaTimeCallbackHandle);
+    }
+}
+
+bool TimeTopic::isDone() {
+    return false;
+}
+
+void TimeTopic::handleJson(json j) {
+
+    std::string requestedKey = j.at(PropertyKey).get<std::string>();
+    LDEBUG("Subscribing to " + requestedKey);
+
+    if (requestedKey == CurrentTimeKey) {
+        _timeCallbackHandle = OsEng.timeManager().addTimeChangeCallback([this]() {
+            std::chrono::system_clock::time_point now = std::chrono::system_clock::now();
+            if (now - _lastUpdateTime > TimeUpdateInterval) {
+                _connection->sendJson(currentTime());
+                _lastUpdateTime = now;
+            }
+        });
+        _connection->sendJson(currentTime());
+    }
+    else if (requestedKey == DeltaTimeKey) {
+        _deltaTimeCallbackHandle = OsEng.timeManager().addDeltaTimeChangeCallback(
+            [this]() {
+                _connection->sendJson(deltaTime());
+                if (_timeCallbackHandle != UNSET_ONCHANGE_HANDLE) {
+                    _connection->sendJson(currentTime());
+                    _lastUpdateTime = std::chrono::system_clock::now();;
+                }
+            }
+        );
+        _connection->sendJson(deltaTime());
+    }
+    else {
+        LWARNING("Cannot get " + requestedKey);
+    }
+}
+
+json TimeTopic::currentTime() {
+    json timeJson = { { "time", OsEng.timeManager().time().ISO8601() } };
+    return wrappedPayload(timeJson);
+}
+
+json TimeTopic::deltaTime() {
+    json timeJson = { { "deltaTime", OsEng.timeManager().time().deltaTime() } };
+    return wrappedPayload(timeJson);
+}
+
+} // namespace openspace
diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp
new file mode 100644
index 0000000000..6be5b7349b
--- /dev/null
+++ b/modules/server/src/topics/topic.cpp
@@ -0,0 +1,58 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/servermodule.h>
+#include <modules/server/include/topic.h>
+
+namespace openspace {
+
+void Topic::initialize(Connection* connection, size_t topicId) {
+    _connection = connection;
+    _topicId = topicId;
+};
+
+nlohmann::json Topic::wrappedPayload(const nlohmann::json &payload) const {
+    // TODO: add message time
+    nlohmann::json j = {
+        { "topic", _topicId },
+        { "payload", payload }
+    };
+    return j;
+};
+
+nlohmann::json Topic::wrappedError(std::string message, int code) {
+    nlohmann::json j = {
+        { "topic", _topicId },
+        { "status", "error" },
+        { "message", message },
+        { "code", code }
+    };
+    return j;
+};
+
+void BounceTopic::handleJson(nlohmann::json json) {
+    _connection->sendJson(json);
+};
+
+}
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
new file mode 100644
index 0000000000..144414a6a6
--- /dev/null
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -0,0 +1,63 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/query/query.h>
+#include <openspace/properties/property.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/util/timemanager.h>
+#include <ghoul/logging/logmanager.h>
+#include <modules/server/include/triggerpropertytopic.h>
+
+namespace {
+const std::string PropertyKey = "property";
+const std::string ValueKey = "value";
+const std::string _loggerCat = "TriggerPropertyTopic";
+}
+
+namespace openspace {
+
+void TriggerPropertyTopic::handleJson(nlohmann::json json) {
+    try {
+        auto propertyKey = json.at(PropertyKey).get<std::string>();
+
+        auto prop = property(propertyKey);
+        if (prop != nullptr) {
+            LDEBUG("Triggering " + propertyKey);
+            prop->set("poke");
+        } 
+        else {
+            LWARNING("Could not find property " + propertyKey);
+        }
+    }
+    catch (std::out_of_range& e) {
+        LERROR("Could not poke property -- key or value is missing in payload");
+        LERROR(e.what());
+    }
+    catch (ghoul::RuntimeError e) {
+        LERROR("Could not poke property -- runtime error:");
+        LERROR(e.what());
+    }
+}
+
+}
diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp
index 2d5e02a9c5..0611908e5f 100644
--- a/modules/space/rendering/renderableplanet.cpp
+++ b/modules/space/rendering/renderableplanet.cpp
@@ -51,6 +51,7 @@
 #include <math.h>
 
 namespace {
+    constexpr const char* KeyBody         = "Body";
     constexpr const char* KeyGeometry     = "Geometry";
     constexpr const char* KeyRadius       = "Radius";
     constexpr const char* _loggerCat      = "RenderablePlanet";
@@ -118,7 +119,15 @@ documentation::Documentation RenderablePlanet::Documentation() {
                 new DoubleVerifier,
                 Optional::Yes,
                 "Specifies the radius of the planet. If this value is not specified, it "
-                "will try to query the SPICE library for radius values."
+                "will try to query the SPICE library for radius values using the body "
+                "key."
+            },
+            {
+                KeyBody,
+                new StringVerifier,
+                Optional::Yes,
+                "If that radius is not specified, this name is used to query the SPICE "
+                "library for the radius values."
             },
             {
                 ColorTextureInfo.identifier,
@@ -178,38 +187,44 @@ RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary)
     , _shadowEnabled(false)
     , _time(0.f)
 {
-    ghoul_precondition(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyName),
-        "RenderablePlanet needs the name to be specified"
-    );
-
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
         "RenderablePlanet"
     );
 
-    const std::string name = dictionary.value<std::string>(SceneGraphNode::KeyName);
-
     ghoul::Dictionary geomDict = dictionary.value<ghoul::Dictionary>(KeyGeometry);
 
     if (dictionary.hasKey(KeyRadius)) {
         // If the user specified a radius, we want to use this
         _planetRadius = static_cast<float>(dictionary.value<double>(KeyRadius));
     }
-    else if (SpiceManager::ref().hasValue(name, "RADII") ) {
+    else {
+        if (!dictionary.hasKey(KeyBody)) {
+            documentation::TestResult res;
+            res.success = false;
+            documentation::TestResult::Offense offense = {
+                fmt::format("{} or {}", KeyRadius, KeyBody),
+                documentation::TestResult::Offense::Reason::MissingKey
+            };
+            res.offenses.push_back(std::move(offense));
+            throw documentation::SpecificationError(
+                std::move(res),
+                std::move("RenderablePlanet")
+            );
+        }
+
+        const std::string body = dictionary.value<std::string>(KeyBody);
+
         // If the user didn't specfify a radius, but Spice has a radius, we can use this
         glm::dvec3 radius;
-        SpiceManager::ref().getValue(name, "RADII", radius);
+        SpiceManager::ref().getValue(body, "RADII", radius);
         radius *= 1000.0; // Spice gives radii in KM.
         std::swap(radius[1], radius[2]); // z is equivalent to y in our coordinate system
         geomDict.setValue(KeyRadius, radius);
 
         _planetRadius = static_cast<float>((radius.x + radius.y + radius.z) / 3.0);
     }
-    else {
-        LERRORC("RenderablePlanet", "Missing radius specification");
-    }
 
     _geometry = planetgeometry::PlanetGeometry::createFromDictionary(geomDict);
 
@@ -282,7 +297,7 @@ RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary)
                         "No Radius value specified for Shadow Source Name '{}' from "
                         "'{}' planet. Disabling shadows for this planet",
                         sourceName,
-                        name
+                        identifier()
                     ));
                     disableShadows = true;
                     break;
@@ -311,7 +326,7 @@ RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary)
                             "No Radius value expecified for Shadow Caster Name '{}' from "
                             "'{}' planet. Disabling shadows for this planet.",
                             casterName,
-                            name
+                            identifier()
                         ));
                         disableShadows = true;
                         break;
diff --git a/modules/space/translation/tletranslation.cpp b/modules/space/translation/tletranslation.cpp
index 19b4e1bfa8..53cc49386e 100644
--- a/modules/space/translation/tletranslation.cpp
+++ b/modules/space/translation/tletranslation.cpp
@@ -28,15 +28,14 @@
 #include <ghoul/filesystem/file.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/assert.h>
-
 #include <chrono>
 #include <fstream>
-#include <vector>
 #include <system_error>
+#include <vector>
 
 namespace {
-    const char* KeyFile = "File";
-    const char* KeyLineNum = "LineNum";
+    constexpr const char* KeyFile = "File";
+    constexpr const char* KeyLineNumber = "LineNumber";
 
     // The list of leap years only goes until 2056 as we need to touch this file then
     // again anyway ;)
@@ -249,7 +248,7 @@ documentation::Documentation TLETranslation::Documentation() {
                 "Specifies the filename of the Two-Line-Element file"
             },
             {
-                KeyLineNum,
+                KeyLineNumber,
                 new DoubleGreaterVerifier(0),
                 Optional::No,
                 "Specifies the line number within the file where the group of 3 TLE "
@@ -269,7 +268,7 @@ TLETranslation::TLETranslation(const ghoul::Dictionary& dictionary)
     );
 
     std::string file = dictionary.value<std::string>(KeyFile);
-    int lineNum = static_cast<int>(dictionary.value<double>(KeyLineNum));
+    int lineNum = static_cast<int>(dictionary.value<double>(KeyLineNumber));
     readTLEFile(file, lineNum);
 }
 
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index b4b584bd01..8578873d69 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -132,16 +132,9 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
         dictionary,
         "RenderableModelProjection"
     );
-
-    std::string name;
-    [[ maybe_unused ]] bool success = dictionary.getValue(SceneGraphNode::KeyName, name);
-    ghoul_assert(success, "Name was not passed to RenderableModelProjection");
-
     using ghoul::Dictionary;
     Dictionary geometryDictionary = dictionary.value<Dictionary>(keyGeometry);
-    using modelgeometry::ModelGeometry;
-    geometryDictionary.setValue(SceneGraphNode::KeyName, name);
-    _geometry = ModelGeometry::createFromDictionary(geometryDictionary);
+    _geometry = modelgeometry::ModelGeometry::createFromDictionary(geometryDictionary);
 
     _colorTexturePath = absPath(dictionary.value<std::string>(
         ColorTextureInfo.identifier
@@ -154,6 +147,7 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
     _colorTexturePath.onChange(std::bind(&RenderableModelProjection::loadTextures, this));
 
     _projectionComponent.initialize(
+        identifier(),
         dictionary.value<ghoul::Dictionary>(keyProjection)
     );
 
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index ae5f31066c..a940d39a74 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -200,19 +200,18 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
         "RenderablePlanetProjection"
     );
 
-    std::string name;
-    bool success = dict.getValue(SceneGraphNode::KeyName, name);
-    ghoul_assert(success, "");
-
     ghoul::Dictionary geometryDictionary;
-    success = dict.getValue(KeyGeometry, geometryDictionary);
+    bool success = dict.getValue(KeyGeometry, geometryDictionary);
     if (success) {
-        geometryDictionary.setValue(SceneGraphNode::KeyName, name);
-        using planetgeometry::PlanetGeometry;
-        _geometry = PlanetGeometry::createFromDictionary(geometryDictionary);
+        _geometry = planetgeometry::PlanetGeometry::createFromDictionary(
+            geometryDictionary
+        );
     }
 
-    _projectionComponent.initialize(dict.value<ghoul::Dictionary>(KeyProjection));
+    _projectionComponent.initialize(
+        identifier(),
+        dict.value<ghoul::Dictionary>(KeyProjection)
+    );
 
     _colorTexturePaths.addOption(0, NoImageText);
     _colorTexturePaths.onChange([this](){
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 292939f768..c5ff8e8599 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -153,7 +153,8 @@ documentation::Documentation ProjectionComponent::Documentation() {
             {
                 keySequenceType,
                 new StringInListVerifier(
-                    { sequenceTypeImage, sequenceTypePlaybook, sequenceTypeHybrid }
+                    { sequenceTypeImage, sequenceTypePlaybook, sequenceTypeHybrid,
+                      sequenceTypeInstrumentTimes }
                 ),
                 Optional::Yes,
                 "This value determines which type of sequencer is used for generating "
@@ -246,7 +247,9 @@ ProjectionComponent::ProjectionComponent()
     _applyTextureSize.onChange([this]() { _textureSizeDirty = true; });
 }
 
-void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
+void ProjectionComponent::initialize(const std::string& identifier,
+                                     const ghoul::Dictionary& dictionary)
+{
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
@@ -289,9 +292,6 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
             static_cast<float>(dictionary.value<double>(keyTextureMapAspectRatio));
     }
 
-    std::string name;
-    dictionary.getValue(SceneGraphNode::KeyName, name);
-
     std::vector<SequenceParser*> parsers;
 
     if (dictionary.hasKey(keySequenceDir)) {
@@ -323,7 +323,7 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
             for (std::string& sequenceSource : sequenceSources) {
                 if (sequenceType == sequenceTypePlaybook) {
                     parsers.push_back(new HongKangParser(
-                        name,
+                        identifier,
                         std::move(sequenceSource),
                         _projectorID,
                         translationDictionary,
@@ -331,14 +331,14 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
                 }
                 else if (sequenceType == sequenceTypeImage) {
                     parsers.push_back(new LabelParser(
-                        name,
+                        identifier,
                         std::move(sequenceSource),
                         translationDictionary));
                 }
                 else if (sequenceType == sequenceTypeHybrid) {
                     //first read labels
                     parsers.push_back(new LabelParser(
-                        name,
+                        identifier,
                         std::move(sequenceSource),
                         translationDictionary));
 
@@ -348,7 +348,7 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
                         //then read playbook
                         _eventFile = absPath(_eventFile);
                         parsers.push_back(new HongKangParser(
-                            name,
+                            identifier,
                             _eventFile,
                             _projectorID,
                             translationDictionary,
@@ -360,7 +360,7 @@ void ProjectionComponent::initialize(const ghoul::Dictionary& dictionary) {
                 }
                 else if (sequenceType == sequenceTypeInstrumentTimes) {
                     parsers.push_back(new InstrumentTimesParser(
-                        name,
+                        identifier,
                         std::move(sequenceSource),
                         translationDictionary)
                     );
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index f4b5bb0848..4a09214c80 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -48,7 +48,7 @@ class ProjectionComponent : public properties::PropertyOwner {
 public:
     ProjectionComponent();
 
-    void initialize(const ghoul::Dictionary& dictionary);
+    void initialize(const std::string& identifier, const ghoul::Dictionary& dictionary);
     bool initializeGL();
     bool deinitialize();
 
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 5e82dda7a4..2d5bc22af4 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -99,19 +99,25 @@ RenderablePlaneSpout::RenderablePlaneSpout(const ghoul::Dictionary& dictionary)
         "RenderablePlaneSpout"
     );
 
-    if (dictionary.hasKey(KeyName)) {
-        setName(dictionary.value<std::string>(KeyName));
-    }
-    else {
+    int iIdentifier = 0;
+    if (_identifier.empty()) {
         static int id = 0;
-        if (id == 0) {
-            setName("ScreenSpaceSpout");
+        iIdentifier = id;
+
+        if (iIdentifier == 0) {
+            setIdentifier("ScreenSpaceSpout");
         }
         else {
-            setName("ScreenSpaceSpout  " + std::to_string(id));
+            setIdentifier("ScreenSpaceSpout" + std::to_string(iIdentifier));
         }
         ++id;
     }
+
+    if (_guiName.empty()) {
+        // Adding an extra space to the user-facing name as it looks nicer
+        setGuiName("ScreenSpaceSpout " + std::to_string(iIdentifier));
+    }
+
     _isSpoutDirty = true;
 
     if (dictionary.hasKey(NameInfo.identifier)) {
diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp
index c515b2b7ce..ba5b4e7b96 100644
--- a/modules/spout/screenspacespout.cpp
+++ b/modules/spout/screenspacespout.cpp
@@ -94,19 +94,25 @@ ScreenSpaceSpout::ScreenSpaceSpout(const ghoul::Dictionary& dictionary)
         "ScreenSpaceSpout"
     );
 
-    if (dictionary.hasKey(KeyName)) {
-        setName(dictionary.value<std::string>(KeyName));
-    }
-    else {
+    int iIdentifier = 0;
+    if (_identifier.empty()) {
         static int id = 0;
-        if (id == 0) {
-            setName("ScreenSpaceSpout");
+        iIdentifier = id;
+
+        if (iIdentifier == 0) {
+            setIdentifier("ScreenSpaceSpout");
         }
         else {
-            setName("ScreenSpaceSpout  " + std::to_string(id));
+            setIdentifier("ScreenSpaceSpout" + std::to_string(iIdentifier));
         }
         ++id;
     }
+
+    if (_guiName.empty()) {
+        // Adding an extra space to the user-facing name as it looks nicer
+        setGuiName("ScreenSpaceSpout " + std::to_string(iIdentifier));
+    }
+
     _isSpoutDirty = true;
 
     if (dictionary.hasKey(NameInfo.identifier)) {
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 93ac3f24e2..b1eb47d5e7 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -22,27 +22,27 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include "httpsynchronization.h"
+#include <modules/sync/syncs/httpsynchronization.h>
 
 #include <modules/sync/syncmodule.h>
-
+#include <openspace/documentation/verifier.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/util/httprequest.h>
-
-#include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <openspace/documentation/verifier.h>
-
-#include <sstream>
+#include <ghoul/logging/logmanager.h>
+#include <cstdio>
 #include <fstream>
 #include <numeric>
 #include <memory>
+#include <sstream>
 
 namespace {
     constexpr const char* KeyIdentifier = "Identifier";
     constexpr const char* KeyVersion = "Version";
 
+    constexpr const char* TempSuffix = ".tmp";
+
     constexpr const char* QueryKeyIdentifier = "identifier";
     constexpr const char* QueryKeyFileVersion = "file_version";
     constexpr const char* QueryKeyApplicationVersion = "application_version";
@@ -214,8 +214,8 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
         std::string filename = line.substr(lastSlash + 1);
 
         std::string fileDestination = directory() +
-        ghoul::filesystem::FileSystem::PathSeparator +
-        filename;
+            ghoul::filesystem::FileSystem::PathSeparator +
+            filename + TempSuffix;
 
         downloads.push_back(std::make_unique<AsyncHttpFileDownload>(
             line, fileDestination, HttpFileDownload::Overwrite::Yes));
@@ -256,7 +256,31 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
     bool failed = false;
     for (std::unique_ptr<AsyncHttpFileDownload>& d : downloads) {
         d->wait();
-        if (!d->hasSucceeded()) {
+        if (d->hasSucceeded()) {
+            // If we are forcing the override, we download to a temporary file
+            // first, so when we are done here, we need to rename the file to the
+            // original name
+
+            const std::string& tempName = d->destination();
+            std::string originalName = tempName.substr(
+                0,
+                tempName.size() - strlen(TempSuffix)
+            );
+
+            FileSys.deleteFile(originalName);
+            int success = rename(tempName.c_str(), originalName.c_str());
+            if (success != 0) {
+                LERRORC(
+                    "HTTPSynchronization",
+                    fmt::format(
+                        "Error renaming file {} to {}", tempName, originalName
+                    )
+                );
+
+                failed = true;
+            }
+        }
+        else {
             failed = true;
         }
     }
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index d261ae1119..11ee8b6e21 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -35,10 +35,14 @@
 #include <fstream>
 #include <numeric>
 #include <memory>
+#include <cstdio>
 
 namespace {
     constexpr const char* KeyUrl = "Url";
     constexpr const char* KeyIdentifier = "Identifier";
+    constexpr const char* KeyOverride = "Override";
+
+    constexpr const char* TempSuffix = ".tmp";
 } // namespace
 
 namespace openspace {
@@ -63,6 +67,16 @@ documentation::Documentation UrlSynchronization::Documentation() {
                 "This optional identifier will be part of the used folder structure and, "
                 "if provided, can be used to manually find the downloaded folder in the "
                 "synchronization folder."
+            },
+            {
+                KeyOverride,
+                new BoolVerifier,
+                Optional::Yes,
+                "If this value is set to 'true' and it is not overwritten by the global "
+                "settings, the file(s) pointed to by this URLSynchronization will always "
+                "be downloaded, thus overwriting the local files. This is useful for "
+                "files that are updated regularly remotely and should be fetch at every "
+                "startup."
             }
         }
     };
@@ -101,6 +115,10 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict,
     else {
         _identifier = std::to_string(hash);
     }
+
+    if (dict.hasValue<bool>(KeyOverride)) {
+        _forceOverride = dict.value<bool>(KeyOverride);
+    }
 }
 
 UrlSynchronization::~UrlSynchronization() {
@@ -116,7 +134,7 @@ void UrlSynchronization::start() {
     }
     begin();
 
-    if (hasSyncFile()) {
+    if (hasSyncFile() && !_forceOverride) {
         resolve();
         return;
     }
@@ -134,7 +152,7 @@ void UrlSynchronization::start() {
 
             std::string fileDestination = directory() +
                 ghoul::filesystem::FileSystem::PathSeparator +
-                filename;
+                filename += TempSuffix;
 
             std::unique_ptr<AsyncHttpFileDownload> download =
                 std::make_unique<AsyncHttpFileDownload>(
@@ -174,7 +192,6 @@ void UrlSynchronization::start() {
             HttpRequest::RequestOptions opt;
             opt.requestTimeoutSeconds = 0;
             fileDownload->start(opt);
-
         }
 
         startedAllDownloads = true;
@@ -182,7 +199,31 @@ void UrlSynchronization::start() {
         bool failed = false;
         for (std::unique_ptr<AsyncHttpFileDownload>& d : downloads) {
             d->wait();
-            if (!d->hasSucceeded()) {
+            if (d->hasSucceeded()) {
+                // If we are forcing the override, we download to a temporary file first,
+                // so when we are done here, we need to rename the file to the original
+                // name
+                
+                const std::string& tempName = d->destination();
+                std::string originalName = tempName.substr(
+                    0,
+                    tempName.size() - strlen(TempSuffix)
+                );
+
+                FileSys.deleteFile(originalName);
+                int success = rename(tempName.c_str(), originalName.c_str());
+                if (success != 0) {
+                    LERRORC(
+                        "URLSynchronization",
+                        fmt::format(
+                            "Error renaming file {} to {}", tempName, originalName
+                        )
+                    );
+
+                    failed = true;
+                }
+            }
+            else {
                 failed = true;
             }
         }
@@ -191,7 +232,7 @@ void UrlSynchronization::start() {
             createSyncFile();
         }
         else {
-            for (auto& d : downloads) {
+            for (std::unique_ptr<AsyncHttpFileDownload>& d : downloads) {
                 d->cancel();
             }
         }
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index 639fa1b1d3..5e7c458ea3 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -55,6 +55,7 @@ private:
     std::string directory() override;
 
     std::vector<std::string> _urls;
+    bool _forceOverride = false;
     std::string _synchronizationRoot;
     std::string _identifier;
 
diff --git a/modules/touch/ext/levmarq.cpp b/modules/touch/ext/levmarq.cpp
index ce924fb92e..2fecba156b 100644
--- a/modules/touch/ext/levmarq.cpp
+++ b/modules/touch/ext/levmarq.cpp
@@ -23,10 +23,14 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdio.h>
 #include <math.h>
+#include <chrono>
 #include <modules/touch/ext/levmarq.h>
+#include <ghoul/logging/logmanager.h>
 
-#define TOL 1e-30 // smallest value allowed in cholesky_decomp()
-
+namespace {
+    std::chrono::milliseconds TimeLimit(200);
+    double TOL = 1e-30; // smallest value allowed in cholesky_decomp()
+}
 
 // set parameters required by levmarq() to default values 
 void levmarq_init(LMstat *lmstat) {
@@ -120,8 +124,19 @@ bool levmarq(int npar, double *par, int ny, double *dysq,
     lmstat->pos.clear();
     err = error_func(par, ny, dysq, func, fdata, lmstat);
 
+    std::chrono::system_clock::time_point start =
+        std::chrono::system_clock::now();
+
     // main iteration
     for (it = 0; it < nit; it++) {
+        std::chrono::system_clock::time_point now =
+            std::chrono::system_clock::now();
+
+        if (now - start > TimeLimit) {
+            LDEBUGC("Touch Levmarq", "Bail out due to time limit!");
+            return false;
+        }
+
         // calculate the approximation to the Hessian and the "derivative" d
         for (i = 0; i < npar; i++) {
             d[i] = 0;
diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h
index f4a94502df..1d55b81793 100644
--- a/modules/touch/include/touchinteraction.h
+++ b/modules/touch/include/touchinteraction.h
@@ -37,6 +37,8 @@
 #include <openspace/properties/vector/ivec2property.h>
 #include <openspace/properties/vector/vec4property.h>
 
+//#define TOUCH_DEBUG_PROPERTIES
+
 namespace openspace {
 
 class Camera;
@@ -62,7 +64,7 @@ public:
     // Stores the selected node, the cursor ID as well as the surface coordinates the
     // cursor touched
     struct SelectedBody {
-        int id;
+        long id;
         SceneGraphNode* node;
         glm::dvec3 coordinates;
     };
@@ -170,13 +172,34 @@ private:
     properties::FloatProperty _rollAngleThreshold;
     properties::FloatProperty _orbitSpeedThreshold;
     properties::FloatProperty _spinSensitivity;
+    properties::FloatProperty _zoomSensitivity;
+    properties::FloatProperty _zoomSensitivityDistanceThreshold;
+    properties::FloatProperty _zoomBoundarySphereMultiplier;
     properties::FloatProperty _inputStillThreshold;
     properties::FloatProperty _centroidStillThreshold;
+    properties::BoolProperty  _panEnabled;
     properties::FloatProperty _interpretPan;
     properties::FloatProperty _slerpTime;
     properties::IVec2Property _guiButton;
     properties::Vec4Property _friction;
     properties::FloatProperty _pickingRadiusMinimum;
+    properties::BoolProperty _ignoreGui;
+
+#ifdef TOUCH_DEBUG_PROPERTIES
+    struct DebugProperties : PropertyOwner {
+        DebugProperties();
+        properties::StringProperty interactionMode;
+        properties::IntProperty nFingers;
+        properties::StringProperty interpretedInteraction;
+        properties::FloatProperty normalizedCentroidDistance;
+        properties::FloatProperty minDiff;
+        properties::FloatProperty rollOn;
+    } _debugProperties;
+
+    int pinchConsecCt = 0;
+    double pinchConsecZoomFactor = 0;
+    //int stepVelUpdate = 0;
+#endif
 
     // Class variables
     VelocityStates _vel;
diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h
index 0da92619a0..b3aa625576 100644
--- a/modules/touch/include/touchmarker.h
+++ b/modules/touch/include/touchmarker.h
@@ -67,6 +67,7 @@ private:
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
     UniformCache(radius, transparency, thickness, color) _uniformCache;
 
+    std::vector<GLfloat> _vertexData;
     GLuint _quad = 0;
     GLuint _vertexPositionBuffer = 0;
     int _numFingers = 0;
diff --git a/modules/touch/include/tuioear.h b/modules/touch/include/tuioear.h
index 93c85275a9..9121744fe2 100644
--- a/modules/touch/include/tuioear.h
+++ b/modules/touch/include/tuioear.h
@@ -25,11 +25,17 @@
 #ifndef __OPENSPACE_MODULE_TOUCH___TUIO_EAR___H__
 #define __OPENSPACE_MODULE_TOUCH___TUIO_EAR___H__
 
+// -Wold-style-cast
 #if (defined(__GNUC__) && !defined(__clang__))
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif // defined(__GNUC__) && !defined(__clang__)
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#endif // __clang__
+
 #include <modules/touch/ext/libTUIO11/TUIO/TuioListener.h>
 #include <modules/touch/ext/libTUIO11/TUIO/TuioClient.h>
 #include <modules/touch/ext/libTUIO11/TUIO/UdpReceiver.h>
@@ -38,6 +44,9 @@
 #if (defined(__GNUC__) && !defined(__clang__))
 #pragma GCC diagnostic pop
 #endif // defined(__GNUC__) && !defined(__clang__)
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif // __clang__
 
 #include <ghoul/glm.h>
 
@@ -95,7 +104,7 @@ class TuioEar : public TUIO::TuioListener {
         void clearInput();
 
     private:
-        bool _tap;
+        bool _tap = false;
         TUIO::TuioCursor _tapCo = TUIO::TuioCursor(-1, -1, -1.0f, -1.0f);
         std::mutex _mx;
 
@@ -107,7 +116,7 @@ class TuioEar : public TUIO::TuioListener {
         /**
         * A list that tracks all of the cursor ID's that got removed since last frame
         */
-        std::vector<int> _removeList;
+        std::vector<long> _removeList;
 };
 
 #endif // __OPENSPACE_MODULE_TOUCH___TUIO_EAR___H__
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 736136920f..e694c39505 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -61,7 +61,6 @@
 #pragma warning (pop)
 #endif // WIN32
 
-
 #include <openspace/engine/wrapper/windowwrapper.h>
 #include <openspace/interaction/navigationhandler.h>
 
@@ -141,6 +140,24 @@ namespace {
         "" // @TODO Missing documentation
     };
 
+    static const openspace::properties::Property::PropertyInfo ZoomSensitivityInfo = {
+        "ZoomSensitivity",
+        "Sensitivity of exponential zooming in relation to distance from focus node",
+        "" // @TODO Missing documentation
+    };
+
+    static const openspace::properties::Property::PropertyInfo ZoomSensitivityDistanceThresholdInfo = {
+        "ZoomSensitivityDistanceThreshold",
+        "Threshold of distance to target node for whether or not to use exponential zooming",
+        "" // @TODO Missing documentation
+    };
+
+    static const openspace::properties::Property::PropertyInfo ZoomBoundarySphereMultiplierInfo = {
+        "ZoomBoundarySphereMultiplier",
+        "Multiplies a node's boundary sphere by this in order to limit zoom & prevent surface collision",
+        "" // @TODO Missing documentation
+    };
+
     static const openspace::properties::Property::PropertyInfo InputSensitivityInfo = {
         "InputSensitivity",
         "Threshold for interpreting input as still",
@@ -153,6 +170,12 @@ namespace {
         "" // @TODO Missing documentation
     };
 
+    static const openspace::properties::Property::PropertyInfo PanModeInfo = {
+        "PanMode",
+        "Allow panning gesture",
+        "" // @TODO Missing documentation
+    };
+
     static const openspace::properties::Property::PropertyInfo PanDeltaDistanceInfo = {
         "PanDeltaDistance",
         "Delta distance between fingers allowed for interpreting pan interaction",
@@ -202,9 +225,13 @@ TouchInteraction::TouchInteraction()
     , _rollAngleThreshold(RollThresholdInfo, 0.025f, 0.f, 0.05f)
     , _orbitSpeedThreshold(OrbitSpinningThreshold, 0.005f, 0.f, 0.01f)
     , _spinSensitivity(SpinningSensitivityInfo, 1.f, 0.f, 2.f)
+    , _zoomSensitivity(ZoomSensitivityInfo, 1.025f, 1.0f, 1.1f)
+    , _zoomSensitivityDistanceThreshold(ZoomSensitivityDistanceThresholdInfo, 0.05, 0.01, 0.25)
+    , _zoomBoundarySphereMultiplier(ZoomBoundarySphereMultiplierInfo, 1.001, 1.0, 1.01)
     , _inputStillThreshold(InputSensitivityInfo, 0.0005f, 0.f, 0.001f)
     // used to void wrongly interpreted roll interactions
     , _centroidStillThreshold(StationaryCentroidInfo, 0.0018f, 0.f, 0.01f)
+    , _panEnabled(PanModeInfo, false)
     , _interpretPan(PanDeltaDistanceInfo, 0.015f, 0.f, 0.1f)
     , _slerpTime(SlerpTimeInfo, 3.f, 0.f, 5.f)
     , _guiButton(
@@ -215,11 +242,20 @@ TouchInteraction::TouchInteraction()
     )
     , _friction(
         FrictionInfo,
-        glm::vec4(0.01f, 0.025f, 0.02f, 0.02f),
+        glm::vec4(0.025f, 0.025f, 0.02f, 0.02f),
         glm::vec4(0.f),
         glm::vec4(0.2f)
     )
-    , _pickingRadiusMinimum(PickingRadiusInfo, 0.1f, 0.f, 1.f)
+    , _pickingRadiusMinimum(
+        { "Picking Radius", "Minimum radius for picking in NDC coordinates", "" },
+        0.1f,
+        0.f,
+        1.f
+    )
+    , _ignoreGui(
+        { "Ignore GUI", "Disable GUI touch interaction", "" }, // @TODO Missing documentation
+        false
+    )
     , _vel{ glm::dvec2(0.0), 0.0, 0.0, glm::dvec2(0.0) }
     , _sensitivity{ glm::dvec2(0.08, 0.045), 4.0, 2.75, glm::dvec2(0.08, 0.045) }
     // calculated with two vectors with known diff in length, then
@@ -234,6 +270,9 @@ TouchInteraction::TouchInteraction()
     , _doubleTap(false)
     , _lmSuccess(true)
     , _guiON(false)
+#ifdef TOUCH_DEBUG_PROPERTIES
+    , _debugProperties()
+#endif
     , _centroid(glm::dvec3(0.0))
 {
     addProperty(_touchActive);
@@ -247,13 +286,22 @@ TouchInteraction::TouchInteraction()
     addProperty(_rollAngleThreshold);
     addProperty(_orbitSpeedThreshold);
     addProperty(_spinSensitivity);
+    addProperty(_zoomSensitivity);
+    addProperty(_zoomSensitivityDistanceThreshold);
+    addProperty(_zoomBoundarySphereMultiplier);
     addProperty(_inputStillThreshold);
     addProperty(_centroidStillThreshold);
+    addProperty(_panEnabled);
     addProperty(_interpretPan);
     addProperty(_slerpTime);
     addProperty(_guiButton);
     addProperty(_friction);
     addProperty(_pickingRadiusMinimum);
+    addProperty(_ignoreGui);
+
+#ifdef TOUCH_DEBUG_PROPERTIES
+    addPropertySubOwner(_debugProperties);
+#endif
 
     _origin.onChange([this]() {
         SceneGraphNode* node = sceneGraphNode(_origin.value());
@@ -276,6 +324,9 @@ TouchInteraction::TouchInteraction()
 void TouchInteraction::updateStateFromInput(const std::vector<TuioCursor>& list,
                                             std::vector<Point>& lastProcessed)
 {
+#ifdef TOUCH_DEBUG_PROPERTIES
+    _debugProperties.nFingers = list.size();
+#endif
     if (_tap) { // check for doubletap
         if (_time.getSessionTime().getTotalMilliseconds() < _maxTapTime) {
             _doubleTap = true;
@@ -286,12 +337,18 @@ void TouchInteraction::updateStateFromInput(const std::vector<TuioCursor>& list,
 
     if (!guiMode(list)) {
         if (_directTouchMode && _selected.size() > 0 && list.size() == _selected.size()) {
+#ifdef TOUCH_DEBUG_PROPERTIES
+            _debugProperties.interactionMode = "Direct";
+#endif
             directControl(list);
         }
         if (_lmSuccess) {
             findSelectedNode(list);
         }
         if (!_directTouchMode) {
+#ifdef TOUCH_DEBUG_PROPERTIES
+            _debugProperties.interactionMode = "Velocities";
+#endif
             computeVelocities(list, lastProcessed);
         }
 
@@ -303,6 +360,9 @@ void TouchInteraction::updateStateFromInput(const std::vector<TuioCursor>& list,
 
 // Activates/Deactivates gui input mode (if active it voids all other interactions)
 bool TouchInteraction::guiMode(const std::vector<TuioCursor>& list) {
+    if (_ignoreGui) {
+        return false;
+    }
     WindowWrapper& wrapper = OsEng.windowWrapper();
     glm::ivec2 res = wrapper.currentWindowSize();
     glm::dvec2 pos = glm::vec2(
@@ -340,7 +400,9 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
     _vel.zoom = 0.0;
     _vel.roll = 0.0;
     _vel.pan = glm::dvec2(0.0, 0.0);
-
+#ifdef TOUCH_DEBUG_PROPERTIES
+    LINFO("DirectControl");
+#endif
     // Returns the screen point s(xi,par) dependent the transform M(par) and object
     // point xi
     auto distToMinimize = [](double* par, int x, void* fdata, LMstat* lmstat) {
@@ -519,11 +581,15 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
             list.end(),
             [&sb](const TuioCursor& c) { return c.getSessionID() == sb.id; }
         );
-        // normalized -1 to 1 coordinates on screen
-        screenPoints.push_back(
-            glm::dvec2(2 * (c->getX() - 0.5), -2 * (c->getY() - 0.5))
-        );
+        if (c != list.end()) {
+            screenPoints.push_back(glm::dvec2(2 * (c->getX() - 0.5), -2 * (c->getY() - 0.5))); // normalized -1 to 1 coordinates on screen
+        } else {
+            OsEng.moduleEngine().module<ImGUIModule>()->touchInput = { 1, glm::dvec2(0.0, 0.0), 1 };
+            resetAfterInput();
+            return;
+        }
     }
+
     FunctionData fData = {
         selectedPoints,
         screenPoints,
@@ -541,7 +607,7 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
     _lmSuccess = levmarq(
         nDOF,
         par.data(),
-        nFingers,
+        screenPoints.size(),
         nullptr,
         distToMinimize,
         gradient,
@@ -555,7 +621,7 @@ void TouchInteraction::directControl(const std::vector<TuioCursor>& list) {
         if (nDOF > 2) {
             _vel.zoom = par.at(2);
             _vel.roll = par.at(3);
-            if (nDOF > 4) {
+            if (_panEnabled && nDOF > 4) {
                 _vel.roll = 0.0;
                 _vel.pan = glm::dvec2(par.at(4), par.at(5));
             }
@@ -593,8 +659,9 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
     std::vector<SceneGraphNode*> selectableNodes;
     for (SceneGraphNode* node : OsEng.renderEngine().scene()->allSceneGraphNodes())
         for (std::string name : selectables)
-            if (node->name() == name)
+            if (node->identifier() == name) {
                 selectableNodes.push_back(node);
+            }
 
     glm::dquat camToWorldSpace = _camera->rotationQuaternion();
     glm::dvec3 camPos = _camera->positionVec3();
@@ -617,9 +684,9 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
             glm::dvec4(xCo, yCo, -1.0, 1.0));
         glm::dvec3 raytrace = glm::normalize(cursorInWorldSpace);
 
-        int id = c.getSessionID();
+        long id = c.getSessionID();
 
-       for (SceneGraphNode* node : selectableNodes) {
+        for (SceneGraphNode* node : selectableNodes) {
             double boundingSphere = node->boundingSphere();
             glm::dvec3 camToSelectable = node->worldPosition() - camPos;
             double dist = length(glm::cross(cursorInWorldSpace, camToSelectable)) /
@@ -678,7 +745,10 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
                     // If the user touched the planet directly, this is definitely the one
                     // they are interested in  =>  minimum distance
                     if (dist <= 0.0) {
-                        LINFOC(node->name(), "Picking candidate based on direct touch");
+                        LINFOC(
+                            node->identifier(),
+                            "Picking candidate based on direct touch"
+                        );
                         pickingInfo.push_back({
                             node,
                             -std::numeric_limits<double>::max(),
@@ -687,7 +757,10 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
                     }
                     else {
                         // The node was considered due to minimum picking distance radius
-                        LINFOC(node->name(), "Picking candidate based on proximity");
+                        LINFOC(
+                            node->identifier(),
+                            "Picking candidate based on proximity"
+                        );
                         pickingInfo.push_back({
                             node,
                             ndcDist,
@@ -713,7 +786,7 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
     // If an item has been picked, it's in the first position of the vector now
     if (!pickingInfo.empty()) {
         _pickingSelected = pickingInfo.begin()->node;
-        LINFOC("Picking", "Picked node: " + _pickingSelected->name());
+        LINFOC("Picking", "Picked node: " + _pickingSelected->identifier());
     }
 
     _selected = std::move(newSelected);
@@ -755,14 +828,22 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
     }
     // find the slowest moving finger - used in roll interpretation
     double minDiff = 1000;
-    int id = 0;
+    long id = 0;
     for (const TuioCursor& c : list) {
-        TuioPoint itPoint = std::find_if(
+        auto it = std::find_if(
             lastProcessed.begin(),
             lastProcessed.end(),
-            [&c](const Point& p) { return p.first == c.getSessionID(); }
-        )->second;
+            [&c](const Point& p) {
+                return p.first == c.getSessionID();
+        });
+
+        if (it == lastProcessed.end()) {
+            continue;
+        }
+
+        TuioPoint itPoint = it->second;
         double diff = c.getX() - itPoint.getX() + c.getY() - itPoint.getY();
+
         if (!c.isMoving()) {
             diff = minDiff = 0.0;
             id = c.getSessionID();
@@ -810,6 +891,13 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
         }
     );
 
+    double normalizedCentroidDistance = glm::distance(_centroid, lastCentroid) / list.size();
+#ifdef TOUCH_DEBUG_PROPERTIES
+    _debugProperties.normalizedCentroidDistance = normalizedCentroidDistance;
+    _debugProperties.rollOn = rollOn;
+    _debugProperties.minDiff = minDiff;
+#endif
+
     if (_doubleTap) {
         return PICK;
     }
@@ -821,17 +909,17 @@ int TouchInteraction::interpretInteraction(const std::vector<TuioCursor>& list,
             std::abs(dist - lastDist) / list.at(0).getMotionSpeed()
         );
         // if average distance between 3 fingers are constant we have panning
-        if (avgDistance < _interpretPan && list.size() == 3) {
+        if (_panEnabled && (std::abs(dist - lastDist) / list.at(0).getMotionSpeed() < _interpretPan && list.size() == 3)) {
             return PAN;
         }
+
         // we have roll if one finger is still, or the total roll angles around the
         // centroid is over _rollAngleThreshold (_centroidStillThreshold is used to void
         // misinterpretations)
         else if (std::abs(minDiff) < _inputStillThreshold ||
-                (std::abs(rollOn) < 100.0 &&
-                glm::distance(_centroid, lastCentroid) / list.size()
-                    < _centroidStillThreshold))
-        {
+	        (std::abs(rollOn) < 100.0 &&
+		normalizedCentroidDistance < _centroidStillThreshold)) {
+
             return ROLL;
         }
         else {
@@ -845,7 +933,25 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
                                          const std::vector<Point>& lastProcessed)
 {
     TuioCursor cursor = list.at(0);
-    int action = interpretInteraction(list, lastProcessed);
+    const int action = interpretInteraction(list, lastProcessed);
+
+#ifdef TOUCH_DEBUG_PROPERTIES
+    const std::map<int, std::string> interactionNames = {
+        {ROT, "Rotation"},
+        {PINCH, "Pinch"},
+        {PAN, "Pan"},
+        {ROLL, "Roll"},
+        {PICK, "Pick"}
+    };
+    _debugProperties.interpretedInteraction = interactionNames.at(action);
+
+    if (pinchConsecCt > 0 && action != PINCH) {
+        if( pinchConsecCt > 3 )
+            LINFO("PINCH_gesture_ended_with " << pinchConsecZoomFactor << " drag_distance_and " << pinchConsecCt << " counts.");
+        pinchConsecCt = 0;
+        pinchConsecZoomFactor = 0.0;
+    }
+#endif
 
     switch (action) {
         case ROT: { // add rotation velocity
@@ -880,9 +986,19 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
                 }
             ) / lastProcessed.size();
 
-            double zoomFactor = (distance - lastDistance) *
-                (glm::distance(_camera->positionVec3(), _camera->focusPositionVec3()) -
-                _focusNode->boundingSphere());
+            glm::dvec3 camPos = _camera->positionVec3();
+            glm::dvec3 centerPos = _focusNode->worldPosition();
+            glm::dvec3 currDistanceToFocusNode = camPos - centerPos;
+
+            double distanceFromFocusSurface = length(currDistanceToFocusNode) - _focusNode->boundingSphere();
+            double zoomFactor = (distance - lastDistance);
+#ifdef TOUCH_DEBUG_PROPERTIES
+            pinchConsecCt++;
+            pinchConsecZoomFactor += zoomFactor;
+#endif
+            if ((length(currDistanceToFocusNode) / distanceFromFocusSurface) > _zoomSensitivityDistanceThreshold) {
+                zoomFactor *= pow(distanceFromFocusSurface, (float)_zoomSensitivity);
+            }
             _vel.zoom += zoomFactor * _sensitivity.zoom *
                          std::max(_touchScreenSize.value() * 0.1, 1.0);
             break;
@@ -960,6 +1076,7 @@ void TouchInteraction::computeVelocities(const std::vector<TuioCursor>& list,
                 _vel.zoom = _sensitivity.zoom *
                             std::max(_touchScreenSize.value() * 0.1, 1.0) *
                             _tapZoomFactor * dist;
+
             }
             break;
         }
@@ -1041,16 +1158,20 @@ void TouchInteraction::step(double dt) {
         }
         { // Zooming
             centerToBoundingSphere = -directionToCenter * boundingSphere;
-            dvec3 centerToCam = camPos - centerPos;
-            double distToSurface = length(centerToCam - centerToBoundingSphere);
-
-            if (length(_vel.zoom * dt) < distToSurface &&
-                length(centerToCam + directionToCenter*_vel.zoom * dt) >
-                    length(centerToBoundingSphere))
+            centerToCamera = camPos - centerPos;
+            double planetBoundaryRadius = length(centerToBoundingSphere);
+            planetBoundaryRadius *= _zoomBoundarySphereMultiplier;
+            double distToSurface = length(centerToCamera - planetBoundaryRadius);
+            if (length(_vel.zoom*dt) < distToSurface &&
+                 length(centerToCamera + directionToCenter*_vel.zoom*dt)
+                 > planetBoundaryRadius)
             {
                 camPos += directionToCenter * _vel.zoom * dt;
             }
             else {
+#ifdef TOUCH_DEBUG_PROPERTIES
+                LINFO("Zero the zoom velocity close to surface.");
+#endif
                 _vel.zoom = 0.0;
             }
         }
@@ -1060,6 +1181,14 @@ void TouchInteraction::step(double dt) {
         _camera->setPositionVec3(camPos);
         _camera->setRotation(globalCamRot * localCamRot);
 
+#ifdef TOUCH_DEBUG_PROPERTIES
+        //Show velocity status every N frames
+        /*if (++stepVelUpdate >= 60) {
+            stepVelUpdate = 0;
+            LINFO("DistToFocusNode " << length(centerToCamera) << " stepZoomVelUpdate " << _vel.zoom);
+        }*/
+#endif
+
         _tap = false;
         _doubleTap = false;
         if (_reset) {
@@ -1120,7 +1249,7 @@ void TouchInteraction::decelerate(double dt) {
     // time slack over from last frame
     int times = static_cast<int>((dt + _timeSlack) / frequency);
     // Save the new time slack for the next frame
-    _timeSlack = fmod((dt + _timeSlack), frequency);
+    _timeSlack = fmod((dt + _timeSlack), frequency) * frequency;
 
     // Decelerate zoom velocity quicker if we're close enough to use direct-manipulation
     if (!_directTouchMode && _currentRadius > _nodeRadiusThreshold &&
@@ -1136,6 +1265,10 @@ void TouchInteraction::decelerate(double dt) {
 
 // Called if all fingers are off the screen
 void TouchInteraction::resetAfterInput() {
+#ifdef TOUCH_DEBUG_PROPERTIES
+    _debugProperties.nFingers = 0;
+    _debugProperties.interactionMode = "None";
+#endif
     if (_directTouchMode && _selected.size() > 0 && _lmSuccess) {
         double spinDelta = _spinSensitivity / OsEng.windowWrapper().averageDeltaTime();
         if (glm::length(_lastVel.orbit) > _orbitSpeedThreshold) {
@@ -1183,12 +1316,13 @@ void TouchInteraction::resetToDefault() {
     _rollAngleThreshold.set(0.025f);
     _orbitSpeedThreshold.set(0.005f);
     _spinSensitivity.set(1.0f);
+    _zoomSensitivity.set(1.025f);
     _inputStillThreshold.set(0.0005f);
     _centroidStillThreshold.set(0.0018f);
     _interpretPan.set(0.015f);
     _slerpTime.set(3.0f);
     _guiButton.set(glm::ivec2(32, 64));
-    _friction.set(glm::vec4(0.01, 0.025, 0.02, 0.02));
+    _friction.set(glm::vec4(0.025, 0.025, 0.02, 0.02));
 }
 
 void TouchInteraction::tap() {
@@ -1214,4 +1348,41 @@ void TouchInteraction::setFocusNode(SceneGraphNode* focusNode) {
     _focusNode = focusNode;
 }
 
+#ifdef TOUCH_DEBUG_PROPERTIES
+TouchInteraction::DebugProperties::DebugProperties()
+    : properties::PropertyOwner({ "TouchDebugProperties" })
+    , interactionMode(
+        { "interactionMode", "Current interaction mode", "" },
+        "Unknown"
+    )
+    , nFingers(
+        {"nFingers", "Number of fingers", ""},
+        0, 0, 20
+    )
+    , interpretedInteraction(
+        { "interpretedInteraction", "Interpreted interaction", "" },
+        "Unknown"
+    )
+    , normalizedCentroidDistance(
+        { "normalizedCentroidDistance", "Normalized Centroid Distance", "" },
+        0.f, 0.f, 0.01f
+    )
+    , minDiff(
+        { "minDiff", "Movement of slowest moving finger", "" },
+        0.f, 0.f, 100.f
+    )
+    , rollOn(
+        { "rollOn", "Roll On", "" },
+        0.f, 0.f, 100.f
+    )
+{
+    addProperty(interactionMode);
+    addProperty(nFingers);
+    addProperty(interpretedInteraction);
+    addProperty(normalizedCentroidDistance);
+    addProperty(minDiff);
+    addProperty(rollOn);
+}
+#endif
+
 } // openspace namespace
diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp
index 59bebe059d..4f350c0892 100644
--- a/modules/touch/src/touchmarker.cpp
+++ b/modules/touch/src/touchmarker.cpp
@@ -79,7 +79,6 @@ TouchMarker::TouchMarker()
         glm::vec3(1.f)
     )
     , _shader(nullptr)
-    , _numFingers(0)
 {
     addProperty(_visible);
     addProperty(_radiusSize);
@@ -135,25 +134,25 @@ void TouchMarker::render(const std::vector<TUIO::TuioCursor>& list) {
         glEnable(GL_PROGRAM_POINT_SIZE); // Enable gl_PointSize in vertex shader
         glPolygonMode(GL_FRONT_AND_BACK, GL_POINT);
         glBindVertexArray(_quad);
-        glDrawArrays(GL_POINTS, 0, _numFingers);
+        glDrawArrays(GL_POINTS, 0, _vertexData.size() / 2);
 
         _shader->deactivate();
     }
 }
 
 void TouchMarker::createVertexList(const std::vector<TUIO::TuioCursor>& list) {
-    _numFingers = static_cast<int>(list.size());
-    GLfloat vertexData[MAX_FINGERS];
+    _vertexData.resize(list.size() * 2);
+
     int i = 0;
     for (const TUIO::TuioCursor& c : list) {
-        vertexData[i] = 2 * (c.getX() - 0.5f);
-        vertexData[i + 1] = -2 * (c.getY() - 0.5f);
+        _vertexData[i] = 2 * (c.getX() - 0.5f);
+        _vertexData[i + 1] = -2 * (c.getY() - 0.5f);
         i += 2;
     }
 
     glBindVertexArray(_quad);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(vertexData), vertexData, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, _vertexData.size() * sizeof(GLfloat), _vertexData.data(), GL_STATIC_DRAW);
     glEnableVertexAttribArray(0);
     glVertexAttribPointer(
         0,
diff --git a/modules/touch/src/tuioear.cpp b/modules/touch/src/tuioear.cpp
index 326a9ffc55..2ae6d54c2c 100644
--- a/modules/touch/src/tuioear.cpp
+++ b/modules/touch/src/tuioear.cpp
@@ -45,11 +45,11 @@ void TuioEar::addTuioCursor(TuioCursor* tcur) {
     _tap = false;
     // find same id in _list if it exists in _removeList (new input with same ID as a
     // previously stored)
-    int i = tcur->getSessionID();
-    std::vector<int>::iterator foundID = std::find_if(
+    long i = tcur->getSessionID();
+    std::vector<long>::iterator foundID = std::find_if(
         _removeList.begin(),
         _removeList.end(),
-        [&i](int id) { return id == i; });
+        [&i](long id) { return id == i; });
 
     // if found, remove id from _removeList and update, otherwise add new id to list
     if (foundID != _removeList.end()) {
@@ -57,8 +57,9 @@ void TuioEar::addTuioCursor(TuioCursor* tcur) {
             _list.begin(),
             _list.end(),
             [&i](const TuioCursor& cursor) {
-            return cursor.getSessionID() == i;
-        })->update(tcur);
+                return cursor.getSessionID() == i;
+            }
+        )->update(tcur);
         _removeList.erase(foundID);
     }
     else {
@@ -70,13 +71,14 @@ void TuioEar::addTuioCursor(TuioCursor* tcur) {
 void TuioEar::updateTuioCursor(TuioCursor* tcur) {
     _mx.lock();
     _tap = false;
-    int i = tcur->getSessionID();
+    long i = tcur->getSessionID();
     std::find_if(
         _list.begin(),
         _list.end(),
         [&i](const TuioCursor& cursor) {
             return cursor.getSessionID() == i;
-    })->update(tcur);
+        }
+    )->update(tcur);
     _mx.unlock();
 }
 
@@ -139,15 +141,16 @@ void TuioEar::clearInput() {
             _list.begin(),
             _list.end(),
             [this](const TuioCursor& cursor) {
-        return std::find_if(
-            _removeList.begin(),
-            _removeList.end(),
-            [&cursor](int id) {
-            return cursor.getSessionID() == id;
-        }
-        ) != _removeList.end();
-    }),
-    _list.end()
+                return std::find_if(
+                    _removeList.begin(),
+                    _removeList.end(),
+                    [&cursor](long id) {
+                        return cursor.getSessionID() == id;
+                    }
+                ) != _removeList.end();
+            }
+        ),
+        _list.end()
     );
     _removeList.clear();
     _mx.unlock();
diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt
index 927883d3f9..b124a2c40d 100644
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -25,6 +25,7 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/envelope.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.h
@@ -33,6 +34,9 @@ set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.h
     ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.h
     ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h
     ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.h
@@ -47,10 +51,14 @@ set(HEADER_FILES
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/envelope.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.cpp
diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp
new file mode 100644
index 0000000000..e4db69a95b
--- /dev/null
+++ b/modules/volume/envelope.cpp
@@ -0,0 +1,176 @@
+#include <modules/volume/envelope.h>
+
+namespace openspace {
+    namespace volume {
+        Envelope::Envelope() { }
+
+        Envelope::Envelope(std::vector<EnvelopePoint> vec) {
+            _points = vec;
+        }
+
+        bool Envelope::operator!=(const Envelope& env) const {
+            const double minDist = 0.0001;
+
+            if (_points.size() != env._points.size())
+                return true;
+
+            auto iter = _points.begin();
+            auto envIter = env._points.begin();
+            for (; iter != _points.end(); ++iter, ++envIter) {
+                if (abs(iter->position.first - envIter->position.first) > minDist || 
+                    abs(iter->position.second - envIter->position.second) > minDist ||
+                     iter->color != envIter->color)
+                    return true;
+            }
+            return false;
+        }
+
+
+        void Envelope::setPoints(std::vector<EnvelopePoint> vec) {
+            this->_points = vec;
+        }
+
+        std::vector<EnvelopePoint> Envelope::getPoints() {
+            return _points;
+        }
+
+        bool Envelope::isValueInEnvelope(float pos) const {
+            if (!_points.empty()) {
+                if (_points.front().position.first <= pos && _points.back().position.first >= pos)
+                    return true;
+            }
+            return false;
+        }
+
+        bool Envelope::isEnvelopeValid() const {
+            auto currentIter = _points.begin();
+            auto nextIter = currentIter + 1;
+            for (; nextIter != _points.end(); ++currentIter, ++nextIter) {
+                if (currentIter->position.first > nextIter->position.first)
+                    return false;
+            }
+            return true;
+        }
+
+        glm::vec3 Envelope::normalizeColor(glm::vec3 vec) const{
+
+            return glm::vec3{ vec.r / 255.f, vec.g / 255.f , vec.b / 255.f };
+        }
+        
+        glm::vec4 Envelope::getValueAtPosition(float pos) const {
+            auto afterIter = _points.begin();
+            glm::vec4 color{ 0.f, 0.f , 0.f , 0.f };
+            while (afterIter->position.first < pos ) {
+                if(afterIter == _points.end())
+                    return color;
+                ++afterIter; 
+            }
+            if (afterIter->position.first == pos) {
+                return glm::vec4{ afterIter->color, afterIter->position.second };
+            }
+            auto beforeIter = afterIter -1;
+
+            float dist = afterIter->position.first - beforeIter->position.first;
+            float alpha;
+            if(dist < 0.0001)
+                color = { normalizeColor((beforeIter->color + afterIter->color) / 2.f), 
+                        std::max(beforeIter->position.second, afterIter->position.second) };
+            else
+                color = { normalizeColor(beforeIter->color *(abs(pos - afterIter->position.first) / dist) + afterIter->color *(abs(pos - beforeIter->position.first) / dist)),
+                    beforeIter->position.second *(abs(pos - afterIter->position.first) / dist) + afterIter->position.second *(abs(pos - beforeIter->position.first) / dist) };
+
+            return color;
+        }
+
+        int EnvelopePoint::HexadecimalToDecimal(std::string hex) const {
+            int hexLength = hex.length();
+            double dec = 0;
+            for (int i = 0; i < hexLength; ++i)
+            {
+                char b = hex[i];
+
+                if (b >= 48 && b <= 57)
+                    b -= 48;
+                else if (b >= 65 && b <= 70)
+                    b -= 55;
+                else if (b >= 97 && b <= 102)
+                    b -= 87;
+                dec += b * pow(16, ((hexLength - i) - 1));
+            }
+            return (int)dec;
+        }
+
+        std::string EnvelopePoint::DecimalToHexadecimal(int dec) const {
+            if (dec < 1) return "00";
+
+            int hex = dec;
+            std::string hexStr = "";
+
+            while (dec > 0)
+            {
+                hex = dec % 16;
+
+                if (hex < 10)
+                    hexStr = hexStr.insert(0, std::string(1, (hex + 48)));
+                else
+                    hexStr = hexStr.insert(0, std::string(1, (hex + 55)));
+                dec /= 16;
+            }
+            return hexStr;
+        }
+
+        glm::vec3 EnvelopePoint::hexadecimalToRGBConversion(std::string hex) const {
+            float r = static_cast<float>(HexadecimalToDecimal(hex.substr(1, 2)));
+            float g = static_cast<float>(HexadecimalToDecimal(hex.substr(3, 2)));
+            float b = static_cast<float>(HexadecimalToDecimal(hex.substr(5, 2)));
+
+            return glm::vec3(r, g, b);
+        }
+
+        std::string EnvelopePoint::getHexadecimalFromVec3(glm::vec3 vec) const {
+
+            std::string r = DecimalToHexadecimal(static_cast<int>(vec.r));
+            std::string g = DecimalToHexadecimal(static_cast<int>(vec.g));
+            std::string b = DecimalToHexadecimal(static_cast<int>(vec.b));
+
+            return ("#" + r + g + b);
+        }
+
+        json Envelope::getJSONPoints() const {
+            json j;
+            for (int i = 0; i < _points.size(); i++) {
+                j[i] = {
+                    { "color", _points.at(i).colorHex },
+                    { "position",{
+                        { "x", _points.at(i).position.first },
+                        { "y", _points.at(i).position.second },
+                    },
+                    }
+                };
+            }
+            return j;
+        }
+
+        json Envelope::getJSONEnvelope() const {
+            json j;
+            j["points"] = getJSONPoints();
+            return j;
+        }
+
+        void Envelope::setEnvelopeLuaTable(lua_State* state) const {
+            for (auto iter = _points.begin(); iter != _points.end(); ++iter) {
+                lua_newtable(state);
+                lua_pushstring(state, iter->colorHex.c_str());
+                lua_setfield(state, -2, "color");
+                lua_newtable(state);
+                lua_pushnumber(state, static_cast<lua_Number>(iter->position.first));
+                lua_setfield(state, -2, "x");
+                lua_pushnumber(state, static_cast<lua_Number>(iter->position.second));
+                lua_setfield(state, -2, "y");
+                lua_setfield(state, -2, "position");
+                lua_setfield(state, -2, ("[\"" + std::to_string(iter - _points.begin() + 1) + "\"]").c_str());
+            }
+        }
+
+    }//namespace volume
+}//namespace openspace
diff --git a/modules/volume/envelope.h b/modules/volume/envelope.h
new file mode 100644
index 0000000000..5a251ed917
--- /dev/null
+++ b/modules/volume/envelope.h
@@ -0,0 +1,77 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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_VOLUME___ENVELOPE___H__
+#define __OPENSPACE_MODULE_VOLUME___ENVELOPE___H__
+
+#include <ghoul/opengl/texture.h>
+#include <ghoul/glm.h>
+#include <ext/json/json.hpp>
+#include <ghoul/lua/ghoul_lua.h>
+
+using json = nlohmann::json;
+
+namespace openspace {
+    namespace volume {
+        class EnvelopePoint {
+        public:
+            EnvelopePoint(glm::vec3 c, float x, float y) : color(c), colorHex(getHexadecimalFromVec3(c)), position(std::make_pair(x, y)) {}
+            EnvelopePoint(std::string c, float x, float y) : color(hexadecimalToRGBConversion(c)), colorHex(c), position(std::make_pair(x, y)) {}
+
+            int HexadecimalToDecimal(std::string hex) const;
+            std::string DecimalToHexadecimal(int dec) const;
+            glm::vec3 hexadecimalToRGBConversion(std::string hex) const;
+            std::string getHexadecimalFromVec3(glm::vec3 vec) const;
+
+            glm::vec3 color;
+            std::string colorHex;
+            std::pair<float, float> position;
+        };
+        class Envelope {
+        public:
+            Envelope();
+            Envelope(std::vector<EnvelopePoint> vec);
+
+            void setPoints(std::vector<EnvelopePoint> vec);
+            std::vector<EnvelopePoint> getPoints();
+
+            glm::vec4 getValueAtPosition(float pos) const;
+            glm::vec3 normalizeColor(glm::vec3 vec) const;
+            json getJSONPoints() const;
+            json getJSONEnvelope() const;
+            void setEnvelopeLuaTable(lua_State* state) const;
+
+            bool isValueInEnvelope(float pos) const;
+            bool isEnvelopeValid() const;
+
+            bool operator!=(const Envelope& env) const;
+
+        private:
+           
+            std::vector<EnvelopePoint> _points;
+        };
+
+    }//namespace volume
+}//namespace openspace
+#endif __OPENSPACE_MODULE_VOLUME___ENVELOPE___H__
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index 8092bb6c3c..fa1598dd5c 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -26,6 +26,7 @@
 
 #include <ghoul/glm.h>
 #include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/filesystem/filesystem.h>
 #include <sstream>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
@@ -43,19 +44,19 @@ namespace {
 namespace openspace::volume {
 
 BasicVolumeRaycaster::BasicVolumeRaycaster(
-                                    std::shared_ptr<ghoul::opengl::Texture> volumeTexture,
-                                       std::shared_ptr<TransferFunction> transferFunction,
-                                             std::shared_ptr<VolumeClipPlanes> clipPlanes)
-    : _clipPlanes(clipPlanes)
-    , _volumeTexture(volumeTexture)
-    , _transferFunction(transferFunction)
+    std::shared_ptr<ghoul::opengl::Texture> volumeTexture,
+    std::shared_ptr<TransferFunctionHandler> transferFunctionHandler,
+    std::shared_ptr<VolumeClipPlanes> clipPlanes)
+    : _volumeTexture(volumeTexture)
+    , _transferFunctionHandler(transferFunctionHandler)
+    , _clipPlanes(clipPlanes)
     , _boundingBox(glm::vec3(1.0))
     , _opacity(20.0)
     , _rNormalization(0.0)
     , _rUpperBound(1.0)
-    , _valueRemapping(0.0, 1.0)
 {}
 
+
 BasicVolumeRaycaster::~BasicVolumeRaycaster() {}
 
 void BasicVolumeRaycaster::initialize() {
@@ -111,7 +112,7 @@ void BasicVolumeRaycaster::preRaycast(
     const RaycastData& data,
     ghoul::opengl::ProgramObject& program)
 {
-    if (!_volumeTexture || !_transferFunction) {
+    if (!_volumeTexture || !_transferFunctionHandler) {
         return;
     }
 
@@ -122,7 +123,7 @@ void BasicVolumeRaycaster::preRaycast(
 
     _tfUnit = std::make_unique<ghoul::opengl::TextureUnit>();
     _tfUnit->activate();
-    _transferFunction->getTexture().bind();
+    _transferFunctionHandler->getTexture().bind();
     program.setUniform("transferFunction_" + id, _tfUnit->unitNumber());
 
     _textureUnit = std::make_unique<ghoul::opengl::TextureUnit>();
@@ -142,7 +143,6 @@ void BasicVolumeRaycaster::preRaycast(
     program.setUniform("opacity_" + id, _opacity);
     program.setUniform("rNormalization_" + id, _rNormalization);
     program.setUniform("rUpperBound_" + id, _rUpperBound);
-    program.setUniform("valueRemapping_" + id, _valueRemapping);
 }
 
 void BasicVolumeRaycaster::postRaycast(const RaycastData&, ghoul::opengl::ProgramObject&)
@@ -166,25 +166,26 @@ bool BasicVolumeRaycaster::cameraIsInside(const RenderData& data,
 }
 
 std::string BasicVolumeRaycaster::getBoundsVsPath() const {
-    return GlslBoundsVsPath;
+    return absPath(GlslBoundsVsPath);
 }
 
 std::string BasicVolumeRaycaster::getBoundsFsPath() const {
-    return GlslBoundsFsPath;
+    return absPath(GlslBoundsFsPath);
 }
 
 std::string BasicVolumeRaycaster::getRaycastPath() const {
-    return GlslRaycastPath;
+    return absPath(GlslRaycastPath);
 }
 
 std::string BasicVolumeRaycaster::getHelperPath() const {
-    return GlslHelperPath;
+    return absPath(GlslHelperPath);
 }
 
-void BasicVolumeRaycaster::setTransferFunction(
-    std::shared_ptr<TransferFunction> transferFunction)
+
+void BasicVolumeRaycaster::setTransferFunctionHandler(
+    std::shared_ptr<TransferFunctionHandler> transferFunctionHandler)
 {
-    _transferFunction = transferFunction;
+    _transferFunctionHandler = transferFunctionHandler;
 }
 
 void BasicVolumeRaycaster::setVolumeTexture(
@@ -225,10 +226,6 @@ float BasicVolumeRaycaster::rUpperBound() const {
     return _rUpperBound;
 }
 
-void BasicVolumeRaycaster::setValueRemapping(float mapZeroTo, float mapOneTo) {
-    _valueRemapping = glm::vec2(mapZeroTo, mapOneTo);
-}
-
 VolumeGridType BasicVolumeRaycaster::gridType() const {
     return _gridType;
 }
@@ -241,4 +238,5 @@ void BasicVolumeRaycaster::setModelTransform(const glm::mat4 & transform) {
     _modelTransform = transform;
 }
 
+
 } // namespace openspace::volume
diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h
index 16bd0df15c..d15c3c8bd0 100644
--- a/modules/volume/rendering/basicvolumeraycaster.h
+++ b/modules/volume/rendering/basicvolumeraycaster.h
@@ -34,7 +34,7 @@
 
 #include <openspace/rendering/volumeraycaster.h>
 #include <openspace/util/boxgeometry.h>
-#include <openspace/rendering/transferfunction.h>
+#include <modules/volume/transferfunctionhandler.h>
 #include <modules/volume/rendering/volumeclipplanes.h>
 
 #include <modules/volume/volumegridtype.h>
@@ -56,7 +56,7 @@ class BasicVolumeRaycaster : public VolumeRaycaster {
 public:
     BasicVolumeRaycaster(
         std::shared_ptr<ghoul::opengl::Texture> texture,
-        std::shared_ptr<TransferFunction> transferFunction,
+        std::shared_ptr<TransferFunctionHandler> transferFunctionHandler,
         std::shared_ptr<VolumeClipPlanes> clipPlanes);
     virtual ~BasicVolumeRaycaster();
     void initialize();
@@ -77,9 +77,11 @@ public:
     std::string getRaycastPath() const override;
     std::string getHelperPath() const override;
 
+
     void setVolumeTexture(std::shared_ptr<ghoul::opengl::Texture> texture);
     std::shared_ptr<ghoul::opengl::Texture> volumeTexture() const;
-    void setTransferFunction(std::shared_ptr<TransferFunction> transferFunction);
+    void setTransferFunctionHandler(std::shared_ptr<TransferFunctionHandler> transferFunctionHandler);
+
     void setStepSize(float stepSize);
     float opacity() const;
     void setOpacity(float opacity);
@@ -87,7 +89,6 @@ public:
     void setRNormalization(float rNormalization);
     float rUpperBound() const;
     void setRUpperBound(float rNormalization);
-    void setValueRemapping(float mapZeroTo, float mapOneTo);
     VolumeGridType gridType() const;
     void setGridType(VolumeGridType gridType);
     void setModelTransform(const glm::mat4& transform);
@@ -97,14 +98,13 @@ private:
 
     std::shared_ptr<VolumeClipPlanes> _clipPlanes;
     std::shared_ptr<ghoul::opengl::Texture> _volumeTexture;
-    std::shared_ptr<TransferFunction> _transferFunction;
+    std::shared_ptr<TransferFunctionHandler> _transferFunctionHandler;
     BoxGeometry _boundingBox;
     VolumeGridType _gridType;
     glm::mat4 _modelTransform;
     float _opacity;
     float _rNormalization;
     float _rUpperBound;
-    glm::vec2 _valueRemapping;
 
     std::unique_ptr<ghoul::opengl::TextureUnit> _tfUnit;
     std::unique_ptr<ghoul::opengl::TextureUnit> _textureUnit;
@@ -113,6 +113,4 @@ private:
 
 } // namespace volume
 } // namespace openspace
-
-
 #endif // __OPENSPACE_MODULE_VOLUME___BASICVOLUMERAYCASTER___H__
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index 6cba240b7b..09f331c3d3 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -53,8 +53,6 @@ namespace {
     const char* KeySourceDirectory = "SourceDirectory";
     const char* KeyLowerDomainBound = "LowerDomainBound";
     const char* KeyUpperDomainBound = "UpperDomainBound";
-    const char* KeyLowerValueBound = "LowerValueBound";
-    const char* KeyUpperValueBound = "UpperValueBound";
     const char* KeyClipPlanes = "ClipPlanes";
     const char* KeySecondsBefore = "SecondsBefore";
     const char* KeySecondsAfter = "SecondsAfter";
@@ -62,6 +60,7 @@ namespace {
     const char* KeyMinValue = "MinValue";
     const char* KeyMaxValue = "MaxValue";
     const char* KeyTime = "Time";
+    const char* KeyUnit = "VisUnit";
     const float SecondsInOneDay = 60 * 60 * 24;
 
     static const openspace::properties::Property::PropertyInfo StepSizeInfo = {
@@ -165,13 +164,12 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
     , _secondsAfter(SecondsAfterInfo, 0.f, 0.01f, SecondsInOneDay)
     , _sourceDirectory(SourceDirectoryInfo)
     , _transferFunctionPath(TransferFunctionInfo)
-    , _lowerValueBound(lowerValueBoundInfo, 0.f, 0.f, 1000000.f)
-    , _upperValueBound(upperValueBoundInfo, 0.f, 0.f, 1000000.f)
     , _triggerTimeJump(TriggerTimeJumpInfo)
     , _jumpToTimestep(JumpToTimestepInfo, 0, 0, 256)
     , _currentTimestep(CurrentTimeStepInfo, 0, 0, 256)
     , _raycaster(nullptr)
-    , _transferFunction(nullptr)
+    , _transferFunctionHandler(nullptr)
+
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
@@ -181,9 +179,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
 
     _sourceDirectory = absPath(dictionary.value<std::string>(KeySourceDirectory));
     _transferFunctionPath = absPath(dictionary.value<std::string>(KeyTransferFunction));
-    _lowerValueBound = dictionary.value<float>(KeyLowerValueBound);
-    _upperValueBound = dictionary.value<float>(KeyUpperValueBound);
-    _transferFunction = std::make_shared<TransferFunction>(_transferFunctionPath);
+    _transferFunctionHandler = std::make_shared<TransferFunctionHandler>(_transferFunctionPath);
+
 
     _gridType.addOptions({
         { static_cast<int>(volume::VolumeGridType::Cartesian), "Cartesian grid" },
@@ -203,7 +200,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
     ghoul::Dictionary clipPlanesDictionary;
     dictionary.getValue(KeyClipPlanes, clipPlanesDictionary);
     _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDictionary);
-    _clipPlanes->setName("clipPlanes");
+    _clipPlanes->setIdentifier("clipPlanes");
+    _clipPlanes->setGuiName("Clip Planes");
 
     if (dictionary.hasValue<std::string>(KeyGridType)) {
         VolumeGridType gridType = volume::parseGridType(
@@ -235,6 +233,9 @@ void RenderableTimeVaryingVolume::initializeGL() {
         if (extension == "dictionary") {
             loadTimestepMetadata(path);
         }
+        if (extension == "tf") {
+            _transferFunctionHandler->setFilepath(path);
+        }
     }
 
 
@@ -249,11 +250,16 @@ void RenderableTimeVaryingVolume::initializeGL() {
 
         float min = t.minValue;
         float diff = t.maxValue - t.minValue;
-
         float *data = t.rawVolume->data();
         for (size_t i = 0; i < t.rawVolume->nCells(); ++i) {
             data[i] = glm::clamp((data[i] - min) / diff, 0.0f, 1.0f);
         }
+
+        t.histogram = std::make_shared<Histogram>(0.0, 1.0, 100);
+        for (int i = 0; i < t.rawVolume->nCells(); ++i) {
+            t.histogram->add(data[i]);
+        }
+
         // TODO: handle normalization properly for different timesteps + transfer function
 
         t.texture = std::make_shared<ghoul::opengl::Texture>(
@@ -272,13 +278,11 @@ void RenderableTimeVaryingVolume::initializeGL() {
         t.texture->uploadTexture();
     }
 
+    _transferFunctionHandler->initialize();
     _clipPlanes->initialize();
-    _transferFunction->update();
-    _raycaster = std::make_unique<volume::BasicVolumeRaycaster>(
-        nullptr,
-        _transferFunction,
-        _clipPlanes
-    );
+
+    _raycaster = std::make_unique<volume::BasicVolumeRaycaster>(nullptr, _transferFunctionHandler, _clipPlanes);
+
     _raycaster->initialize();
     OsEng.renderEngine().raycasterManager().attachRaycaster(*_raycaster.get());
     auto onChange = [&](bool enabled) {
@@ -308,14 +312,14 @@ void RenderableTimeVaryingVolume::initializeGL() {
     addProperty(_transferFunctionPath);
     addProperty(_sourceDirectory);
     addPropertySubOwner(_clipPlanes.get());
+    addPropertySubOwner(_transferFunctionHandler.get());
+
     addProperty(_triggerTimeJump);
     addProperty(_jumpToTimestep);
     addProperty(_currentTimestep);
     addProperty(_opacity);
     addProperty(_rNormalization);
     addProperty(_rUpperBound);
-    addProperty(_lowerValueBound);
-    addProperty(_upperValueBound);
 
     _raycaster->setGridType(
         (_gridType.value() == 1) ?
@@ -331,9 +335,9 @@ void RenderableTimeVaryingVolume::initializeGL() {
     });
 
     _transferFunctionPath.onChange([this] {
-        _transferFunction =
-            std::make_shared<TransferFunction>(_transferFunctionPath);
-        _raycaster->setTransferFunction(_transferFunction);
+        _transferFunctionHandler =
+            std::make_shared<TransferFunctionHandler>(_transferFunctionPath);
+        _raycaster->setTransferFunctionHandler(_transferFunctionHandler);
     });
 }
 
@@ -352,6 +356,7 @@ void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::string& path)
     t.upperDomainBound = dictionary.value<glm::vec3>(KeyUpperDomainBound);
     t.minValue = dictionary.value<float>(KeyMinValue);
     t.maxValue = dictionary.value<float>(KeyMaxValue);
+    t.unit = dictionary.value<std::string>(KeyUnit);
 
     std::string timeString = dictionary.value<std::string>(KeyTime);
     t.time = Time::convertTime(timeString);
@@ -429,7 +434,6 @@ void RenderableTimeVaryingVolume::jumpToTimestep(int target) {
 }
 
 void RenderableTimeVaryingVolume::update(const UpdateData&) {
-    _transferFunction->update();
     if (_raycaster) {
         Timestep* t = currentTimestep();
         _currentTimestep = timestepIndex(t);
@@ -452,18 +456,9 @@ void RenderableTimeVaryingVolume::update(const UpdateData&) {
                 );
             }
             _raycaster->setVolumeTexture(t->texture);
-
-            // Remap volume value to that TF value 0 is sampled for lowerValueBound, and 1
-            // is sampled for upperLowerBound.
-            // This means that volume values = 0 need to be remapped to how localMin
-            // relates to the global range.
-            float zeroMap = (t->minValue - _lowerValueBound) /
-                            (_upperValueBound - _lowerValueBound);
-
-            // Volume values = 1 are mapped to how localMax relates to the global range.
-            float oneMap = (t->maxValue - _lowerValueBound) /
-                           (_upperValueBound - _lowerValueBound);
-            _raycaster->setValueRemapping(zeroMap, oneMap);
+            _transferFunctionHandler->setUnit(t->unit);
+            _transferFunctionHandler->setMinAndMaxValue(t->minValue, t->maxValue);
+            _transferFunctionHandler->setHistogramProperty(t->histogram);
         } else {
             _raycaster->setVolumeTexture(nullptr);
         }
@@ -509,20 +504,6 @@ documentation::Documentation RenderableTimeVaryingVolume::Documentation() {
                 Optional::No,
                 "Specifies the transfer function file path"
             },
-            {
-                KeyLowerValueBound,
-                new DoubleVerifier,
-                Optional::No,
-                "Specifies the lower value bound."
-                "This number will be mapped to 0 before uploadin to the GPU."
-            },
-            {
-                KeyUpperValueBound,
-                new DoubleVerifier,
-                Optional::No,
-                "Specifies the lower value bound."
-                "This number will be mapped to 0 before uploadin to the GPU."
-            },
             {
                 KeyGridType,
                 new StringInListVerifier({"Cartesian", "Spherical"}),
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index 892d24827d..e3169645d2 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -30,12 +30,14 @@
 #include <modules/volume/rawvolume.h>
 #include <modules/volume/rendering/basicvolumeraycaster.h>
 #include <modules/volume/rendering/volumeclipplanes.h>
+#include <modules/volume/transferfunctionhandler.h>
+
 
 #include <openspace/properties/vectorproperty.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
-#include <openspace/rendering/transferfunction.h>
 #include <openspace/util/boxgeometry.h>
+#include <openspace/util/histogram.h>
 
 namespace openspace {
 
@@ -66,10 +68,12 @@ private:
         glm::uvec3 dimensions;
         glm::vec3 lowerDomainBound;
         glm::vec3 upperDomainBound;
+        std::string unit;
         bool inRam;
         bool onGpu;
         std::unique_ptr<RawVolume<float>> rawVolume;
         std::shared_ptr<ghoul::opengl::Texture> texture;
+        std::shared_ptr<openspace::Histogram> histogram;
     };
 
     Timestep* currentTimestep();
@@ -90,8 +94,6 @@ private:
     properties::FloatProperty _secondsAfter;
     properties::StringProperty _sourceDirectory;
     properties::StringProperty _transferFunctionPath;
-    properties::FloatProperty _lowerValueBound;
-    properties::FloatProperty _upperValueBound;
 
     properties::TriggerProperty _triggerTimeJump;
     properties::IntProperty _jumpToTimestep;
@@ -100,7 +102,8 @@ private:
     std::map<double, Timestep> _volumeTimesteps;
     std::unique_ptr<BasicVolumeRaycaster> _raycaster;
 
-    std::shared_ptr<TransferFunction> _transferFunction;
+    std::shared_ptr<TransferFunctionHandler> _transferFunctionHandler;
+
 };
 
 } // namespace volume
diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp
index 702a3f5843..38c6ff2a65 100644
--- a/modules/volume/rendering/volumeclipplanes.cpp
+++ b/modules/volume/rendering/volumeclipplanes.cpp
@@ -40,7 +40,7 @@ VolumeClipPlanes::VolumeClipPlanes(const ghoul::Dictionary& dictionary)
         ghoul::Dictionary cutPlaneDictionary;
         dictionary.getValue(key, cutPlaneDictionary);
         auto clipPlane = std::make_shared<VolumeClipPlane>(cutPlaneDictionary);
-        clipPlane->setName(key);
+        clipPlane->setIdentifier(key);
         _clipPlanes.push_back(clipPlane);
     }
     _nClipPlanes = static_cast<int>(keys.size());
diff --git a/modules/volume/shaders/raycast.glsl b/modules/volume/shaders/raycast.glsl
index a0b7460556..49be9581ec 100644
--- a/modules/volume/shaders/raycast.glsl
+++ b/modules/volume/shaders/raycast.glsl
@@ -33,10 +33,6 @@ uniform vec2 clipOffsets_#{id}[8];
 
 uniform float opacity_#{id} = 10.0;
 
-// Value remapping:
-// Linearly remap volume values of zero to x and one to y
-// before using the values to sample the transfer function.
-uniform vec2 valueRemapping_#{id} = vec2(0.0, 1.0);
 
 // Normalization factor x for radius r [0, 1].
 // value *= 1/(r^x)
@@ -71,8 +67,6 @@ void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor,
     if (clipAlpha > 0) {
         float val = texture(volumeTexture_#{id}, transformedPos).r;
 
-        val = mix(valueRemapping_#{id}.x, valueRemapping_#{id}.y, val);
-
         if (rNormalization_#{id} > 0 && gridType_#{id} == 1) {
             val *= pow(transformedPos.x, rNormalization_#{id});
         }
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
new file mode 100644
index 0000000000..f6d4ff7c19
--- /dev/null
+++ b/modules/volume/transferfunction.cpp
@@ -0,0 +1,243 @@
+/****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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/volume/transferfunction.h>
+#include <ghoul/misc/dictionary.h>
+#include <ext/json/json.hpp>
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <ghoul/misc/dictionaryluaformatter.h>
+#include <ghoul/filesystem/filesystem.h>
+
+using json = nlohmann::json;
+
+namespace openspace {
+    namespace volume {
+
+        TransferFunction::TransferFunction() {
+        }
+
+        TransferFunction::TransferFunction(int s) {
+        }
+        
+        TransferFunction::TransferFunction(std::string s) {
+            setEnvelopesFromString(s);
+        }
+
+        TransferFunction::TransferFunction(const TransferFunction& tf) : _envelopes(tf._envelopes), _loadableFilePath(tf._loadableFilePath) { }
+
+        TransferFunction::TransferFunction(TransferFunction&& tf) : _envelopes(std::move(tf._envelopes)), _loadableFilePath(std::move(tf._loadableFilePath)) { }
+
+        TransferFunction& TransferFunction::operator=(const TransferFunction& tf) {
+            _envelopes = tf._envelopes;
+            _loadableFilePath = tf._loadableFilePath;
+            return *this;
+        }
+
+        TransferFunction& TransferFunction::operator=(TransferFunction&& tf) {
+            _envelopes = std::move(tf._envelopes);
+            _loadableFilePath = std::move(tf._loadableFilePath);
+            return *this;
+        }
+
+        bool TransferFunction::setEnvelopesFromString(std::string s) {
+            json j = json::parse(s);
+            for (json::iterator it = j.begin(); it != j.end(); ++it) {
+                Envelope env;
+                std::vector < EnvelopePoint> tmpVec;
+                for (size_t i = 0; i < 4; i++) {
+                    std::string color = (*it)["points"][i]["color"].get<std::string>();
+                    float x_value = (*it)["points"][i]["position"]["x"].get<float>();
+                    float y_value = (*it)["points"][i]["position"]["y"].get<float>();
+                    tmpVec.emplace_back(color, x_value, y_value);
+                }
+                env.setPoints(tmpVec);
+                _envelopes.emplace_back(env);
+            }
+            return true;
+        }
+        //TODO, implement this
+        bool TransferFunction::setEnvelopesFromLua(lua_State* state) {
+            bool success = (lua_istable(state, -1) == 1);
+            if (success) {
+                lua_pushnil(state);
+                while (lua_next(state, -2)) {
+                    Envelope env;
+                    std::vector<EnvelopePoint> tmpVec;
+                    
+                    /*lua_pushnil(state);
+                    while (lua_next(state, -2)) {
+                        lua_pushnil(state);
+                        while (lua_next(state, -2)) {
+                            PrintTable(state);
+                            std::string color = static_cast<std::string>(lua_tostring(state, -1));
+                            lua_pop(state, 1);
+                            lua_pushnil(state);
+                            lua_next(state, -2);
+                            float x_value = static_cast<float>(lua_tonumber(state, -1));
+                            
+                            lua_pop(state, 1);
+                            lua_next(state, -2);
+                            float y_value = static_cast<float>(lua_tonumber(state, -1));
+                            lua_pop(state, 1);
+                            tmpVec.emplace_back(color, x_value, y_value);
+                            lua_pop(state, 1);
+                        }
+                    }*/
+                    lua_pop(state, 2);
+                }
+                lua_pop(state, 1);
+            }
+            return success;
+        }
+
+        bool TransferFunction::getEnvelopesToLua(lua_State* state) {
+            lua_newtable(state);
+            for (auto iter = _envelopes.begin(); iter != _envelopes.end(); ++iter) {
+                lua_newtable(state);
+                iter->setEnvelopeLuaTable(state);
+                lua_setfield(state, -2, ("[\"" + std::to_string(iter - _envelopes.begin() + 1) + "\"]").c_str());
+            }
+            return true;
+        }
+
+        void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
+            lua_State* L = luaL_newstate();
+            std::string absFilename = absPath(path);
+            ghoul::Dictionary dictionary;
+            ghoul::lua::loadDictionaryFromFile(path, dictionary, L);
+
+            std::vector<std::string> transferfunctionKeys = dictionary.keys();
+            for (auto transferfunctionKey : transferfunctionKeys) {
+                ghoul::Dictionary transferfunctionDictionary = dictionary.value<ghoul::Dictionary>(transferfunctionKey);
+                std::vector<std::string> envelopeKeys = transferfunctionDictionary.keys();
+                for (auto envelopeKey : envelopeKeys) {
+                    ghoul::Dictionary envelopeDictionary = transferfunctionDictionary.value<ghoul::Dictionary>(envelopeKey);
+                    std::vector<std::string> pointKeys = envelopeDictionary.keys();
+                    Envelope env;
+                    std::vector < EnvelopePoint> tmpVec;
+                    for (auto pointKey : pointKeys) {
+                        ghoul::Dictionary pointDictionary = envelopeDictionary.value<ghoul::Dictionary>(pointKey);
+                        std::string color = pointDictionary.value<std::string>("color");
+                        ghoul::Dictionary positionDictionary = pointDictionary.value<ghoul::Dictionary>("position");
+                        float posX = positionDictionary.value<float>("x");
+                        float posY = positionDictionary.value<float>("y");
+                        tmpVec.emplace_back(color, posX, posY);
+                    }
+                    env.setPoints(tmpVec);
+                    _envelopes.emplace_back(env);
+                }
+            }
+        }
+
+        void TransferFunction::saveEnvelopesToFile(const std::string& path) {
+
+            ghoul::Dictionary dictionary;
+            lua_State* state = luaL_newstate();
+            getEnvelopesToLua(state);
+            
+            ghoul::lua::luaDictionaryFromState(state, dictionary);
+            ghoul::DictionaryLuaFormatter formatter;
+            std::ofstream tfFile;
+            tfFile.open(path);
+            tfFile << "return {";
+            tfFile << formatter.format(dictionary);
+            tfFile << "}";
+            tfFile.close();
+        }
+
+        bool TransferFunction::operator!=(const TransferFunction& tf) { 
+            
+            if (_envelopes.size() != tf._envelopes.size())
+                return true;
+
+            if (_loadableFilePath != tf._loadableFilePath)
+                return true;
+
+            auto iter = _envelopes.begin();
+            auto tfIter = tf._envelopes.begin();
+            for (; iter != _envelopes.end(); ++iter, ++tfIter) {
+                if (*iter != *tfIter)
+                    return true;
+            }
+            return false; 
+        }
+
+        bool TransferFunction::hasEnvelopes() const {
+            return !_envelopes.empty();
+        }
+
+        std::string TransferFunction::getSerializedToString() const {
+            if (_envelopes.empty())
+                return "";
+            json j;
+            auto envIter = _envelopes.begin();
+            for (; envIter != _envelopes.end(); ++envIter) {
+                j[std::distance(_envelopes.begin(), envIter)] = { envIter->getJSONEnvelope() };
+            }
+            return j.dump();
+        }
+
+        bool TransferFunction::createTexture(std::shared_ptr<ghoul::opengl::Texture> ptr) {
+            if (_envelopes.empty()) {
+                return false;
+            }
+            else {
+                float* transferFunction = new float[_width * 4]();
+                for (int i = 0; i < 4 * _width; ++i) {
+                    transferFunction[i] = 0.0f;
+                }
+
+                for (size_t i = 0; i <= (_width - 1); i++) {
+                    float position = static_cast<float>(i) / static_cast<float>(_width);
+                    int count = 0;
+                    glm::vec4 rgbFromEnvelopes{0.f, 0.f, 0.f, 0.f};
+                    float alpha = 0.f;
+                    for (auto iter = _envelopes.begin(); iter != _envelopes.end(); ++iter) {
+                        if (iter->isValueInEnvelope(position) && iter->isEnvelopeValid()) {
+                            count++;
+                            glm::vec4 tmp = iter->getValueAtPosition(position);
+                            rgbFromEnvelopes.r += tmp.r * tmp.a;
+                            rgbFromEnvelopes.g += tmp.g * tmp.a;
+                            rgbFromEnvelopes.b += tmp.b * tmp.a;
+                            if (alpha < tmp.a)
+                                alpha = tmp.a;
+                        }
+                    }
+                    rgbFromEnvelopes /= static_cast<float>(count == 0 ? 1 : count);
+                    rgbFromEnvelopes.w = alpha;
+
+                    for (size_t channel = 0; channel < 4; ++channel) {
+                        size_t position = 4 * i + channel;
+                        float value = rgbFromEnvelopes[channel];
+                        transferFunction[position] = value;
+                    }
+                }
+                ptr->setPixelData(transferFunction);
+                return true;
+            }
+        }
+    }
+}
diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h
new file mode 100644
index 0000000000..9f807788de
--- /dev/null
+++ b/modules/volume/transferfunction.h
@@ -0,0 +1,69 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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_VOLUME___TRANSFERFUNCTION___H__
+#define __OPENSPACE_MODULE_VOLUME___TRANSFERFUNCTION___H__
+
+#include <ghoul/glm.h>
+#include <modules/volume/envelope.h>
+
+namespace ghoul { class Dictionary; }
+
+namespace openspace {
+    namespace volume {
+        class TransferFunction {
+        public:
+            TransferFunction();
+            TransferFunction(int s);
+            TransferFunction(std::string);
+            TransferFunction(const TransferFunction& tf);
+            TransferFunction(TransferFunction&& tf);
+
+            bool getEnvelopesToLua(lua_State* state);
+            
+            bool setEnvelopesFromString(std::string s);
+            bool setEnvelopesFromLua(lua_State* lua);
+
+            void loadEnvelopesFromFile(const std::string& path);
+            void saveEnvelopesToFile(const std::string& path);
+
+            TransferFunction& operator=(const TransferFunction& tf);
+            TransferFunction& operator=(TransferFunction&& tf);
+            bool operator!=(const TransferFunction& tf);
+            bool hasEnvelopes() const;
+
+            bool createTexture(std::shared_ptr<ghoul::opengl::Texture> ptr);
+            std::string getSerializedToString() const;
+
+        private:
+            int _width = 1024;
+            double lower = 0.0;
+            double upper = 1.0;
+            std::string _loadableFilePath;
+            std::vector<Envelope> _envelopes;
+        };
+
+    }//namespace volume
+}//namespace openspace
+#endif __OPENSPACE_MODULE_VOLUME___TRANSFERFUNCTION___H__
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
new file mode 100644
index 0000000000..82b75ae4d5
--- /dev/null
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -0,0 +1,180 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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/volume/transferfunctionhandler.h>
+#include <ghoul/misc/dictionary.h>
+#include <openspace/properties/scalarproperty.h>
+#include <iostream>
+#include <fstream>
+
+#include <ghoul/opengl/ghoul_gl.h>
+#include <ghoul/filesystem/filesystem.h>
+
+static const openspace::properties::Property::PropertyInfo TransferFunctionInfo = {
+    "TransferFunction",
+    "TransferFunction",
+    "All the envelopes used in the transfer function"
+};
+
+static const openspace::properties::Property::PropertyInfo HistogramInfo = {
+    "Histogram",
+    "Histogram",
+    "All the data"
+};
+
+static const openspace::properties::Property::PropertyInfo DataUnitInfo = {
+    "DataUnit",
+    "DataUnit",
+    "Unit of the data"
+};
+
+static const openspace::properties::Property::PropertyInfo MinValueInfo = {
+    "MinValue",
+    "MinValue",
+    "Minimum value in the data"
+};
+
+static const openspace::properties::Property::PropertyInfo MaxValueInfo = {
+    "MaxValue",
+    "MaxValue",
+    "Maximum value in the data"
+};
+
+static const openspace::properties::Property::PropertyInfo SaveTransferFunctionInfo = {
+    "SaveTransferFunction",
+    "Save Transfer Function",
+    "Save your transfer function"
+};
+
+namespace openspace {
+    namespace volume {
+
+        ghoul::opengl::Texture::FilterMode filtermode = ghoul::opengl::Texture::FilterMode::Linear;
+        ghoul::opengl::Texture::WrappingMode wrappingmode = ghoul::opengl::Texture::WrappingMode::ClampToEdge;
+
+        
+        TransferFunctionHandler::TransferFunctionHandler(const properties::StringProperty& prop)
+            : properties::PropertyOwner({ "TransferFunctionHandler" }),
+            _transferFunctionPath(prop),
+            _transferFunctionProperty(TransferFunctionInfo),
+            _dataUnit(DataUnitInfo),
+            _minValue(MinValueInfo),
+            _maxValue(MaxValueInfo),
+            _histogramProperty(HistogramInfo),
+            _saveTransferFunction(SaveTransferFunctionInfo)
+        {
+            _transferFunction = std::make_shared<openspace::TransferFunction>(_transferFunctionPath);
+        }
+
+        void TransferFunctionHandler::initialize() {
+            addProperty(_transferFunctionPath);
+            addProperty(_transferFunctionProperty);
+            addProperty(_histogramProperty);
+            addProperty(_dataUnit);
+            addProperty(_minValue);
+            addProperty(_maxValue);
+            addProperty(_saveTransferFunction);
+
+            this->addTag("TF");
+            _texture = std::make_shared<ghoul::opengl::Texture>(
+                glm::size3_t(1024, 1, 1), ghoul::opengl::Texture::Format::RGBA,
+                GL_RGBA, GL_FLOAT, filtermode, wrappingmode);
+
+            if (_filePath != "") {
+                loadStoredEnvelopes();
+            }
+
+            _transferFunctionProperty.onChange([this]() {
+                setTexture();
+            });
+
+            _saveTransferFunction.onChange([this]() {
+                saveEnvelopes();
+            });
+        }
+
+        void TransferFunctionHandler::setHistogramProperty(std::shared_ptr<openspace::Histogram> histogram) {
+            _histogramProperty.setValue(histogram->getBinaryData());
+        }
+
+        void TransferFunctionHandler::setTexture() {
+            if (_transferFunctionProperty.value().createTexture(_texture)) {
+                uploadTexture();
+                useTxtTexture = false;
+            }
+        }
+
+        void TransferFunctionHandler::setUnit(const std::string& unit) {
+            _dataUnit.set(unit);
+        }
+
+        void TransferFunctionHandler::setMinAndMaxValue(const float& min, const float& max) {
+            std::stringstream s_min;
+            s_min << min;
+            std::string s = s_min.str();
+            _minValue.set(s);
+            std::stringstream s_max;
+            s_max << max;
+            std::string t = s_max.str();
+            _maxValue.set(t);
+        }
+
+
+        void TransferFunctionHandler::loadStoredEnvelopes() {
+            TransferFunction tf;
+            tf.loadEnvelopesFromFile(_filePath);
+            if (tf.hasEnvelopes()) {
+                _transferFunctionProperty.setValue(tf);
+                setTexture();
+            }
+        }
+
+        void TransferFunctionHandler::saveEnvelopes() {
+            _transferFunctionProperty.value().saveEnvelopesToFile(_filePath);
+        }
+
+        void TransferFunctionHandler::setFilepath(const std::string& path) {
+            _filePath = path;
+        }
+
+        ghoul::opengl::Texture& TransferFunctionHandler::getTexture() {
+            return *_texture.get();
+        }
+
+        void TransferFunctionHandler::uploadTexture() {
+            _texture->uploadTexture();
+        }
+
+        bool TransferFunctionHandler::hasTexture() {
+            if (_texture == nullptr)
+                return false;
+            return true;
+        }
+
+        std::shared_ptr<openspace::TransferFunction> TransferFunctionHandler::getTransferFunction() {
+            return _transferFunction;
+        }
+
+    } //namespace volume
+} // namespace openspace
diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h
new file mode 100644
index 0000000000..f526c61d21
--- /dev/null
+++ b/modules/volume/transferfunctionhandler.h
@@ -0,0 +1,86 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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_VOLUME___TRANSFERFUNCTIONHANDLER___H__
+#define __OPENSPACE_MODULE_VOLUME___TRANSFERFUNCTIONHANDLER___H__
+
+#include <functional>
+#include <ghoul/opengl/texture.h>
+#include <ghoul/glm.h>
+#include <openspace/properties/propertyowner.h>
+#include <openspace/properties/triggerproperty.h>
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/binaryproperty.h>
+#include <openspace/properties/scalarproperty.h>
+#include <openspace/util/histogram.h>
+#include <modules/volume/transferfunctionproperty.h>
+#include <modules/volume/transferfunction.h>
+#include <openspace/rendering/transferfunction.h>
+
+#include <vector>
+#include <memory>
+
+namespace openspace {
+namespace volume {
+
+class Envelope;
+        
+class TransferFunctionHandler : public properties::PropertyOwner{
+public:
+    TransferFunctionHandler(const properties::StringProperty& prop);
+            
+    void initialize();
+            
+    void setHistogramProperty(std::shared_ptr<openspace::Histogram> histogram);
+
+    void setTexture();
+    void loadStoredEnvelopes();
+    void saveEnvelopes();
+    void setFilepath(const std::string& path);
+    void setUnit(const std::string& unit);
+    void setMinAndMaxValue(const float& min, const float& max);
+
+    ghoul::opengl::Texture& getTexture();
+    void uploadTexture();
+    bool hasTexture();
+
+    std::shared_ptr<openspace::TransferFunction> getTransferFunction();
+
+private:
+    bool useTxtTexture = true;
+    properties::StringProperty _transferFunctionPath;
+    properties::StringProperty _dataUnit;
+    properties::StringProperty _minValue;
+    properties::StringProperty _maxValue;
+    properties::TriggerProperty _saveTransferFunction;
+    std::string _filePath;
+    properties::TransferFunctionProperty _transferFunctionProperty;
+    properties::BinaryProperty _histogramProperty;
+    std::shared_ptr<openspace::TransferFunction> _transferFunction;
+    std::shared_ptr<ghoul::opengl::Texture> _texture = nullptr;
+};
+
+}//namespace volume
+}//namespace openspace
+#endif __OPENSPACE_MODULE_VOLUME___TRANSFERFUNCTIONHANDLER___H__
diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp
new file mode 100644
index 0000000000..6c6a84d043
--- /dev/null
+++ b/modules/volume/transferfunctionproperty.cpp
@@ -0,0 +1,64 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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/volume/transferfunctionproperty.h>
+
+#include <ghoul/lua/ghoul_lua.h>
+
+namespace openspace::properties {
+
+#define DEFAULT_FROM_LUA_LAMBDA(TYPE, DEFAULT_VALUE)                                     \
+    [](lua_State* state, bool& success) -> TYPE {                                        \
+        TYPE TF;                                                                         \
+        success = true;                                                                  \
+        TF.setEnvelopesFromLua(state);                                                   \
+        return TF;                                                                       \
+    }
+
+#define DEFAULT_TO_LUA_LAMBDA(TYPE)                                                      \
+    [](lua_State* state, TYPE value) -> bool {                                           \
+        bool success = value.getEnvelopesToLua(state);                                   \
+        return success;                                                                  \
+    }
+
+#define DEFAULT_FROM_STRING_LAMBDA(TYPE, DEFAULT_VALUE)                                  \
+    [](std::string val, bool& success) -> TYPE {                                         \
+        TYPE TF;                                                                         \
+        success = TF.setEnvelopesFromString(val);                                        \
+        return TF;                                                                       \
+    }
+
+#define DEFAULT_TO_STRING_LAMBDA(TYPE)                                                   \
+    [](std::string& outValue, TYPE inValue) -> bool {                                    \
+        outValue = inValue.getSerializedToString();                                      \
+        return true;                                                                     \
+    }
+
+    REGISTER_TEMPLATEPROPERTY_SOURCE(TransferFunctionProperty, volume::TransferFunction, 0,
+        DEFAULT_FROM_LUA_LAMBDA(volume::TransferFunction, volume::TransferFunction(0)),
+        DEFAULT_TO_LUA_LAMBDA(volume::TransferFunction),
+        DEFAULT_FROM_STRING_LAMBDA(volume::TransferFunction, volume::TransferFunction(0)),
+        DEFAULT_TO_STRING_LAMBDA(volume::TransferFunction),
+        LUA_TTABLE);
+} // namespace openspace::properties
diff --git a/modules/volume/transferfunctionproperty.h b/modules/volume/transferfunctionproperty.h
new file mode 100644
index 0000000000..ccd981b23f
--- /dev/null
+++ b/modules/volume/transferfunctionproperty.h
@@ -0,0 +1,37 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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___TRANSFERFUNCTIONPROPERTY___H__
+#define __OPENSPACE_CORE___TRANSFERFUNCTIONPROPERTY___H__
+
+#include <openspace/properties/templateproperty.h>
+#include <modules/volume/transferfunction.h>
+
+namespace openspace::properties {
+
+    REGISTER_TEMPLATEPROPERTY_HEADER(TransferFunctionProperty, volume::TransferFunction)
+
+} // namespace openspace::properties
+
+#endif // __OPENSPACE_CORE___TRANSFERFUNCTIONPROPERTY___H__
diff --git a/modules/webbrowser/.gitignore b/modules/webbrowser/.gitignore
new file mode 100644
index 0000000000..bdcc60e117
--- /dev/null
+++ b/modules/webbrowser/.gitignore
@@ -0,0 +1 @@
+ext
diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt
new file mode 100644
index 0000000000..fcbd21acde
--- /dev/null
+++ b/modules/webbrowser/CMakeLists.txt
@@ -0,0 +1,216 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2017                                                                #
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/module_definition.cmake)
+set(WEBBROWSER_MODULE_NAME WebBrowser)
+set(WEBBROWSER_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "WEBBROWSER_MODULE_PATH")
+
+# wanted by CEF
+set(PROJECT_ARCH "x86_64")
+set(CMAKE_BUILD_TYPE Debug)
+
+##########################################################################################
+# Download CEF
+
+# Copyright (c) 2016 The Chromium Embedded Framework Authors. All rights
+# reserved. Use of this source code is governed by a BSD-style license that
+# can be found in the LICENSE file.
+
+cmake_minimum_required(VERSION 2.8.12.1)
+
+# Only generate Debug and Release configuration types.
+set(CMAKE_CONFIGURATION_TYPES Debug Release)
+
+# Use folders in the resulting project files.
+set_property(GLOBAL PROPERTY OS_FOLDERS ON)
+
+# Specify the CEF distribution version.
+set(CEF_VERSION "3.3029.1617.gaf831b6")
+
+# Add this project's cmake/ directory to the module path.
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(cef_support)
+
+# determine the current build platform
+set_current_cef_build_platform()
+
+# Download and extract the CEF binary distribution (executes DownloadCEF.cmake).
+DownloadCEF("${CEF_PLATFORM}" "${CEF_VERSION}" "${CMAKE_CURRENT_SOURCE_DIR}/ext/cef")
+
+# Add the CEF binary distribution's cmake/ directory to the module path.
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake")
+
+# Load the CEF configuration (executes FindCEF.cmake).
+find_package(CEF REQUIRED)
+
+# Include the libcef_dll_wrapper target (executes libcef_dll/CMakeLists.txt).
+add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
+
+
+##########################################################################################
+# Add CEF client files
+
+set(WEBBROWSER_SOURCES
+    webbrowsermodule.cpp
+    src/browserclient.cpp
+    src/eventhandler.cpp
+    src/webbrowserapp.cpp
+    src/defaultbrowserlauncher.cpp
+    )
+set(WEBBROWSER_SOURCES_LINUX
+    )
+set(WEBBROWSER_SOURCES_MACOSX
+    )
+set(WEBBROWSER_SOURCES_WINDOWS
+    OpenSpace.exe.manifest
+    cef_webgui.rc
+    resource.h
+    simple_handler_win.cc
+    )
+APPEND_PLATFORM_SOURCES(WEBBROWSER_SOURCES)
+source_group(WebBrowser FILES ${WEBBROWSER_SOURCES})
+
+set(WEBBROWSER_RESOURCES_SOURCES_WINDOWS
+    )
+APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_SOURCES)
+source_group(WebBrowser\\\\res FILES ${WEBBROWSER_RESOURCES_SOURCES})
+
+set(WEBBROWSER_SOURCES
+    ${WEBBROWSER_SOURCES}
+    ${WEBBROWSER_RESOURCES_SOURCES}
+    )
+
+# CEF helper sources
+set(WEBBROWSER_HELPER_SOURCES
+    src/webbrowserapp.cpp
+	)
+set(WEBBROWSER_HELPER_SOURCES_MACOSX
+    src/processhelpermac.cpp
+	)
+set(WEBBROWSER_HELPER_SOURCES_WINDOWS
+    src/processhelperwindows.cpp
+	)
+APPEND_PLATFORM_SOURCES(WEBBROWSER_HELPER_SOURCES)
+source_group(WebBrowser\\\\helper FILES ${WEBBROWSER_HELPER_SOURCES})
+
+set(WEBBROWSER_RESOURCES_MAC_SOURCES_MACOSX
+    mac/Info.plist
+    mac/webgui.icns
+    )
+APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_MAC_SOURCES)
+source_group(WebBrowser\\\\mac FILES ${WEBBROWSER_RESOURCES_MAC_SOURCES})
+
+set(WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS_MACOSX
+    mac/English.lproj/InfoPlist.strings
+    mac/English.lproj/MainMenu.xib
+    )
+APPEND_PLATFORM_SOURCES(WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS)
+source_group(WebBrowser\\\\mac\\\\English.lproj FILES ${WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS})
+
+set(WEBBROWSER_RESOURCES_SRCS
+  ${WEBBROWSER_RESOURCES_MAC_SOURCES}
+  ${WEBBROWSER_RESOURCES_MAC_ENGLISH_LPROJ_SRCS}
+  )
+
+# place helper in separate executable
+set(CEF_HELPER_TARGET "openspace_web_helper" CACHE INTERNAL "CEF_HELPER_TARGET")
+
+#
+# CEF platform-specific config
+#
+
+if(OS_MACOSX)
+    # set global CEF helper app target
+    set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app" CACHE INTERNAL "CEF_HELPER_APP")
+
+    # Helper executable target.
+    add_executable(${CEF_HELPER_TARGET} MACOSX_BUNDLE ${WEBBROWSER_HELPER_SOURCES})
+    SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
+    ADD_CEF_LOGICAL_TARGET("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
+    add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
+    target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+    set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/helper-Info.plist
+        )
+
+    # Fix the framework rpath in the helper executable.
+    FIX_MACOSX_HELPER_FRAMEWORK_RPATH(${CEF_HELPER_TARGET})
+endif()
+
+if (OS_WINDOWS)
+    message(STATUS "Setting up WebBrowser CEF helper executable: ${CEF_HELPER_TARGET}")
+    SET_OPENSPACE_CEF_TARGET_OUT_DIR()
+    add_executable(${CEF_HELPER_TARGET} ${WEBBROWSER_HELPER_SOURCES})
+    SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
+    add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
+    # Logical target used to link the libcef library.
+    ADD_CEF_LOGICAL_TARGET("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
+    target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+    # Add the custom manifest files to the executable.
+    ADD_WINDOWS_CEF_MANIFEST("${CEF_TARGET_OUT_DIR}" "${WEBBROWSER_MODULE_PATH}" "${CEF_HELPER_TARGET}" "exe")
+endif (OS_WINDOWS)
+
+
+##########################################################################################
+# Create OpenSpace module.
+set(OPENSPACE_HEADER_FILES
+    webbrowsermodule.h
+    include/webrenderhandler.h
+    include/browserclient.h
+    include/screenspacerenderhandler.h
+    include/screenspacebrowser.h
+    include/browserinstance.h
+    include/eventhandler.h
+    include/webbrowserapp.h
+    include/defaultbrowserlauncher.h
+    include/cefhost.h
+    )
+source_group("Header Files" FILES ${OPENSPACE_HEADER_FILES})
+
+set(OPENSPACE_SOURCE_FILES
+    webbrowsermodule.cpp
+    src/webrenderhandler.cpp
+    src/browserclient.cpp
+    src/screenspacerenderhandler.cpp
+    src/screenspacebrowser.cpp
+    src/browserinstance.cpp
+    src/eventhandler.cpp
+    src/webbrowserapp.cpp
+    src/defaultbrowserlauncher.cpp
+    src/cefhost.cpp
+    )
+source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+create_new_module(
+    ${WEBBROWSER_MODULE_NAME}
+    webbrowser_module
+    ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES}
+    )
+
+# Display CEF configuration settings.
+PRINT_CEF_CONFIG()
+
+target_include_directories(${webbrowser_module} PUBLIC ${CEF_ROOT})
diff --git a/modules/webbrowser/OpenSpace.exe.manifest b/modules/webbrowser/OpenSpace.exe.manifest
new file mode 100644
index 0000000000..d36f084b65
--- /dev/null
+++ b/modules/webbrowser/OpenSpace.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+  <!--The compatibility section will be merged from build/win/compatibility.manifest -->
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+</assembly>
diff --git a/modules/webbrowser/cef_webgui.rc b/modules/webbrowser/cef_webgui.rc
new file mode 100644
index 0000000000..e4645e2aa6
--- /dev/null
+++ b/modules/webbrowser/cef_webgui.rc
@@ -0,0 +1,79 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_CEFSIMPLE           ICON                    "res\cefsimple.ico"
+IDI_SMALL               ICON                    "res\small.ico"
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/modules/webbrowser/cmake/cef_support.cmake b/modules/webbrowser/cmake/cef_support.cmake
new file mode 100644
index 0000000000..843d3873b6
--- /dev/null
+++ b/modules/webbrowser/cmake/cef_support.cmake
@@ -0,0 +1,135 @@
+#########################################################################################
+#                                                                                       #
+# OpenSpace                                                                             #
+#                                                                                       #
+# Copyright (c) 2014-2017                                                               #
+#                                                                                       #
+# 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.                                         #
+#########################################################################################
+
+# This file consists of snippets taken from various CEF projects.
+
+
+# Copyright (c) 2016 The Chromium Embedded Framework Authors. All rights
+# reserved. Use of this source code is governed by a BSD-style license that
+# can be found in the LICENSE file.
+
+# Sets |CEF_PLATFORM| of parent (caller) scope. Determines the current build
+# platform.
+
+function(set_current_cef_build_platform)
+  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+    set(CEF_PLATFORM "macosx64" PARENT_SCOPE)
+  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+      set(CEF_PLATFORM "linux64" PARENT_SCOPE)
+    else()
+      set(CEF_PLATFORM "linux32" PARENT_SCOPE)
+    endif()
+  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+    if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+      set(CEF_PLATFORM "windows64" PARENT_SCOPE)
+    else()
+      set(CEF_PLATFORM "windows32" PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
+
+# Download the CEF binary distribution for |platform| and |version| to
+# |download_dir|. The |CEF_ROOT| variable will be set in global scope pointing
+# to the extracted location.
+# Visit http://opensource.spotify.com/cefbuilds/index.html for the list of
+# supported platforms and versions.
+
+function(DownloadCEF platform version download_dir)
+  # Specify the binary distribution type and download directory.
+  set(CEF_DISTRIBUTION "cef_binary_${version}_${platform}")
+  set(CEF_DOWNLOAD_DIR "${download_dir}")
+
+  # The location where we expect the extracted binary distribution.
+  set(CEF_ROOT "${CEF_DOWNLOAD_DIR}/${CEF_DISTRIBUTION}" CACHE INTERNAL "CEF_ROOT")
+
+  # Download and/or extract the binary distribution if necessary.
+  if(NOT IS_DIRECTORY "${CEF_ROOT}")
+    set(CEF_DOWNLOAD_FILENAME "${CEF_DISTRIBUTION}.tar.bz2")
+    set(CEF_DOWNLOAD_PATH "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}")
+    if(NOT EXISTS "${CEF_DOWNLOAD_PATH}")
+      set(CEF_DOWNLOAD_URL "http://opensource.spotify.com/cefbuilds/${CEF_DOWNLOAD_FILENAME}")
+
+      # Download the SHA1 hash for the binary distribution.
+      message(STATUS "Downloading CEF: ${CEF_DOWNLOAD_PATH}.sha1...")
+      file(DOWNLOAD "${CEF_DOWNLOAD_URL}.sha1" "${CEF_DOWNLOAD_PATH}.sha1")
+      file(READ "${CEF_DOWNLOAD_PATH}.sha1" CEF_SHA1)
+
+      # Download the binary distribution and verify the hash.
+      message(STATUS "Downloading CEF: ${CEF_DOWNLOAD_PATH}...")
+      file(
+        DOWNLOAD "${CEF_DOWNLOAD_URL}" "${CEF_DOWNLOAD_PATH}"
+        EXPECTED_HASH SHA1=${CEF_SHA1}
+        SHOW_PROGRESS
+        )
+    endif()
+
+    # Extract the binary distribution.
+    message(STATUS "Extracting CEF: ${CEF_DOWNLOAD_PATH}...")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E tar xzf "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}"
+      WORKING_DIRECTORY ${CEF_DOWNLOAD_DIR}
+      )
+  endif()
+endfunction()
+
+macro(SET_OPENSPACE_CEF_TARGET_OUT_DIR)
+  if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR
+     ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    # By default Ninja and Make builds don't create a subdirectory named after
+    # the configuration.
+    # set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
+    set(CEF_TARGET_OUT_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
+
+    # Output binaries (executables, libraries) to the correct directory.
+    # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
+    # set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
+  else()
+    # set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
+    set(CEF_TARGET_OUT_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>")
+  endif()
+endmacro()
+
+macro(ADD_WINDOWS_CEF_MANIFEST target_dir manifest_path target extension)
+    add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND "mt.exe" -nologo
+        -manifest \"${manifest_path}/${target}.${extension}.manifest\" \"${manifest_path}/compatibility.manifest\"
+        -outputresource:"${target_dir}/${target}.${extension}"\;\#1
+        COMMENT "Adding manifest..."
+    )
+endmacro()
+
+
+# Add a logical target that can be used to link the specified libraries into an
+# executable target.
+macro(ADD_CEF_LOGICAL_TARGET target debug_lib release_lib)
+  add_library(${target} ${CEF_LIBTYPE} IMPORTED GLOBAL)
+  set_target_properties(${target} PROPERTIES
+    IMPORTED_LOCATION "${release_lib}"
+    IMPORTED_LOCATION_DEBUG "${debug_lib}"
+    IMPORTED_LOCATION_RELEASE "${release_lib}"
+    )
+endmacro()
\ No newline at end of file
diff --git a/modules/webbrowser/cmake/webbrowser_helpers.cmake b/modules/webbrowser/cmake/webbrowser_helpers.cmake
new file mode 100644
index 0000000000..3e0bbe2c9d
--- /dev/null
+++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake
@@ -0,0 +1,133 @@
+#########################################################################################
+#                                                                                       #
+# OpenSpace                                                                             #
+#                                                                                       #
+# Copyright (c) 2014-2017                                                               #
+#                                                                                       #
+# 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.                                         #
+#########################################################################################
+
+
+function(set_cef_targets cef_root main_target)
+    # find cef cmake helpers
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_root}/cmake")
+    include(cef_support)
+    find_package(CEF REQUIRED)
+
+    # ensure out target dir is set
+    SET_OPENSPACE_CEF_TARGET_OUT_DIR()
+
+    # main CEF executable target
+    set(CEF_TARGET ${main_target} PARENT_SCOPE)
+endfunction()
+
+function(run_cef_platform_config cef_root cef_target module_path)
+    # find cef cmake helpers
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_root}/cmake")
+    include(cef_support)
+    find_package(CEF REQUIRED)
+
+    if (OS_MACOSX)
+        run_cef_macosx_config("${cef_target}" "${module_path}")
+    endif()
+    if (OS_WINDOWS)
+        run_cef_windows_config("${cef_target}" "${cef_root}" "${module_path}")
+    endif()
+    if (OS_LINUX)
+        run_cef_linux_config("${cef_target}")
+    endif()
+endfunction()
+
+function(run_cef_macosx_config CEF_ROOT module_path)
+    set(CEF_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_TARGET}.app")
+    set(CEF_FINAL_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app")
+    set(CEF_FINAL_HELPER_APP "${CEF_FINAL_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app")
+    set(CEF_FRAMEWORK_LOCATION "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework")
+    set(CEF_FRAMEWORK_FINAL_LOCATION "${CEF_FINAL_APP}/Contents/Frameworks/Chromium Embedded Framework.framework")
+
+    add_dependencies(${CEF_TARGET} libcef_dll_wrapper "${CEF_HELPER_TARGET}")
+
+    target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+    set_target_properties(${CEF_TARGET} PROPERTIES
+        RESOURCE "${WEBBROWSER_RESOURCES_SRCS}"
+        MACOSX_BUNDLE_INFO_PLIST ${module_path}/mac/Info.plist
+        )
+
+    # Copy files into the main app bundle.
+    add_custom_command(
+        TARGET ${CEF_TARGET}
+        POST_BUILD
+        # Copy the built app bundle into the proper cmake build type directory.
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_APP}" "${CEF_FINAL_APP}"
+        # Copy the helper app bundle into the Frameworks directory.
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_HELPER_APP}" "${CEF_FINAL_HELPER_APP}"
+        # Copy the CEF framework into the Frameworks directory.
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_FRAMEWORK_LOCATION}" "${CEF_FRAMEWORK_FINAL_LOCATION}"
+        VERBATIM
+    )
+
+    # copy dynamic libraries to bundle
+    file(GLOB LIBRARIES_TO_COPY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib")
+    foreach (lib_file ${LIBRARIES_TO_COPY})
+        get_filename_component(file_name "${lib_file}" NAME)
+        add_custom_command(
+            TARGET ${CEF_TARGET} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${lib_file}"
+            "${CEF_FINAL_APP}/Contents/${file_name}"
+        )
+    endforeach ()
+
+    # Fix the framework rpath in the main executable.
+    FIX_MACOSX_MAIN_FRAMEWORK_RPATH(${CEF_TARGET})
+
+    if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
+        # Manually process and copy over resource files.
+        # The Xcode generator handles this via the set_target_properties RESOURCE directive.
+        set(PREFIXES "mac/")  # Remove these prefixes from input file paths.
+        COPY_MACOSX_RESOURCES("${WEBBROWSER_RESOURCES_SOURCES}" "${PREFIXES}" "${CEF_TARGET}" "${module_path}" "${CEF_FINAL_APP}")
+    endif()
+endfunction()
+
+function(run_cef_windows_config CEF_TARGET CEF_ROOT MODULE_PATH)
+    # Executable target.
+    add_dependencies(${CEF_TARGET} libcef_dll_wrapper)
+    target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+    include_directories(${CEF_ROOT})
+
+    add_dependencies(${CEF_TARGET} libcef_dll_wrapper "${CEF_HELPER_TARGET}")
+
+    if(USE_SANDBOX)
+        # Logical target used to link the cef_sandbox library.
+        message(STATUS "Using CEF in Sandboxed mode.")
+        ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
+        target_link_libraries(${CEF_TARGET} cef_sandbox_lib ${CEF_SANDBOX_STANDARD_LIBS})
+    endif()
+
+    # Add the custom manifest files to the executable.
+    SET_OPENSPACE_CEF_TARGET_OUT_DIR()
+    ADD_WINDOWS_CEF_MANIFEST("${CEF_TARGET_OUT_DIR}" "${MODULE_PATH}" "${CEF_TARGET}" "exe")
+
+    # Copy binary and resource files to the target output directory.
+    copy_files("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "$<TARGET_FILE_DIR:${CEF_TARGET}>")
+    copy_files("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "$<TARGET_FILE_DIR:${CEF_TARGET}>")
+endfunction()
+
+function(run_cef_linux_config CEF_ROOT)
+    message(ERROR "Linux is not yet supported for Web Browser Module.")
+endfunction()
diff --git a/modules/webbrowser/compatibility.manifest b/modules/webbrowser/compatibility.manifest
new file mode 100644
index 0000000000..02cf854a84
--- /dev/null
+++ b/modules/webbrowser/compatibility.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+        </application>
+    </compatibility>
+</assembly>
\ No newline at end of file
diff --git a/modules/webbrowser/include.cmake b/modules/webbrowser/include.cmake
new file mode 100644
index 0000000000..3d5ca687a5
--- /dev/null
+++ b/modules/webbrowser/include.cmake
@@ -0,0 +1 @@
+set(DEFAULT_MODULE OFF)
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
new file mode 100644
index 0000000000..1a2ed9937b
--- /dev/null
+++ b/modules/webbrowser/include/browserclient.h
@@ -0,0 +1,54 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER___BROWSER_CLIENT___H__
+#define __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
+
+#include <memory>
+#include <include/cef_client.h>
+#include <include/cef_life_span_handler.h>
+#include <modules/webbrowser/include/defaultbrowserlauncher.h>
+#include "webrenderhandler.h"
+
+namespace openspace {
+
+class BrowserClient : public CefClient {
+public:
+    BrowserClient(WebRenderHandler*);
+
+    virtual CefRefPtr<CefRenderHandler> GetRenderHandler();
+    CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler();
+    CefRefPtr<CefRequestHandler> GetRequestHandler();
+
+private:
+    CefRefPtr<CefRenderHandler> _renderHandler;
+    CefRefPtr<CefLifeSpanHandler> _lifeSpanHandler;
+    CefRefPtr<CefRequestHandler> _requestHandler;
+
+    IMPLEMENT_REFCOUNTING(BrowserClient);
+};
+
+} // namespace openspace
+
+#endif  // __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
new file mode 100644
index 0000000000..0c9247df27
--- /dev/null
+++ b/modules/webbrowser/include/browserinstance.h
@@ -0,0 +1,71 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER__BROWSER_INSTANCE_H
+#define __OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H
+
+#include <ghoul/filesystem/filesystem.h>
+#include <openspace/engine/moduleengine.h>
+#include <openspace/engine/wrapper/windowwrapper.h>
+#include <include/wrapper/cef_helpers.h>
+#include "browserclient.h"
+#include "webrenderhandler.h"
+
+namespace openspace {
+
+class BrowserInstance {
+public:
+    BrowserInstance(WebRenderHandler*);
+    ~BrowserInstance();
+
+    void loadUrl(const std::string &);
+    bool loadLocalPath(std::string);
+    void initialize();
+    void reshape(const glm::ivec2&);
+    void draw();
+    void close(bool force = false);
+
+    bool sendKeyEvent(const CefKeyEvent &event);
+    bool sendMouseClickEvent(const CefMouseEvent &event, CefBrowserHost::MouseButtonType button,
+                             bool mouseUp, int clickCount = SINGLE_CLICK);
+    bool sendMouseMoveEvent(const CefMouseEvent &event);
+    bool sendMouseWheelEvent(const CefMouseEvent &event, glm::ivec2 delta);
+    void reloadBrowser();
+
+    const CefRefPtr<CefBrowser> &getBrowser() const;
+
+    bool hasContent(int x, int y);
+
+    const static int SINGLE_CLICK = 1;
+
+private:
+    CefRefPtr<WebRenderHandler> _renderHandler;
+    CefRefPtr<BrowserClient> _client;
+    CefRefPtr<CefBrowser> _browser;
+    bool _isInitialized;
+};
+
+}
+
+#endif //__OPENSPACE_MODULE_WEBBROWSER__BROWSER_INSTANCE_H
diff --git a/modules/webbrowser/include/cefhost.h b/modules/webbrowser/include/cefhost.h
new file mode 100644
index 0000000000..886d3f70d4
--- /dev/null
+++ b/modules/webbrowser/include/cefhost.h
@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER__CEF_HOST_H
+#define __OPENSPACE_MODULE_WEBBROWSER__CEF_HOST_H
+
+#include <include/wrapper/cef_helpers.h>
+#include <include/cef_app.h>
+#include <fmt/format.h>
+#include <include/openspace/engine/openspaceengine.h>
+#include <ghoul/logging/logmanager.h>
+#include <modules/webbrowser/include/webbrowserapp.h>
+
+namespace openspace {
+
+class CefHost {
+public:
+    CefHost(std::string helperLocation);
+    ~CefHost();
+
+private:
+    void initializeCallbacks();
+    void attachDebugSettings(CefSettings&);
+};
+
+} // namespace openspace
+
+#endif //__OPENSPACE_MODULE_WEBBROWSER__CEF_HOST_H
diff --git a/modules/webbrowser/include/defaultbrowserlauncher.h b/modules/webbrowser/include/defaultbrowserlauncher.h
new file mode 100644
index 0000000000..6b37809c74
--- /dev/null
+++ b/modules/webbrowser/include/defaultbrowserlauncher.h
@@ -0,0 +1,55 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER___DEFAULT_BROWSER_LAUNCHER___H__
+#define __OPENSPACE_MODULE_WEBBROWSER___DEFAULT_BROWSER_LAUNCHER___H__
+
+#include <include/cef_life_span_handler.h>
+#include <include/cef_request_handler.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace openspace {
+
+class DefaultBrowserLauncher : public CefLifeSpanHandler, public CefRequestHandler {
+public:
+    bool OnBeforePopup(CefRefPtr<CefBrowser> parentBrowser, 
+        const CefPopupFeatures& popupFeatures, 
+        CefWindowInfo& windowInfo, 
+        const CefString& url, 
+        CefRefPtr<CefClient>& client, 
+        CefBrowserSettings& settings);
+    bool OnOpenURLFromTab(CefRefPtr<CefBrowser> browser, 
+        CefRefPtr<CefFrame> frame, 
+        const CefString& target_url, 
+        CefRequestHandler::WindowOpenDisposition target_disposition, 
+        bool user_gesture);
+
+private:
+    void launchBrowser(const std::string &url) const;
+    IMPLEMENT_REFCOUNTING(DefaultBrowserLauncher);
+};
+
+} // namespace openspace
+
+#endif  // __OPENSPACE_MODULE_WEBBROWSER___DEFAULT_BROWSER_LAUNCHER___H__
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
new file mode 100644
index 0000000000..75813a3880
--- /dev/null
+++ b/modules/webbrowser/include/eventhandler.h
@@ -0,0 +1,91 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER___EVENT_HANDLER___H__
+#define __OPENSPACE_MODULE_WEBBROWSER___EVENT_HANDLER___H__
+
+#include <chrono>
+#include <openspace/util/keys.h>
+#include <openspace/util/mouse.h>
+#include <include/cef_browser.h>
+#include <openspace/engine/openspaceengine.h>
+#include "browserinstance.h"
+
+namespace openspace {
+
+class EventHandler {
+public:
+    EventHandler() : _mousePosition(0, 0), _browserInstance(nullptr), _lastClickPosition(0, 0) {};
+
+    void initialize();
+    void setBrowser(const CefRefPtr<CefBrowser> &browser);
+    void setBrowserInstance(const std::shared_ptr<BrowserInstance> & browserInstance);
+    void detachBrowser();
+
+private:
+#if !defined(WIN32)
+    static const int MAX_DOUBLE_CLICK_DISTANCE = 4;
+#endif
+
+    bool mouseButtonCallback(MouseButton, MouseAction);
+    bool mousePositionCallback(double, double);
+    bool mouseWheelCallback(glm::ivec2 delta);
+    bool charCallback(unsigned int, KeyModifier);
+    bool keyboardCallback(Key, KeyModifier, KeyAction);
+    bool specialKeyEvent(Key);
+    int mapFromGlfwToNative(Key);
+
+    CefMouseEvent mouseEvent();
+    cef_key_event_type_t keyEventType(KeyAction);
+
+    bool _leftMouseDown = false;
+
+    std::shared_ptr<BrowserInstance> _browserInstance;
+    glm::vec2 _mousePosition, _lastClickPosition;
+    std::chrono::high_resolution_clock::time_point _lastClickTime;
+
+    /**
+     * determines if a click should be sent as a double click or not
+     * @return
+     */
+    bool isDoubleClick() const;
+
+    /**
+     * get the number of milliseconds that is allowed between two clicks for it to count as a double click
+     * @return
+     */
+    static int doubleClickTime();
+
+    /**
+     * get the rectangle width around the first click in a double click that the second click has to be _within_
+     * @return
+     */
+    static int maxDoubleClickDistance();
+};
+
+
+}
+
+#endif //__OPENSPACE_MODULE_WEBBROWSER___EVENT_HANDLER___H__
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
new file mode 100644
index 0000000000..a02d39c89c
--- /dev/null
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -0,0 +1,77 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER__SCREEN_SPACE_BROWSER_H
+#define __OPENSPACE_MODULE_WEBBROWSER__SCREEN_SPACE_BROWSER_H
+
+#include <openspace/rendering/screenspacerenderable.h>
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/vectorproperty.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/rendering/renderengine.h>
+#include <ghoul/opengl/texture.h>
+#include <fmt/format.h>
+#include "include/screenspacerenderhandler.h"
+#include "include/browserinstance.h"
+
+namespace {
+static const openspace::properties::Property::PropertyInfo BrowserDimensionsInfo = {
+    "Dimensions",
+    "Browser Dimensions",
+    "Set the dimensions of the web browser windows."
+};
+static const openspace::properties::Property::PropertyInfo UrlInfo = {
+    "URL",
+    "url",
+    "The URL to load"
+};
+}
+
+namespace openspace {
+
+class ScreenSpaceBrowser : public ScreenSpaceRenderable {
+public:
+    ScreenSpaceBrowser(const ghoul::Dictionary& dictionary);
+
+    bool initialize() override;
+    bool deinitialize() override;
+    void render() override;
+    void update() override;
+    bool isReady() const override;
+
+private:
+    properties::StringProperty _url;
+    properties::Vec2Property _dimensions;
+    CefRefPtr<ScreenSpaceRenderHandler> _renderHandler;
+    std::shared_ptr<BrowserInstance> _browserInstance;
+    std::unique_ptr<ghoul::opengl::Texture> _texture;
+
+    bool _urlIsDirty;
+    bool _dimensionsAreDirty;
+};
+
+};
+
+#endif //__OPENSPACE_MODULE_WEBBROWSER__SCREEN_SPACE_BROWSER_H
diff --git a/modules/webbrowser/include/screenspacerenderhandler.h b/modules/webbrowser/include/screenspacerenderhandler.h
new file mode 100644
index 0000000000..f1de964115
--- /dev/null
+++ b/modules/webbrowser/include/screenspacerenderhandler.h
@@ -0,0 +1,44 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER___SCREEN_SPACE_RENDER_HANDLER_H
+#define __OPENSPACE_MODULE_WEBBROWSER___SCREEN_SPACE_RENDER_HANDLER_H
+
+#include "include/webrenderhandler.h"
+
+namespace openspace {
+
+class ScreenSpaceRenderHandler : public WebRenderHandler {
+public:
+    ScreenSpaceRenderHandler() {};
+
+    void draw(void);
+    void render();
+
+    void setTexture(const GLuint&);
+};
+
+}
+
+#endif //__OPENSPACE_MODULE_WEBBROWSER___SCREEN_SPACE_RENDER_HANDLER_H
diff --git a/modules/webbrowser/include/webbrowserapp.h b/modules/webbrowser/include/webbrowserapp.h
new file mode 100644
index 0000000000..0a84373e2a
--- /dev/null
+++ b/modules/webbrowser/include/webbrowserapp.h
@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER__WEBBROWSERAPP_H
+#define __OPENSPACE_MODULE_WEBBROWSER__WEBBROWSERAPP_H
+
+#include <include/cef_app.h>
+#include <include/wrapper/cef_helpers.h>
+
+namespace openspace {
+
+/**
+ * Custom interface to CefApp and CefRenderProcessHandler. This allows us to
+ * set global objects within, and modify, the DOM.
+ */
+class WebBrowserApp : public CefApp, public CefRenderProcessHandler {
+public:
+    WebBrowserApp();
+
+    CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
+    void OnContextCreated(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>, CefRefPtr<CefV8Context>) override;
+
+private:
+    IMPLEMENT_REFCOUNTING(WebBrowserApp);
+};
+
+};
+#endif // __OPENSPACE_MODULE_WEBBROWSER__WEBBROWSERAPP_H
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
new file mode 100644
index 0000000000..8e489d9bbc
--- /dev/null
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -0,0 +1,76 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER__WEB_RENDER_HANDLER_H
+#define __OPENSPACE_MODULE_WEBBROWSER__WEB_RENDER_HANDLER_H
+
+#include <memory>
+#include <ghoul/logging/logmanager.h>
+#include <fmt/format.h>
+#include <include/cef_render_handler.h>
+#include <ghoul/opengl/framebufferobject.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/shadermanager.h>
+#include <ghoul/opengl/shaderobject.h>
+#include <ghoul/opengl/texture.h>
+#include <ghoul/opengl/texturemanager.h>
+#include <ghoul/opengl/textureunit.h>
+
+namespace openspace {
+
+class WebRenderHandler : public CefRenderHandler {
+public:
+    virtual void draw(void) = 0;
+    virtual void render() = 0;
+
+    void reshape(int, int);
+
+    bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) override;
+    void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type, const RectList &dirtyRects, const void *buffer,
+                 int width, int height) override;
+    bool hasContent(int x, int y);
+
+protected:
+    int _width = 0, _height = 0;
+    GLuint _texture;
+
+    /**
+     * Alpha mask showing whether or not a pixel is filled with content
+     *
+     * Depending on what config you're running (Debug/Release), use different types here.
+     * This is to increase performance on Debug, since VS is performing lots of extra
+     * checks on vector<bool>.
+     */
+#if !(defined(NDEBUG) || defined(DEBUG))
+    std::vector<char> _alphaMask;
+#else
+    std::vector<bool> _alphaMask;
+#endif
+
+    IMPLEMENT_REFCOUNTING(WebRenderHandler);
+};
+
+} // namespace openspace
+
+#endif //__OPENSPACE_MODULE_WEBBROWSER__WEB_RENDER_HANDLER_H
diff --git a/modules/webbrowser/mac/English.lproj/InfoPlist.strings b/modules/webbrowser/mac/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000000..dc5ebb069b
--- /dev/null
+++ b/modules/webbrowser/mac/English.lproj/InfoPlist.strings
@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+NSHumanReadableCopyright = "© Chromium Embedded Framework Authors, 2013";
diff --git a/modules/webbrowser/mac/English.lproj/MainMenu.xib b/modules/webbrowser/mac/English.lproj/MainMenu.xib
new file mode 100644
index 0000000000..5d2ceece95
--- /dev/null
+++ b/modules/webbrowser/mac/English.lproj/MainMenu.xib
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16B2657" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1090" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <menu title="AMainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+            <items>
+                <menuItem title="cefsimple" id="56">
+                    <menu key="submenu" title="TestShell" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About cefsimple" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Preferences…" keyEquivalent="," id="129" userLabel="121"/>
+                            <menuItem isSeparatorItem="YES" id="143">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide cefsimple" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit cefsimple" keyEquivalent="q" id="136" userLabel="1111">
+                                <connections>
+                                    <action selector="terminate:" target="-1" id="369"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="83">
+                    <menu key="submenu" title="File" id="81">
+                        <items>
+                            <menuItem title="New" keyEquivalent="n" id="82" userLabel="9">
+                                <connections>
+                                    <action selector="newDocument:" target="-1" id="373"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open…" keyEquivalent="o" id="72">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="374"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="124">
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="126">
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="79" userLabel="7">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73" userLabel="1">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="193"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save" keyEquivalent="s" id="75" userLabel="3">
+                                <connections>
+                                    <action selector="saveDocument:" target="-1" id="362"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save As…" keyEquivalent="S" id="80" userLabel="8">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="saveDocumentAs:" target="-1" id="363"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Revert to Saved" id="112" userLabel="10">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="74" userLabel="2">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Page Setup..." keyEquivalent="P" id="77" userLabel="5">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="runPageLayout:" target="-1" id="87"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78" userLabel="6">
+                                <connections>
+                                    <action selector="print:" target="-1" id="86"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="217">
+                    <menu key="submenu" title="Edit" id="205">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="207">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="223"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="215">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="redo:" target="-1" id="231"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="206">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="228"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="197">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="224"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="203">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="226"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="202">
+                                <connections>
+                                    <action selector="delete:" target="-1" id="235"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="198">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="232"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="214">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Find" id="218">
+                                <menu key="submenu" title="Find" id="220">
+                                    <items>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
+                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                        </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
+                                            <connections>
+                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Spelling and Grammar" id="216">
+                                <menu key="submenu" title="Spelling and Grammar" id="200">
+                                    <items>
+                                        <menuItem title="Show Spelling…" keyEquivalent=":" id="204">
+                                            <connections>
+                                                <action selector="showGuessPanel:" target="-1" id="230"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling" keyEquivalent=";" id="201">
+                                            <connections>
+                                                <action selector="checkSpelling:" target="-1" id="225"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219">
+                                            <connections>
+                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Grammar With Spelling" id="346">
+                                            <connections>
+                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Substitutions" id="348">
+                                <menu key="submenu" title="Substitutions" id="349">
+                                    <items>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
+                                            <connections>
+                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
+                                            <connections>
+                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Speech" id="211">
+                                <menu key="submenu" title="Speech" id="212">
+                                    <items>
+                                        <menuItem title="Start Speaking" id="196">
+                                            <connections>
+                                                <action selector="startSpeaking:" target="-1" id="233"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop Speaking" id="195">
+                                            <connections>
+                                                <action selector="stopSpeaking:" target="-1" id="227"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Format" id="299">
+                    <menu key="submenu" title="Format" id="300">
+                        <items>
+                            <menuItem title="Show Fonts" keyEquivalent="t" id="344"/>
+                            <menuItem title="Show Colors" keyEquivalent="C" id="345">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="orderFrontColorPanel:" target="-1" id="361"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="View" id="295">
+                    <menu key="submenu" title="View" id="296">
+                        <items>
+                            <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298">
+                                <connections>
+                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="239">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="240"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="103" userLabel="1">
+                    <menu key="submenu" title="Help" id="106" userLabel="2">
+                        <items>
+                            <menuItem title="cefsimple Help" keyEquivalent="?" id="111">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="360"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <userDefaultsController representsSharedInstance="YES" id="389"/>
+    </objects>
+</document>
diff --git a/modules/webbrowser/mac/Info.plist b/modules/webbrowser/mac/Info.plist
new file mode 100644
index 0000000000..e9d6d962e7
--- /dev/null
+++ b/modules/webbrowser/mac/Info.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>webgui.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.openspaceproject.openspace</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>
diff --git a/modules/webbrowser/mac/helper-Info.plist b/modules/webbrowser/mac/helper-Info.plist
new file mode 100644
index 0000000000..4696e6a582
--- /dev/null
+++ b/modules/webbrowser/mac/helper-Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.cef.cefsimple.helper</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSFileQuarantineEnabled</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9.0</string>
+	<key>LSUIElement</key>
+	<string>1</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>
diff --git a/modules/webbrowser/mac/webgui.icns b/modules/webbrowser/mac/webgui.icns
new file mode 100644
index 0000000000..f36742de25
Binary files /dev/null and b/modules/webbrowser/mac/webgui.icns differ
diff --git a/modules/webbrowser/openspace_web_helper.exe.manifest b/modules/webbrowser/openspace_web_helper.exe.manifest
new file mode 100644
index 0000000000..779be4b199
--- /dev/null
+++ b/modules/webbrowser/openspace_web_helper.exe.manifest
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+  <!--The compatibility section will be merged from build/win/compatibility.manifest -->
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>
diff --git a/modules/webbrowser/resource.h b/modules/webbrowser/resource.h
new file mode 100644
index 0000000000..19093ded40
--- /dev/null
+++ b/modules/webbrowser/resource.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by cefsimple.rc
+//
+
+#define IDI_CEFSIMPLE                   100
+#define IDI_SMALL                       101
+
+// Avoid files associated with MacOS
+#define _X86_
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         32700
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           102
+#endif
+#endif
diff --git a/modules/webbrowser/shaders/screenspace_fs.glsl b/modules/webbrowser/shaders/screenspace_fs.glsl
new file mode 100644
index 0000000000..d2a0660d3d
--- /dev/null
+++ b/modules/webbrowser/shaders/screenspace_fs.glsl
@@ -0,0 +1,49 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+uniform sampler2D texture1;
+uniform float OcclusionDepth;
+uniform float Alpha;
+
+in vec2 vs_st;
+in vec4 vs_position;
+
+#include "fragment.glsl"
+#include "PowerScaling/powerScaling_fs.hglsl"
+
+Fragment getFragment() {
+    Fragment frag;
+
+    // power scale coordinates for depth. w value is set to 1.0.
+    float depth = (1.0 + log(abs(OcclusionDepth) + 1/pow(k, 1.0))/log(k)) / 27.0;
+    frag.color = texture(texture1, vec2(vs_st.s, vs_st.t));
+    frag.color.a = (frag.color.a != 0.0f) ? Alpha : frag.color.a;
+    if(frag.color.a == 0.0f){
+        discard;
+    }
+
+    frag.depth = denormalizeFloat(depth);
+
+    return frag;
+}
diff --git a/modules/webbrowser/shaders/screenspace_vs.glsl b/modules/webbrowser/shaders/screenspace_vs.glsl
new file mode 100644
index 0000000000..9accc77e30
--- /dev/null
+++ b/modules/webbrowser/shaders/screenspace_vs.glsl
@@ -0,0 +1,40 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+#version __CONTEXT__
+
+uniform mat4 ModelTransform;
+uniform mat4 ViewProjectionMatrix;
+
+layout(location = 0) in vec4 in_position;
+layout(location = 1) in vec2 in_st;
+
+out vec2 vs_st;
+out vec4 vs_position;
+
+void main(){
+    vs_st = in_st;
+    vs_position =  ViewProjectionMatrix * ModelTransform * in_position * vec4(1.0, -1.0, 1.0, 1.0);
+    gl_Position =  vec4(vs_position);
+}
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
new file mode 100644
index 0000000000..040021a160
--- /dev/null
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -0,0 +1,50 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 "include/browserclient.h"
+#include <modules/webbrowser/include/defaultbrowserlauncher.h>
+
+namespace openspace {
+
+BrowserClient::BrowserClient(WebRenderHandler* handler) {
+    _renderHandler = handler;
+    auto *browserLauncher = new DefaultBrowserLauncher;
+    _lifeSpanHandler = browserLauncher;
+    _requestHandler = browserLauncher;
+};
+
+CefRefPtr<CefRenderHandler> BrowserClient::GetRenderHandler() {
+    return _renderHandler;
+}
+
+CefRefPtr<CefLifeSpanHandler> BrowserClient::GetLifeSpanHandler() {
+    return _lifeSpanHandler;
+}
+
+CefRefPtr<CefRequestHandler> BrowserClient::GetRequestHandler() {
+    return _requestHandler;
+}
+
+} // namespace openspace
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
new file mode 100644
index 0000000000..1b8434e335
--- /dev/null
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -0,0 +1,145 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 <webbrowsermodule.h>
+#include "include/browserinstance.h"
+
+namespace {
+const char* _loggerCat = "CEF BrowserInstance";
+const bool DID_NOT_LEAVE_WINDOW = false;
+}
+
+namespace openspace {
+
+BrowserInstance::BrowserInstance(WebRenderHandler* renderer) : _isInitialized(false) {
+    _renderHandler = renderer;
+    _client = new BrowserClient(_renderHandler);
+
+    CefWindowInfo windowInfo;
+    bool renderTransparent = true;
+    windowInfo.SetAsWindowless(nullptr, renderTransparent);
+
+    CefBrowserSettings browserSettings;
+    browserSettings.windowless_frame_rate = 60;
+
+    std::string url = "";
+    _browser = CefBrowserHost::CreateBrowserSync(windowInfo, _client.get(), url, browserSettings, NULL);
+}
+
+BrowserInstance::~BrowserInstance() {
+    _browser->GetHost()->CloseBrowser(false);
+}
+
+void BrowserInstance::initialize() {
+    auto &wrapper = OsEng.windowWrapper();
+    reshape(wrapper.currentWindowSize());
+
+    _isInitialized = true;
+}
+
+void BrowserInstance::loadUrl(const std::string &url) {
+    if (!_isInitialized) {
+        initialize();
+    }
+
+    LDEBUG(fmt::format("Loading URL: {}", url));
+    _browser->GetMainFrame()->LoadURL(url);
+}
+
+/**
+ * Load a local file
+ * @param path - the path to load
+ * @return true if the path exists, false otherwise
+ */
+bool BrowserInstance::loadLocalPath(std::string path) {
+    if (!FileSys.fileExists(path)) {
+        LDEBUG(fmt::format("Could not find path `{}`, verify that it is correct.", path));
+        return false;
+    }
+
+    loadUrl(absPath(path));
+    return true;
+}
+
+/**
+ * Call when the window has been reshaped
+ * @param wrapper the windowWrapper capable of
+ */
+void BrowserInstance::reshape(const glm::ivec2 &windowSize) {
+    _renderHandler->reshape(windowSize.x, windowSize.y);
+    _browser->GetHost()->WasResized();
+}
+
+/**
+ * encapsulate renderHandler's draw method
+ */
+void BrowserInstance::draw() {
+    _renderHandler->draw();
+}
+
+void BrowserInstance::close(bool force) {
+    LDEBUG(fmt::format("Closing browser. {}", force ? "Forcing." : ""));
+    _browser->GetHost()->CloseBrowser(force);
+}
+
+const CefRefPtr<CefBrowser> &BrowserInstance::getBrowser() const {
+    return _browser;
+}
+
+bool BrowserInstance::sendKeyEvent(const CefKeyEvent &event) {
+    _browser->GetHost()->SendKeyEvent(event);
+    return false;
+}
+
+bool BrowserInstance::sendMouseClickEvent(const CefMouseEvent &event, CefBrowserHost::MouseButtonType button,
+                                          bool mouseUp, int clickCount) {
+    _browser->GetHost()->SendMouseClickEvent(event, button, mouseUp, clickCount);
+    return hasContent(event.x, event.y);
+}
+
+bool BrowserInstance::sendMouseMoveEvent(const CefMouseEvent &event) {
+    _browser->GetHost()->SendMouseMoveEvent(event, DID_NOT_LEAVE_WINDOW);
+    return false;
+}
+
+/**
+ * send scroll wheel event to browser
+ * @param event - key event with position
+ * @param delta - the scroll amount in pixels
+ * @return if this scroll should be blocked or not
+ */
+bool BrowserInstance::sendMouseWheelEvent(const CefMouseEvent &event, glm::ivec2 delta) {
+    _browser->GetHost()->SendMouseWheelEvent(event, delta.x, delta.y);
+    return hasContent(event.x, event.y);
+}
+
+void BrowserInstance::reloadBrowser() {
+    _browser->Reload();
+}
+
+bool BrowserInstance::hasContent(int x, int y) {
+    return _renderHandler->hasContent(x, y);
+}
+
+}
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
new file mode 100644
index 0000000000..3ddee68ec8
--- /dev/null
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -0,0 +1,72 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 "include/cefhost.h"
+
+namespace {
+const char* _loggerCat = "CefHost";
+}
+
+namespace openspace {
+
+CefHost::CefHost(std::string helperLocation) {
+    LDEBUG("Initializing CEF...");
+    CefMainArgs args;
+    CefSettings settings;
+
+    CefString(&settings.browser_subprocess_path).FromASCII((char*) helperLocation.c_str());
+    attachDebugSettings(settings);
+
+#ifdef WIN32
+    // Enable High-DPI support on Windows 7 or newer.
+    CefEnableHighDPISupport();
+#endif
+    CefRefPtr<WebBrowserApp> app(new WebBrowserApp);
+
+    CefInitialize(args, settings, app.get(), NULL);
+    initializeCallbacks();
+    LDEBUG("Initializing CEF... done!");
+}
+
+CefHost::~CefHost() {
+    CefShutdown();
+}
+
+void CefHost::attachDebugSettings(CefSettings &settings) {
+    settings.remote_debugging_port = 8088;
+    LDEBUG(fmt::format("Remote WebBrowser debugging available on http://localhost:{}", settings.remote_debugging_port));
+//    settings.single_process = true;
+}
+
+void CefHost::initializeCallbacks() {
+    OsEng.registerModuleCallback(
+            OpenSpaceEngine::CallbackOption::Render,
+            [this](){
+                CefDoMessageLoopWork();
+            }
+    );
+}
+
+}
+
diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp
new file mode 100644
index 0000000000..87233d9f9a
--- /dev/null
+++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp
@@ -0,0 +1,67 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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/webbrowser/include/defaultbrowserlauncher.h>
+#include <ghoul/logging/logmanager.h>
+
+#ifdef WIN32
+#include <Windows.h>
+#include <shellapi.h>
+#endif
+
+namespace {
+const char* _loggerCat = "DefaultBrowserLauncher";
+}
+
+namespace openspace {
+
+bool DefaultBrowserLauncher::OnBeforePopup(CefRefPtr<CefBrowser> parentBrowser,
+    const CefPopupFeatures& popupFeatures,
+    CefWindowInfo& windowInfo,
+    const CefString& url,
+    CefRefPtr<CefClient>& client,
+    CefBrowserSettings& settings) {
+    // never permit CEF popups, always launch in default browser
+    launchBrowser(url.ToString());
+    return true;
+}
+
+bool DefaultBrowserLauncher::OnOpenURLFromTab(CefRefPtr<CefBrowser> browser,
+    CefRefPtr<CefFrame> frame,
+    const CefString& url,
+    CefRequestHandler::WindowOpenDisposition target_disposition,
+    bool user_gesture) {
+    launchBrowser(url.ToString());
+    // block url opening
+    return true;
+}
+
+void DefaultBrowserLauncher::launchBrowser(const std::string &url) const {
+    LDEBUG("Launching default browser: " + url);
+#ifdef WIN32
+    ShellExecute(0, 0, url.c_str(), 0, 0, SW_SHOW);
+#endif
+}
+
+} // namespace openspace
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
new file mode 100644
index 0000000000..174dd24109
--- /dev/null
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -0,0 +1,253 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 <ext/ghoul/include/ghoul/logging/logmanager.h>
+#include <ext/ghoul/ext/cppformat/fmt/format.h>
+#include "include/eventhandler.h"
+
+namespace {
+const std::string _loggerCat = "WebBrowser:EventHandler";
+}
+
+namespace openspace {
+void EventHandler::initialize() {
+    OsEng.registerModuleCharCallback(
+            [this](unsigned int charCode, KeyModifier mod) -> bool {
+                if (_browserInstance) {
+                    return charCallback(charCode, mod);
+                }
+                return false;
+            }
+    );
+    OsEng.registerModuleKeyboardCallback(
+            [this](Key key, KeyModifier mod, KeyAction action) -> bool {
+                if (_browserInstance) {
+                    return keyboardCallback(key, mod, action);
+                }
+                return false;
+            }
+    );
+    OsEng.registerModuleMousePositionCallback(
+            [this](double x, double y) -> bool {
+                if (_browserInstance) {
+                    return mousePositionCallback(x, y);
+                }
+                return false;
+            }
+    );
+    OsEng.registerModuleMouseButtonCallback(
+            [this](MouseButton button, MouseAction action) -> bool {
+                if (_browserInstance) {
+                    return mouseButtonCallback(button, action);
+                }
+                return false;
+            }
+    );
+    OsEng.registerModuleMouseScrollWheelCallback(
+            [this](double x, double y) -> bool {
+                if (_browserInstance) {
+                    const glm::ivec2 delta(x, y);
+                    return mouseWheelCallback(delta);
+                }
+                return false;
+            }
+    );
+
+}
+
+bool EventHandler::mouseButtonCallback(MouseButton button, MouseAction action) {
+    if (button != MouseButton::Left) return false;
+
+    int clickCount = BrowserInstance::SINGLE_CLICK;
+
+    // click or release?
+    if (action == MouseAction::Release) {
+        _leftMouseDown = false;
+    } else {
+        if (isDoubleClick() ) {
+            ++clickCount;
+        } else {
+            _lastClickTime = std::chrono::high_resolution_clock::now();
+        }
+
+        _leftMouseDown = true;
+        _lastClickPosition = _mousePosition;
+    }
+
+    return _browserInstance->sendMouseClickEvent(mouseEvent(), MBT_LEFT, !_leftMouseDown, clickCount);
+}
+
+bool EventHandler::isDoubleClick() const {
+    // check time
+    using namespace std::chrono;
+    auto now = high_resolution_clock::now();
+    milliseconds maxTimeDifference(EventHandler::doubleClickTime());
+    auto requiredTime = _lastClickTime + maxTimeDifference;
+    if (requiredTime < now) {
+        return false;
+    }
+
+    // check position
+    float maxDist = EventHandler::maxDoubleClickDistance() / 2;
+    bool x = abs(_mousePosition.x - _lastClickPosition.x) < maxDist;
+    bool y = abs(_mousePosition.y - _lastClickPosition.y) < maxDist;
+
+    return x && y;
+}
+
+bool EventHandler::mousePositionCallback(double x, double y) {
+    _mousePosition.x = (int) x;
+    _mousePosition.y = (int) y;
+    _browserInstance->sendMouseMoveEvent(mouseEvent());
+    // Let the mouse event trickle on
+    return false;
+}
+
+bool EventHandler::mouseWheelCallback(glm::ivec2 delta) {
+#ifdef WIN32
+    // scroll wheel returns very low numbers on Windows machines
+    delta.x *= 50;
+    delta.y *= 50;
+#endif
+    return _browserInstance->sendMouseWheelEvent(mouseEvent(), delta);
+}
+
+bool EventHandler::charCallback(unsigned int charCode, KeyModifier modifier) {
+    CefKeyEvent keyEvent;
+    keyEvent.windows_key_code = charCode;
+    keyEvent.modifiers        = static_cast<uint32>(modifier);
+    keyEvent.type             = KEYEVENT_CHAR;
+    // TODO(klas): figure out when to block
+    return _browserInstance->sendKeyEvent(keyEvent);
+}
+
+bool EventHandler::keyboardCallback(Key key, KeyModifier modifier, KeyAction action) {
+    if (specialKeyEvent(key)) {
+        return true;
+    }
+
+    CefKeyEvent keyEvent;
+//        keyEvent.native_key_code  = mapFromGlfwToNative(key);
+    // TODO(klas): Use something less platform specific?
+    keyEvent.windows_key_code = mapFromGlfwToNative(key);
+    keyEvent.modifiers        = static_cast<uint32>(modifier);
+    keyEvent.type             = keyEventType(action);
+    // TODO(klas): figure out when to block
+    return _browserInstance->sendKeyEvent(keyEvent);
+}
+
+/**
+ * Detect if there is a special event that should be caught by the GUI before it is sent to CEF
+ * @param key the pressed key
+ * @return true if event found, false otherwise
+ */
+bool EventHandler::specialKeyEvent(Key key) {
+    switch(key) {
+        case Key::F5:
+            _browserInstance->reloadBrowser();
+            return true;
+    }
+    return false;
+}
+
+/**
+ * Map from GLFW key codes to "regular" key codes, supported by JS and CEF.
+ * See http://keycode.info/ for lookup
+ * @param key
+ * @return the key code, if mapped or the GLFW key code
+ */
+int EventHandler::mapFromGlfwToNative(Key key) {
+    switch (key) {
+        case Key::BackSpace:      return 8;
+        case Key::Tab:            return 9;
+        case Key::Enter:          return 13;
+        case Key::Left:           return 37;
+        case Key::Up:             return 38;
+        case Key::Right:          return 39;
+        case Key::Down:           return 40;
+        case Key::Delete:         return 46;
+        default:                  return static_cast<int>(key);
+    }
+}
+
+/**
+ * Find the CEF key event to use for a given action
+ * @param action
+ * @return
+ */
+cef_key_event_type_t EventHandler::keyEventType(KeyAction action) {
+    if (action == KeyAction::Release) {
+        return KEYEVENT_KEYUP;
+    } else {
+//            return KEYEVENT_RAWKEYDOWN;
+        return KEYEVENT_KEYDOWN;
+    }
+}
+
+/**
+ * Create a mouse event on the current cursor position
+ * @return
+ */
+CefMouseEvent EventHandler::mouseEvent() {
+    CefMouseEvent event;
+    event.x = (int) _mousePosition.x;
+    event.y = (int) _mousePosition.y;
+
+    if (_leftMouseDown) {
+        event.modifiers = EVENTFLAG_LEFT_MOUSE_BUTTON;
+    }
+
+    return event;
+}
+
+void EventHandler::setBrowserInstance(const std::shared_ptr<BrowserInstance> &browserInstance) {
+    LDEBUG("Setting browser instance.");
+    _browserInstance = browserInstance;
+}
+
+void EventHandler::detachBrowser() {
+    if (_browserInstance) {
+        LDEBUG(fmt::format("Detaching browser instance with use count {}", _browserInstance.use_count()));
+    }
+    _browserInstance = nullptr;
+}
+
+int EventHandler::doubleClickTime() {
+#ifdef WIN32
+    return GetDoubleClickTime();
+#else
+    return 500;
+#endif
+}
+
+int EventHandler::maxDoubleClickDistance() {
+#ifdef WIN32
+    return GetSystemMetrics(SM_CXDOUBLECLK);
+#else
+    return MAX_DOUBLE_CLICK_DISTANCE;
+#endif
+}
+
+} // namespace openspace
diff --git a/modules/webbrowser/src/processhelpermac.cpp b/modules/webbrowser/src/processhelpermac.cpp
new file mode 100644
index 0000000000..a1e5f189f1
--- /dev/null
+++ b/modules/webbrowser/src/processhelpermac.cpp
@@ -0,0 +1,41 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that can
+// be found in the LICENSE file.
+
+#include "include/cef_app.h"
+#include "include/webbrowserapp.h"
+
+// Entry point function for sub-processes.
+int main(int argc, char* argv[]) {
+    // Provide CEF with command-line arguments.
+    CefMainArgs main_args(argc, argv);
+
+    CefRefPtr<openspace::WebBrowserApp> app(new openspace::WebBrowserApp);
+
+    // Execute the sub-process.
+    return CefExecuteProcess(main_args, app.get(), NULL);
+}
diff --git a/modules/webbrowser/src/processhelperwindows.cpp b/modules/webbrowser/src/processhelperwindows.cpp
new file mode 100644
index 0000000000..f64f323975
--- /dev/null
+++ b/modules/webbrowser/src/processhelperwindows.cpp
@@ -0,0 +1,44 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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.                                         *
+ ****************************************************************************************/
+
+// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that can
+// be found in the LICENSE file.
+
+#include "include/cef_app.h"
+#include "include/webbrowserapp.h"
+
+// Entry point function for sub-processes.
+int main(HINSTANCE hInstance,
+	  	 HINSTANCE hPrevInstance,
+		 LPTSTR lpCmdLine,
+		 int nCmdShow) {
+  // Provide CEF with command-line arguments.
+  CefMainArgs main_args(hInstance);
+
+  CefRefPtr<openspace::WebBrowserApp> app(new openspace::WebBrowserApp);
+
+  // Execute the sub-process.
+  return CefExecuteProcess(main_args, app.get(), NULL);
+}
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
new file mode 100644
index 0000000000..7ae604f5e3
--- /dev/null
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -0,0 +1,134 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 <webbrowsermodule.h>
+#include "include/screenspacebrowser.h"
+
+
+namespace {
+const char* KeyIdentifier = "Indentifier";
+const char* KeyUrl = "URL";
+const std::string _loggerCat = "ScreenSpaceBrowser";
+} // namespace
+
+namespace openspace {
+
+ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
+        : ScreenSpaceRenderable(dictionary)
+        , _urlIsDirty(false)
+        , _dimensionsAreDirty(false)
+        , _url(UrlInfo)
+        , _dimensions(BrowserDimensionsInfo,
+                     glm::vec2(0.0f),
+                     glm::vec2(0.0f),
+                     glm::vec2(3000.0f))
+{
+    if (dictionary.hasKey(KeyIdentifier)) {
+        setIdentifier(dictionary.value<std::string>(KeyIdentifier));
+    } else {
+        static int id = 0;
+        setIdentifier("ScreenSpaceBrowser " + std::to_string(id));
+        ++id;
+    }
+
+    std::string urlToLoad;
+    if (dictionary.getValue(KeyUrl, urlToLoad)) {
+        _url = dictionary.value<std::string>(KeyUrl);
+    }
+
+    glm::vec2 windowDimensions = OsEng.windowWrapper().currentWindowSize();
+    _dimensions = windowDimensions;
+
+    _texture = std::make_unique<ghoul::opengl::Texture>(glm::uvec3(windowDimensions, 1.0f));
+    _renderHandler = new ScreenSpaceRenderHandler();
+    _browserInstance = std::make_shared<BrowserInstance>(_renderHandler);
+
+    _url.onChange([this]() { _urlIsDirty = true; });
+    _dimensions.onChange([this]() { _dimensionsAreDirty = true; });
+
+    addProperty(_url);
+    addProperty(_dimensions);
+
+    auto webBrowser = OsEng.moduleEngine().module<WebBrowserModule>();
+    if (webBrowser != nullptr) {
+        webBrowser->addBrowser(_browserInstance);
+    }
+}
+
+bool ScreenSpaceBrowser::initialize() {
+    _originalViewportSize = OsEng.windowWrapper().currentWindowSize();
+    _renderHandler->setTexture((GLuint) *_texture);
+
+    createPlane();
+    // Load a special version of the regular ScreenRenderable shaders. This mirrors the
+    // image along the Y axis since the image produced by CEF was flipped.
+    //createShaders("${MODULE_WEBBROWSER}/shaders/");
+
+    createShaders();
+
+    _browserInstance->loadUrl(_url);
+
+    return isReady();
+}
+
+bool ScreenSpaceBrowser::deinitialize() {
+    std::string urlString;
+    _url.getStringValue(urlString);
+    LDEBUG(fmt::format("Deinitializing ScreenSpaceBrowser: {}", urlString));
+
+    _browserInstance->close(true);
+
+    auto webBrowser = OsEng.moduleEngine().module<WebBrowserModule>();
+    if (webBrowser != nullptr) {
+        webBrowser->removeBrowser(_browserInstance);
+        _browserInstance.reset();
+        return true;
+    }
+
+    LWARNING("Could not find WebBrowserModule");
+    return false;
+}
+
+void ScreenSpaceBrowser::render() {
+    draw(rotationMatrix() * translationMatrix() * scaleMatrix());
+}
+
+void ScreenSpaceBrowser::update() {
+    if (_urlIsDirty) {
+        _browserInstance->loadUrl(_url);
+        _urlIsDirty = false;
+    }
+
+    if (_dimensionsAreDirty) {
+        _browserInstance->reshape(_dimensions.value());
+        _originalViewportSize = _dimensions.value();
+        _dimensionsAreDirty = false;
+    }
+}
+
+bool ScreenSpaceBrowser::isReady() const {
+    return _shader && _texture;
+}
+
+} // namespace openspace
diff --git a/modules/webbrowser/src/screenspacerenderhandler.cpp b/modules/webbrowser/src/screenspacerenderhandler.cpp
new file mode 100644
index 0000000000..24162c3bfd
--- /dev/null
+++ b/modules/webbrowser/src/screenspacerenderhandler.cpp
@@ -0,0 +1,41 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 "include/screenspacerenderhandler.h"
+
+namespace openspace {
+
+void ScreenSpaceRenderHandler::draw(void) {
+
+}
+
+void ScreenSpaceRenderHandler::render() {
+
+}
+
+void ScreenSpaceRenderHandler::setTexture(const GLuint &t) {
+    _texture = t;
+}
+
+}
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
new file mode 100644
index 0000000000..202bae5621
--- /dev/null
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -0,0 +1,43 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 "include/webbrowserapp.h"
+namespace openspace {
+
+WebBrowserApp::WebBrowserApp() = default;
+
+CefRefPtr<CefRenderProcessHandler> WebBrowserApp::GetRenderProcessHandler() {
+    return this;
+}
+
+void WebBrowserApp::OnContextCreated(CefRefPtr<CefBrowser> browser,
+                                     CefRefPtr<CefFrame> frame,
+                                     CefRefPtr<CefV8Context> context) {
+    CEF_REQUIRE_UI_THREAD();
+    CefRefPtr<CefV8Value> val = CefV8Value::CreateBool(true);
+    CefRefPtr<CefV8Value> global = context->GetGlobal();
+    global->SetValue("IsWithinCEF", val, V8_PROPERTY_ATTRIBUTE_NONE);
+}
+
+}
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
new file mode 100644
index 0000000000..bd8165299d
--- /dev/null
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -0,0 +1,69 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 <algorithm>
+#include "include/webrenderhandler.h"
+
+namespace openspace {
+
+void WebRenderHandler::reshape(int w, int h) {
+//    LDEBUGC("WebRenderHandler", fmt::format("Reshaping browser window. Width: {}, height: {}", w, h));
+    _width = w;
+    _height = h;
+    _alphaMask.clear();
+    _alphaMask.resize(w * h);
+}
+
+bool WebRenderHandler::GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) {
+    rect = CefRect(0, 0, _width, _height);
+    return true;
+}
+
+void WebRenderHandler::OnPaint(CefRefPtr<CefBrowser> browser, CefRenderHandler::PaintElementType type,
+                               const CefRenderHandler::RectList &dirtyRects, const void *buffer,
+                               int w, int h) {
+    glBindTexture(GL_TEXTURE_2D, _texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, _width, _height, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, (unsigned char*) buffer);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+
+    // copy alpha channel from buffer into the alpha mask
+    int maskSize = w * h;
+    auto bf = (unsigned char*) buffer;
+    int bufferIndex = 3, maskIndex = 0;
+    for (; maskIndex < maskSize; bufferIndex += 4, ++maskIndex) {
+        _alphaMask[maskIndex] = bf[bufferIndex] > 0;
+    }
+}
+
+bool WebRenderHandler::hasContent(int x, int y) {
+    int index = x + (_width * y);
+    index = glm::clamp(index, (int) 0, (int) _alphaMask.size() - 1);
+    return _alphaMask[index];
+}
+
+}
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
new file mode 100644
index 0000000000..575b6b02d9
--- /dev/null
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -0,0 +1,132 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 <include/openspace/util/factorymanager.h>
+#include <include/screenspacebrowser.h>
+#include "webbrowsermodule.h"
+
+namespace {
+const char* _loggerCat = "WebBrowser";
+}
+
+using ghoul::filesystem::Directory;
+
+namespace openspace {
+
+WebBrowserModule::WebBrowserModule() : OpenSpaceModule(WebBrowserModule::Name) {
+    LDEBUG("Starting CEF...");
+    auto helperLocation = findHelperExecutable();
+    LDEBUG("Using web helper executable: " + helperLocation);
+    _cefHost = std::make_unique<CefHost>(helperLocation);
+    LDEBUG("Starting CEF... done!");
+
+    OsEng.registerModuleCallback(
+        OpenSpaceEngine::CallbackOption::Deinitialize,
+        [this](){ deinitialize(); }
+    );
+}
+
+WebBrowserModule::~WebBrowserModule() {}
+
+void WebBrowserModule::internalDeinitialize() {
+    _eventHandler.detachBrowser();
+
+    bool forceBrowserShutdown = true;
+    for (auto browser : _browsers) {
+        browser->close(forceBrowserShutdown);
+    }
+}
+
+/**
+ * Try to find the CEF Helper executable. It looks in the bin/openspace folder. Therefore,
+ * if you change that this might cause a crash here.
+ * @return the absolute path to the file
+ */
+std::string WebBrowserModule::findHelperExecutable() {
+    if (OsEng.configurationManager().hasKey(ConfigurationManager::KeyWebHelperLocation)) {
+        auto execLocation = absPath(OsEng.configurationManager().value<std::string>(
+            ConfigurationManager::KeyWebHelperLocation) + SUBPROCESS_ENDING);
+        if (!FileSys.fileExists(execLocation)) {
+            LERROR(fmt::format("Could not find web helper executable at location: {}" , execLocation));
+        }
+        return execLocation;
+    }
+    else {
+        std::string subprocessName = SUBPROCESS_NAME;
+        subprocessName += SUBPROCESS_ENDING;
+        LWARNING(fmt::format("Assuming web helper name is {}", subprocessName));
+        auto subLength = (int)subprocessName.length();
+
+        Directory binDir("${BASE}/bin/openspace", Directory::AbsolutePath::No);
+        std::vector<std::string> foundFiles = binDir.readFiles(Directory::Recursive::Yes, Directory::Sort::Yes);
+
+        // find files matching the given file name
+        std::vector<std::string> matchingFiles;
+        std::copy_if(foundFiles.begin(), foundFiles.end(), std::back_inserter(matchingFiles),
+            [subprocessName, subLength](std::string s) {
+            s = s.substr(s.size() - subLength);
+            return s == subprocessName;
+        });
+
+        if (matchingFiles.empty()) {
+            LERROR(fmt::format("Could not find requested sub process executable file name: {}", subprocessName));
+        }
+
+        return matchingFiles.back();
+
+    }
+}
+
+void WebBrowserModule::internalInitialize(const ghoul::Dictionary& configuration) {
+    _eventHandler.initialize();
+
+    // register ScreenSpaceBrowser
+    auto fScreenSpaceRenderable = FactoryManager::ref().factory<ScreenSpaceRenderable>();
+    ghoul_assert(fScreenSpaceRenderable, "ScreenSpaceRenderable factory was not created");
+    fScreenSpaceRenderable->registerClass<ScreenSpaceBrowser>("ScreenSpaceBrowser");
+}
+
+int WebBrowserModule::addBrowser(std::shared_ptr<BrowserInstance> browser) {
+    static int browserId = 0;
+    _browsers.push_back(browser);
+    int givenId = browserId++;
+    return givenId;
+}
+
+void WebBrowserModule::removeBrowser(std::shared_ptr<BrowserInstance> browser) {
+    auto p = std::find(_browsers.begin(), _browsers.end(), browser);
+    if (p != _browsers.end()) {
+        _browsers.erase(p);
+    } else {
+        LWARNING("Could not find browser in list of browsers.");
+    }
+
+    LDEBUG(fmt::format("Number of browsers stored: {}", _browsers.size()));
+}
+
+void WebBrowserModule::attachEventHandler(std::shared_ptr<BrowserInstance> browserInstance) {
+    _eventHandler.setBrowserInstance(browserInstance);
+}
+
+}
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
new file mode 100644
index 0000000000..85c74902cf
--- /dev/null
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -0,0 +1,71 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBBROWSER___WEBBROWSERMODULE___H__
+#define __OPENSPACE_MODULE_WEBBROWSER___WEBBROWSERMODULE___H__
+
+#include <openspace/util/openspacemodule.h>
+#include <ghoul/filesystem/directory.h>
+#include <include/openspace/engine/configurationmanager.h>
+#include <include/wrapper/cef_helpers.h>
+#include <include/cef_browser.h>
+#include "include/eventhandler.h"
+#include "include/browserinstance.h"
+#include "include/cefhost.h"
+
+namespace openspace {
+
+    static const std::string SUBPROCESS_NAME = "openspace_web_helper";
+#ifdef WIN32
+static const std::string SUBPROCESS_ENDING = ".exe";
+#else
+static const std::string SUBPROCESS_ENDING = "";
+#endif
+
+class WebBrowserModule : public OpenSpaceModule {
+public:
+    static constexpr const char* Name = "WebBrowser";
+    WebBrowserModule();
+    ~WebBrowserModule();
+
+    int addBrowser(std::shared_ptr<BrowserInstance>);
+    void removeBrowser(std::shared_ptr<BrowserInstance>);
+
+    void attachEventHandler(std::shared_ptr<BrowserInstance> browserInstance);
+
+protected:
+    void internalInitialize(const ghoul::Dictionary& configuration) override;
+    void internalDeinitialize() override;
+
+private:
+    std::string findHelperExecutable();
+
+    std::vector<std::shared_ptr<BrowserInstance>> _browsers;
+    EventHandler _eventHandler;
+    std::unique_ptr<CefHost> _cefHost;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_WEBBROWSER___WEBBROWSERMODULE___H__
diff --git a/modules/webgui/CMakeLists.txt b/modules/webgui/CMakeLists.txt
new file mode 100644
index 0000000000..114b209408
--- /dev/null
+++ b/modules/webgui/CMakeLists.txt
@@ -0,0 +1,45 @@
+##########################################################################################
+#                                                                                        #
+# OpenSpace                                                                              #
+#                                                                                        #
+# Copyright (c) 2014-2017                                                                #
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/module_definition.cmake)
+set(WEBGUI_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "WEBGUI_MODULE_PATH")
+set(WEBGUI_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/web CACHE INTERNAL "WEBGUI_MODULE_PATH")
+
+set(OPENSPACE_HEADER_FILES
+    webguimodule.h
+    )
+source_group("Header Files" FILES ${OPENSPACE_HEADER_FILES})
+
+set(OPENSPACE_SOURCE_FILES
+    webguimodule.cpp
+    )
+source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+create_new_module(
+    WebGui
+    webgui_module
+    ${OPENSPACE_HEADER_FILES} ${OPENSPACE_SOURCE_FILES}
+)
diff --git a/modules/webgui/cmake/webgui_helpers.cmake b/modules/webgui/cmake/webgui_helpers.cmake
new file mode 100644
index 0000000000..a29de5cf34
--- /dev/null
+++ b/modules/webgui/cmake/webgui_helpers.cmake
@@ -0,0 +1,37 @@
+#########################################################################################
+#                                                                                       #
+# OpenSpace                                                                             #
+#                                                                                       #
+# Copyright (c) 2014-2017                                                               #
+#                                                                                       #
+# 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.                                         #
+#########################################################################################
+
+function(build_webgui_source target_name)
+    set(NPM_COMMAND "npm" CACHE STRING "Location of NPM executable unless in PATH.")
+    # copy webgui source
+    add_custom_command(
+        TARGET ${target_name} POST_BUILD
+        COMMAND ${NPM_COMMAND} install
+        COMMAND ${NPM_COMMAND} run lint
+#        COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBGUI_MODULE_PATH}/web/dist "$<TARGET_FILE_DIR:${CEF_TARGET}>/gui"
+#        COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBGUI_MODULE_PATH}/web/dist/static "$<TARGET_FILE_DIR:${CEF_TARGET}>/gui/static"
+        WORKING_DIRECTORY ${WEBGUI_MODULE_PATH}/web
+        VERBATIM
+    )
+endfunction()
diff --git a/modules/webgui/include.cmake b/modules/webgui/include.cmake
new file mode 100644
index 0000000000..ebf6b6a2b0
--- /dev/null
+++ b/modules/webgui/include.cmake
@@ -0,0 +1,5 @@
+set(DEFAULT_MODULE OFF)
+
+set(OPEMSPACE_DEPENCENCIES
+    server
+    )
\ No newline at end of file
diff --git a/modules/webgui/web/.babelrc b/modules/webgui/web/.babelrc
new file mode 100644
index 0000000000..b459dc28a3
--- /dev/null
+++ b/modules/webgui/web/.babelrc
@@ -0,0 +1,11 @@
+{
+  "presets": [
+    ["es2015", {"modules": false}],
+    "react",
+    "flow"
+  ],
+  "plugins": [
+    "react-hot-loader/babel",
+    ["transform-object-rest-spread"]
+  ]
+}
diff --git a/modules/webgui/web/.editorconfig b/modules/webgui/web/.editorconfig
new file mode 100644
index 0000000000..2c031c3dfd
--- /dev/null
+++ b/modules/webgui/web/.editorconfig
@@ -0,0 +1,11 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = false
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
diff --git a/modules/webgui/web/.eslintrc b/modules/webgui/web/.eslintrc
new file mode 100644
index 0000000000..e5c633d0ff
--- /dev/null
+++ b/modules/webgui/web/.eslintrc
@@ -0,0 +1,15 @@
+{
+  "extends": "airbnb",
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": true
+    }
+  },
+  "rules": {
+    "linebreak-style": ["error", "unix"],
+    "no-plusplus": "off"
+  }
+}
diff --git a/modules/webgui/web/.flowconfig b/modules/webgui/web/.flowconfig
new file mode 100644
index 0000000000..bf40908bf6
--- /dev/null
+++ b/modules/webgui/web/.flowconfig
@@ -0,0 +1,10 @@
+[ignore]
+
+[include]
+
+[libs]
+
+[options]
+unsafe.enable_getters_and_setters=true
+
+[lints]
diff --git a/modules/webgui/web/.gitignore b/modules/webgui/web/.gitignore
new file mode 100644
index 0000000000..db4c6d9b67
--- /dev/null
+++ b/modules/webgui/web/.gitignore
@@ -0,0 +1,2 @@
+dist
+node_modules
\ No newline at end of file
diff --git a/modules/webgui/web/.storybook/addons.js b/modules/webgui/web/.storybook/addons.js
new file mode 100644
index 0000000000..5dea101a7c
--- /dev/null
+++ b/modules/webgui/web/.storybook/addons.js
@@ -0,0 +1 @@
+import '@storybook/addon-actions/register';
diff --git a/modules/webgui/web/.storybook/config.js b/modules/webgui/web/.storybook/config.js
new file mode 100644
index 0000000000..463c00972a
--- /dev/null
+++ b/modules/webgui/web/.storybook/config.js
@@ -0,0 +1,11 @@
+import { configure } from '@storybook/react';
+
+/* global require, module */
+
+const req = require.context('../src/components', true, /(.)+\.story\.jsx$/);
+
+function loadStories() {
+  req.keys().forEach(req);
+}
+
+configure(loadStories, module);
diff --git a/modules/webgui/web/.storybook/webpack.config.js b/modules/webgui/web/.storybook/webpack.config.js
new file mode 100644
index 0000000000..1071424b36
--- /dev/null
+++ b/modules/webgui/web/.storybook/webpack.config.js
@@ -0,0 +1,40 @@
+const path = require('path');
+
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.scss$/,
+        use: [
+          {
+            loader: 'style-loader',
+          }, {
+            loader: 'css-loader?modules',
+            options: {
+              sourceMap: true,
+              importLoaders: 2,
+              modules: true,
+              localIdentName: '[path][name]-[local]',
+              minimize: false,
+            },
+          }, {
+            loader: 'sass-loader',
+            options: {
+              sourceMap: true,
+            },
+          },
+        ],
+        include: path.resolve(__dirname, '../')
+      }, {
+        test: /\.css$/,
+        use: ['style-loader', 'css-loader'],
+      }, {
+        test: /\.(woff|woff2|ttf|eot)$/,
+        loader: 'file-loader',
+        options: {
+          name: 'fonts/[name].[ext]',
+        },
+      }
+    ]
+  }
+}
diff --git a/modules/webgui/web/README.md b/modules/webgui/web/README.md
new file mode 100644
index 0000000000..d3ba59c8ad
--- /dev/null
+++ b/modules/webgui/web/README.md
@@ -0,0 +1,72 @@
+# OpenSpace WebGUI Module
+
+## Develop
+
+First, go get [Node.js](https://nodejs.org/en/)!
+
+```sh
+# install dependencies
+npm install
+# run development app
+npm start
+# open gui
+open http://localhost:8080
+```
+
+### Components
+
+There are several useful and reusable components to make it easier for you as the developer. Most of 
+these general-purpose components are in [`src/comoponents/common`](src/components/common). To see
+some of them, [Storybook](https://github.com/storybooks/storybook) is a useful tool. It allows you
+to see them and try them out. When you are developing common-use components, please add stories for 
+them. 
+
+#### Using Storybook
+
+To start storybook, run 
+
+```sh
+npm run storybook
+open http://localhost:9001
+``` 
+
+in your favourite terminal. This will start Storybook and open it up in your browser.
+
+To add stories, add a file called `WhateverYourComponentNameIs.story.jsx`. It will get picked up by
+Storybook. The `.story.jsx` ending is the important part of the file name, as this is what the 
+Storybook config is looking for. See the [Storybook documentation](https://storybook.js.org/basics/introduction/) 
+for instructions on how to build stories. 
+
+Using Storybook, you will help 
+
+* your fellow developers understand how a component may be used, and
+* yourself in writing a clear, friendly API for your components.
+
+Please try and declare every special case in your stories, as that will further improve the 
+usefulness of the tool.
+
+### Types
+
+This is something you hear quite often:
+
+> MEH! JavaScript is the worst, there's no types or anything. Boo!! <br> - *Some developers*
+
+It is not true. JavaScript has lots of types, but they might be a bit scary for the developers who's into strict typing.
+
+To make this a bit easier for y'all, this web app has support for types using the Flow system. In some files, you might see a comment looking like 
+
+```js
+// @flow
+```
+
+This tells our transpiler Babel (that makes our modern JavaScript readable for all browsers) that this file should be type checked! 
+A type declaration looks like
+
+```js
+function stringReturner(a: string, bMightBeAnything): string {
+  //                     ^^^^^^^^                   ^^^^^^^^
+  // The interesting parts of this code snippet is higlighted above 
+}
+```
+
+For more about Flow, check out https://flow.org
diff --git a/modules/webgui/web/index.html b/modules/webgui/web/index.html
new file mode 100644
index 0000000000..053c10c55f
--- /dev/null
+++ b/modules/webgui/web/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>OpenSpace</title>
+</head>
+<body>
+<div id="root"></div>
+<script src="static/bundle.js"></script>
+</body>
+</html>
diff --git a/modules/webgui/web/package-lock.json b/modules/webgui/web/package-lock.json
new file mode 100644
index 0000000000..c43ab83bab
--- /dev/null
+++ b/modules/webgui/web/package-lock.json
@@ -0,0 +1,9731 @@
+{
+  "name": "openspace-webgui",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@storybook/addon-actions": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-3.2.0.tgz",
+      "integrity": "sha1-5df2P+yJyuG5i7wSRpQVO3QJMX8=",
+      "dev": true,
+      "requires": {
+        "@storybook/addons": "3.2.0",
+        "deep-equal": "1.0.1",
+        "json-stringify-safe": "5.0.1",
+        "prop-types": "15.5.10",
+        "react-inspector": "2.1.4",
+        "uuid": "3.1.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        }
+      }
+    },
+    "@storybook/addons": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-3.2.0.tgz",
+      "integrity": "sha1-4URsxWE68XlwFnMnYmfO5xhZv0E=",
+      "dev": true
+    },
+    "@storybook/react": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-3.2.3.tgz",
+      "integrity": "sha1-Tlr/gLYTKCiNz546ayookOq4gL4=",
+      "dev": true,
+      "requires": {
+        "@storybook/addon-actions": "3.2.0",
+        "@storybook/addon-links": "3.2.0",
+        "@storybook/addons": "3.2.0",
+        "@storybook/channel-postmessage": "3.2.0",
+        "@storybook/ui": "3.2.3",
+        "airbnb-js-shims": "1.1.1",
+        "autoprefixer": "7.1.2",
+        "babel-core": "6.25.0",
+        "babel-loader": "7.1.1",
+        "babel-plugin-react-docgen": "1.6.0",
+        "babel-preset-es2015": "6.24.1",
+        "babel-preset-es2016": "6.24.1",
+        "babel-preset-react": "6.24.1",
+        "babel-preset-react-app": "3.0.1",
+        "babel-preset-stage-0": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "case-sensitive-paths-webpack-plugin": "2.1.1",
+        "chalk": "2.1.0",
+        "commander": "2.10.0",
+        "common-tags": "1.4.0",
+        "configstore": "3.1.0",
+        "css-loader": "0.28.4",
+        "express": "4.15.3",
+        "file-loader": "0.11.2",
+        "find-cache-dir": "1.0.0",
+        "glamor": "2.20.25",
+        "glamorous": "3.23.5",
+        "global": "4.3.2",
+        "json-loader": "0.5.4",
+        "json-stringify-safe": "5.0.1",
+        "json5": "0.5.1",
+        "lodash.flattendeep": "4.4.0",
+        "lodash.pick": "4.4.0",
+        "postcss-flexbugs-fixes": "3.0.0",
+        "postcss-loader": "2.0.6",
+        "prop-types": "15.5.10",
+        "qs": "6.4.0",
+        "react-modal": "1.9.7",
+        "redux": "3.7.2",
+        "request": "2.81.0",
+        "serve-favicon": "2.4.3",
+        "shelljs": "0.7.8",
+        "style-loader": "0.17.0",
+        "url-loader": "0.5.9",
+        "util-deprecate": "1.0.2",
+        "uuid": "3.1.0",
+        "webpack": "3.5.3",
+        "webpack-dev-middleware": "1.10.2",
+        "webpack-hot-middleware": "2.18.0"
+      },
+      "dependencies": {
+        "@storybook/addon-actions": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-3.2.0.tgz",
+          "integrity": "sha1-5df2P+yJyuG5i7wSRpQVO3QJMX8=",
+          "dev": true,
+          "requires": {
+            "@storybook/addons": "3.2.0",
+            "deep-equal": "1.0.1",
+            "json-stringify-safe": "5.0.1",
+            "prop-types": "15.5.10",
+            "react-inspector": "2.1.4",
+            "uuid": "3.1.0"
+          }
+        },
+        "@storybook/addon-links": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-3.2.0.tgz",
+          "integrity": "sha1-KMc9H9f6N1kROfP7FuYKQxE61kM=",
+          "dev": true,
+          "requires": {
+            "@storybook/addons": "3.2.0"
+          }
+        },
+        "@storybook/addons": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/@storybook/addons/-/addons-3.2.0.tgz",
+          "integrity": "sha1-4URsxWE68XlwFnMnYmfO5xhZv0E=",
+          "dev": true
+        },
+        "@storybook/channel-postmessage": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-3.2.0.tgz",
+          "integrity": "sha1-YS/1MSC/JmZgy5MousmtZxIoovc=",
+          "dev": true,
+          "requires": {
+            "@storybook/channels": "3.2.0",
+            "global": "4.3.2",
+            "json-stringify-safe": "5.0.1"
+          }
+        },
+        "@storybook/channels": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-3.2.0.tgz",
+          "integrity": "sha1-11OVIS23a0njM19QzOW8djzwtcY=",
+          "dev": true
+        },
+        "@storybook/ui": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/@storybook/ui/-/ui-3.2.3.tgz",
+          "integrity": "sha1-lXnBkaFpXT1aqrzvk6elRW2PGa8=",
+          "dev": true,
+          "requires": {
+            "@storybook/react-fuzzy": "0.4.0",
+            "babel-runtime": "6.23.0",
+            "deep-equal": "1.0.1",
+            "events": "1.1.1",
+            "fuzzysearch": "1.0.3",
+            "global": "4.3.2",
+            "json-stringify-safe": "5.0.1",
+            "keycode": "2.1.9",
+            "lodash.pick": "4.4.0",
+            "lodash.sortby": "4.7.0",
+            "mantra-core": "1.7.0",
+            "podda": "1.2.2",
+            "prop-types": "15.5.10",
+            "qs": "6.4.0",
+            "react-icons": "2.2.5",
+            "react-inspector": "2.1.4",
+            "react-komposer": "2.0.0",
+            "react-modal": "1.9.7",
+            "react-split-pane": "0.1.65",
+            "react-treebeard": "2.0.3",
+            "redux": "3.7.2"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+          "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "autoprefixer": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.2.tgz",
+          "integrity": "sha1-++rwfUj9h44Ggr98vurecorbKxg=",
+          "dev": true,
+          "requires": {
+            "browserslist": "2.3.1",
+            "caniuse-lite": "1.0.30000713",
+            "normalize-range": "0.1.2",
+            "num2fraction": "1.2.2",
+            "postcss": "6.0.8",
+            "postcss-value-parser": "3.3.0"
+          }
+        },
+        "babel-plugin-react-docgen": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.6.0.tgz",
+          "integrity": "sha1-m+NhIbCU2noaO6eRGp6OpLD0TaA=",
+          "dev": true,
+          "requires": {
+            "babel-types": "6.24.1",
+            "lodash": "4.17.4",
+            "react-docgen": "2.16.0"
+          }
+        },
+        "browserslist": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.3.1.tgz",
+          "integrity": "sha512-YSRvpyaxDBBAPkwYO0THouUmA+cvYbyBHZrP/byJEUGDT9r/6TQcDASBtrAj4S45Le6JZbV8oeUAPR9wT8tisg==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "1.0.30000713",
+            "electron-to-chromium": "1.3.18"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30000713",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000713.tgz",
+          "integrity": "sha1-M5V+y0ohVKXUCmDRPYvxz6CIGoo=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
+          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.2.1"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.18",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz",
+          "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.8",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz",
+          "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==",
+          "dev": true,
+          "requires": {
+            "chalk": "2.1.0",
+            "source-map": "0.5.6",
+            "supports-color": "4.2.1"
+          }
+        },
+        "react-inspector": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-2.1.4.tgz",
+          "integrity": "sha1-ISP6t09orjE2+9AjkvrbdkMm0E0=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.23.0",
+            "is-dom": "1.0.9"
+          }
+        },
+        "react-split-pane": {
+          "version": "0.1.65",
+          "resolved": "https://registry.npmjs.org/react-split-pane/-/react-split-pane-0.1.65.tgz",
+          "integrity": "sha1-N8C16lyWCCfn82IdChFLD4yciRg=",
+          "dev": true,
+          "requires": {
+            "inline-style-prefixer": "3.0.6",
+            "prop-types": "15.5.10",
+            "react-style-proptype": "3.0.0"
+          }
+        },
+        "shelljs": {
+          "version": "0.7.8",
+          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
+          "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2",
+            "interpret": "1.0.3",
+            "rechoir": "0.6.2"
+          }
+        },
+        "style-loader": {
+          "version": "0.17.0",
+          "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.17.0.tgz",
+          "integrity": "sha1-6CVLzNt690vVgnTjYQe01atN8xA=",
+          "dev": true,
+          "requires": {
+            "loader-utils": "1.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
+          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        },
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        }
+      }
+    },
+    "@storybook/react-fuzzy": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@storybook/react-fuzzy/-/react-fuzzy-0.4.0.tgz",
+      "integrity": "sha1-KWHoofbBr8zpfp6aFNHf6dkGEIc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "classnames": "2.2.5",
+        "fuse.js": "3.0.5",
+        "prop-types": "15.5.10"
+      }
+    },
+    "abbrev": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
+      "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.15",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
+      "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "dev": true,
+      "requires": {
+        "acorn": "4.0.13"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
+          "dev": true
+        }
+      }
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "airbnb-js-shims": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/airbnb-js-shims/-/airbnb-js-shims-1.1.1.tgz",
+      "integrity": "sha1-JyJPADDyROZXBELtECB3LBQ0rsI=",
+      "dev": true,
+      "requires": {
+        "array-includes": "3.0.3",
+        "es5-shim": "4.5.9",
+        "es6-shim": "0.35.3",
+        "object.entries": "1.0.4",
+        "object.getownpropertydescriptors": "2.0.3",
+        "object.values": "1.0.4",
+        "string.prototype.padend": "3.0.0",
+        "string.prototype.padstart": "3.0.0"
+      }
+    },
+    "ajv": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+      "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+    },
+    "anymatch": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz",
+      "integrity": "sha1-o+Uvo5FoyCX/V7AkgSbOWo/5VQc=",
+      "dev": true,
+      "requires": {
+        "arrify": "1.0.1",
+        "micromatch": "2.3.11"
+      }
+    },
+    "aproba": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz",
+      "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
+      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "dev": true,
+      "requires": {
+        "delegates": "1.0.0",
+        "readable-stream": "2.2.9"
+      }
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+      "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.0.3"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz",
+      "integrity": "sha1-onTthawIhJtr14R8RYB0XcUa37E=",
+      "dev": true
+    },
+    "array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "dev": true
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.7.0"
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz",
+      "integrity": "sha1-UidltQw1EEkOUtfc/ghe+bqWlY8="
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "asn1.js": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
+      "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      }
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+      "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+      "dev": true
+    },
+    "ast-types": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
+      "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
+      "dev": true
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
+    "async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
+      "integrity": "sha1-YqVrJ5yYoR0JhwlqAcw+6463u9c=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
+      "integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M="
+    },
+    "autoprefixer": {
+      "version": "6.7.7",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
+      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000676",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+      "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
+      "dev": true
+    },
+    "axobject-query": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-0.1.0.tgz",
+      "integrity": "sha1-YvWdvFnJ+SQnWco0mWDnov48NsA=",
+      "dev": true,
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
+    "babel-cli": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.24.1.tgz",
+      "integrity": "sha1-IHzXBbumFImy6kG1MSNBz2rKIoM=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.25.0",
+        "babel-polyfill": "6.23.0",
+        "babel-register": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "chokidar": "1.7.0",
+        "commander": "2.10.0",
+        "convert-source-map": "1.5.0",
+        "fs-readdir-recursive": "1.0.0",
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "output-file-sync": "1.1.2",
+        "path-is-absolute": "1.0.1",
+        "slash": "1.0.0",
+        "source-map": "0.5.6",
+        "v8flags": "2.1.1"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+      "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.1"
+      }
+    },
+    "babel-core": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz",
+      "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "babel-generator": "6.25.0",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.25.0",
+        "babel-traverse": "6.25.0",
+        "babel-types": "6.25.0",
+        "babylon": "6.17.4",
+        "convert-source-map": "1.5.0",
+        "debug": "2.2.0",
+        "json5": "0.5.1",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.7",
+        "slash": "1.0.0",
+        "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "babel-generator": {
+          "version": "6.25.0",
+          "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz",
+          "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=",
+          "dev": true,
+          "requires": {
+            "babel-messages": "6.23.0",
+            "babel-runtime": "6.23.0",
+            "babel-types": "6.25.0",
+            "detect-indent": "4.0.0",
+            "jsesc": "1.3.0",
+            "lodash": "4.17.4",
+            "source-map": "0.5.6",
+            "trim-right": "1.0.1"
+          }
+        },
+        "babel-template": {
+          "version": "6.25.0",
+          "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz",
+          "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.23.0",
+            "babel-traverse": "6.25.0",
+            "babel-types": "6.25.0",
+            "babylon": "6.17.4",
+            "lodash": "4.17.4"
+          }
+        },
+        "babel-traverse": {
+          "version": "6.25.0",
+          "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz",
+          "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=",
+          "dev": true,
+          "requires": {
+            "babel-code-frame": "6.22.0",
+            "babel-messages": "6.23.0",
+            "babel-runtime": "6.23.0",
+            "babel-types": "6.25.0",
+            "babylon": "6.17.4",
+            "debug": "2.2.0",
+            "globals": "9.17.0",
+            "invariant": "2.2.2",
+            "lodash": "4.17.4"
+          }
+        },
+        "babel-types": {
+          "version": "6.25.0",
+          "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz",
+          "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.23.0",
+            "esutils": "2.0.2",
+            "lodash": "4.17.4",
+            "to-fast-properties": "1.0.3"
+          }
+        },
+        "babylon": {
+          "version": "6.17.4",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz",
+          "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-eslint": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz",
+      "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1",
+        "babylon": "6.17.1"
+      }
+    },
+    "babel-helper-bindify-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-builder-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-CteRfjPI11HmRtrKTnfMGTd9LLw=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1",
+        "esutils": "2.0.2"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
+      "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-explode-class": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+      "dev": true,
+      "requires": {
+        "babel-helper-bindify-decorators": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
+      "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-loader": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.1.tgz",
+      "integrity": "sha1-uHE0yLEuPkwqlOBUYIW8aAorhIg=",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "1.0.0",
+        "loader-utils": "1.1.0",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+          "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+          "dev": true,
+          "requires": {
+            "commondir": "1.0.1",
+            "make-dir": "1.0.0",
+            "pkg-dir": "2.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.1.3",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1"
+          }
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0"
+          }
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.0.2.tgz",
+      "integrity": "sha1-rbW8j0iokxFUA5WunwzD7UsQuy4=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-template": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-async-generators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-constructor-call": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+      "dev": true
+    },
+    "babel-plugin-syntax-decorators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
+    },
+    "babel-plugin-syntax-do-expressions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
+      "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-export-extensions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+      "dev": true
+    },
+    "babel-plugin-syntax-flow": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-function-bind": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
+      "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
+      "dev": true
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-generator-functions": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-generators": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-class-constructor-call": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
+      "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-class-constructor-call": "6.18.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-class-properties": "6.13.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-class": "6.24.1",
+        "babel-plugin-syntax-decorators": "6.13.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-do-expressions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
+      "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-do-expressions": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
+      "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "6.24.1",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
+      "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-template": "6.24.1",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.24.1",
+        "babel-runtime": "6.23.0",
+        "regexpu-core": "2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-export-extensions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
+      "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-export-extensions": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-flow-strip-types": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-function-bind": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
+      "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-function-bind": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz",
+      "integrity": "sha1-h11ryb52HFiirj/u5dxIldjH+SE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "6.13.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-react-constant-elements": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz",
+      "integrity": "sha1-LxGb9NLN1F65uqrldAU8YE9hR90=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-react-display-name": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz",
+      "integrity": "sha1-Q5iRDDWEQdxM7xh4cmTQQS7Tazc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-react-jsx": "6.24.1",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-self": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
+      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-source": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
+      "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "0.9.11"
+      }
+    },
+    "babel-plugin-transform-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1"
+      }
+    },
+    "babel-polyfill": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
+      "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "core-js": "2.4.1",
+        "regenerator-runtime": "0.10.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+          "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
+          "dev": true
+        }
+      }
+    },
+    "babel-preset-env": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.5.2.tgz",
+      "integrity": "sha1-zUrpCm6Utwn5c3SzPl+LmDVWre8=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.24.1",
+        "browserslist": "2.1.5",
+        "invariant": "2.2.2",
+        "semver": "5.3.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "2.1.5",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.1.5.tgz",
+          "integrity": "sha1-6IJVDfPRzW1IHBo+ADjyuvE6RxE=",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "1.0.30000696",
+            "electron-to-chromium": "1.3.15"
+          }
+        },
+        "electron-to-chromium": {
+          "version": "1.3.15",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz",
+          "integrity": "sha1-CDl5NIkcvPrrvRi4KpW1pIETg2k=",
+          "dev": true
+        }
+      }
+    },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.24.1",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.24.1"
+      }
+    },
+    "babel-preset-es2016": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz",
+      "integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-exponentiation-operator": "6.24.1"
+      }
+    },
+    "babel-preset-flow": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
+      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-flow-strip-types": "6.22.0"
+      }
+    },
+    "babel-preset-react": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-react-display-name": "6.23.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-preset-flow": "6.23.0"
+      }
+    },
+    "babel-preset-react-app": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-3.0.1.tgz",
+      "integrity": "sha1-i3RMvkf9V8ho5vkTVSzq4mrjGGA=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-dynamic-import-node": "1.0.2",
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-class-properties": "6.24.1",
+        "babel-plugin-transform-object-rest-spread": "6.23.0",
+        "babel-plugin-transform-react-constant-elements": "6.23.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-plugin-transform-regenerator": "6.24.1",
+        "babel-plugin-transform-runtime": "6.23.0",
+        "babel-preset-env": "1.5.2",
+        "babel-preset-react": "6.24.1"
+      }
+    },
+    "babel-preset-stage-0": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz",
+      "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-do-expressions": "6.22.0",
+        "babel-plugin-transform-function-bind": "6.22.0",
+        "babel-preset-stage-1": "6.24.1"
+      }
+    },
+    "babel-preset-stage-1": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
+      "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-class-constructor-call": "6.24.1",
+        "babel-plugin-transform-export-extensions": "6.22.0",
+        "babel-preset-stage-2": "6.24.1"
+      }
+    },
+    "babel-preset-stage-2": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-class-properties": "6.24.1",
+        "babel-plugin-transform-decorators": "6.24.1",
+        "babel-preset-stage-3": "6.24.1"
+      }
+    },
+    "babel-preset-stage-3": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-generator-functions": "6.24.1",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-object-rest-spread": "6.23.0"
+      }
+    },
+    "babel-register": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
+      "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.25.0",
+        "babel-runtime": "6.23.0",
+        "core-js": "2.4.1",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.15"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+          "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
+          "dev": true
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+      "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
+      "requires": {
+        "core-js": "2.4.1",
+        "regenerator-runtime": "0.10.5"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+          "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
+        }
+      }
+    },
+    "babel-template": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+      "integrity": "sha1-BK5RTx+Ts6JTfyoPYKWkX7gwgzM=",
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-traverse": "6.24.1",
+        "babel-types": "6.24.1",
+        "babylon": "6.17.1",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+      "integrity": "sha1-qzZnP9NW+aCUhlnnszjV/q2zFpU=",
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1",
+        "babylon": "6.17.1",
+        "debug": "2.2.0",
+        "globals": "9.17.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+      "integrity": "sha1-oTaHncFbNga9oNkMH8dDBML/CXU=",
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.17.1",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz",
+      "integrity": "sha1-F/FP3fNhtpWYH+Z5OF5PHAHr2G8="
+    },
+    "balanced-match": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+      "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
+      "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "big.js": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz",
+      "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg="
+    },
+    "binary-extensions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz",
+      "integrity": "sha1-SOyNFt9Dd+rl+liEaCSAr02Vx3Q=",
+      "dev": true
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=",
+      "dev": true
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "2.1.1",
+        "deep-equal": "1.0.1",
+        "dns-equal": "1.0.0",
+        "dns-txt": "2.0.2",
+        "multicast-dns": "6.1.1",
+        "multicast-dns-service-types": "1.1.0"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz",
+          "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=",
+          "dev": true
+        }
+      }
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "bowser": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.7.0.tgz",
+      "integrity": "sha1-Fp3kAYcR+ZQkK/+agAnneh814AM=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
+      "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "0.4.2",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "brcast": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brcast/-/brcast-2.0.1.tgz",
+      "integrity": "sha512-Hm6AjEjr2hg5P/+tfAi7IARUW6mRNweni7ezt7vvOF53qn4++rdJoPsg8dDGS7KcwT2cRDucuFNMRYi3nkCD6Q==",
+      "dev": true
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
+      "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "1.0.3",
+        "cipher-base": "1.0.3",
+        "create-hash": "1.1.3",
+        "evp_bytestokey": "1.0.0",
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "1.0.6",
+        "browserify-des": "1.0.0",
+        "evp_bytestokey": "1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.3",
+        "des.js": "1.0.0",
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "randombytes": "2.0.3"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "elliptic": "6.4.0",
+        "inherits": "2.0.3",
+        "parse-asn1": "5.1.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "dev": true,
+      "requires": {
+        "pako": "0.2.9"
+      }
+    },
+    "browserslist": {
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+      "dev": true,
+      "requires": {
+        "caniuse-db": "1.0.30000676",
+        "electron-to-chromium": "1.3.13"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.2.0",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-indexof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz",
+      "integrity": "sha1-9U9kfE9OJSKLqmVqLlfkPV8nCYI=",
+      "dev": true
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz",
+      "integrity": "sha1-1baAoWW2IBc5rLYRVCqrwtjOsHA=",
+      "dev": true
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
+      }
+    },
+    "caniuse-api": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
+      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000676",
+        "lodash.memoize": "4.1.2",
+        "lodash.uniq": "4.5.0"
+      }
+    },
+    "caniuse-db": {
+      "version": "1.0.30000676",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000676.tgz",
+      "integrity": "sha1-gupXgjdjfI/zSiisqt43O2JMTqg=",
+      "dev": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000696",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz",
+      "integrity": "sha1-MPJpXSoBoN/XeaJquD9NE0s9pcw=",
+      "dev": true
+    },
+    "case-sensitive-paths-webpack-plugin": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz",
+      "integrity": "sha1-PSnO2MHxJL9vU4Rvs/WJRzH9yQk=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chain-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz",
+      "integrity": "sha1-DUqzfn4Y6tC9xHuSB2QRjOWHM9w=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "requires": {
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.0",
+        "async-each": "1.0.1",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz",
+      "integrity": "sha1-7qvxlEGc6QDaMBjCB9IS8qbfCgc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "circular-json": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
+      "integrity": "sha1-vos2rvzN6LPKeqLWr8B6NyQsDS0=",
+      "dev": true
+    },
+    "clap": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz",
+      "integrity": "sha1-s7026T3Uy/s5WjwmiWNSRFJlwFs=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      }
+    },
+    "classnames": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
+      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
+    },
+    "cli-width": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
+      "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+      "dev": true,
+      "requires": {
+        "center-align": "0.1.3",
+        "right-align": "0.1.3",
+        "wordwrap": "0.0.2"
+      }
+    },
+    "clone": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+      "dev": true
+    },
+    "clone-deep": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz",
+      "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=",
+      "dev": true,
+      "requires": {
+        "for-own": "1.0.0",
+        "is-plain-object": "2.0.3",
+        "kind-of": "3.2.2",
+        "shallow-clone": "0.1.2"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+          "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+          "dev": true,
+          "requires": {
+            "for-in": "1.0.2"
+          }
+        }
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "coa": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.2.tgz",
+      "integrity": "sha1-K6n+w7SqQ9eknX5sNWHpIGG2vOw=",
+      "dev": true,
+      "requires": {
+        "q": "1.5.0"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "color": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
+      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "dev": true,
+      "requires": {
+        "clone": "1.0.2",
+        "color-convert": "1.9.0",
+        "color-string": "0.3.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
+      "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.2"
+      }
+    },
+    "color-name": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz",
+      "integrity": "sha1-XIq3K2S9IhXWF66VWeuxSEdc+Y0=",
+      "dev": true
+    },
+    "color-string": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
+      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.2"
+      }
+    },
+    "colormin": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
+      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+      "dev": true,
+      "requires": {
+        "color": "0.11.4",
+        "css-color-names": "0.0.4",
+        "has": "1.0.1"
+      }
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.10.0.tgz",
+      "integrity": "sha512-q/r9trjmuikWDRJNTBHAVnWhuU6w+z80KgBq7j9YDclik5E7X4xi0KnlZBNFA1zOQ+SH/vHMWd2mC9QTOz7GpA==",
+      "dev": true,
+      "requires": {
+        "graceful-readlink": "1.0.1"
+      }
+    },
+    "common-tags": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz",
+      "integrity": "sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz",
+      "integrity": "sha1-/tocf3YXkScyspv4zyYlKiC57s0=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.27.0"
+      }
+    },
+    "compression": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz",
+      "integrity": "sha1-zOsSHsydCcUtetDDNQ6pPd1AK8M=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "bytes": "2.3.0",
+        "compressible": "2.0.10",
+        "debug": "2.2.0",
+        "on-headers": "1.0.1",
+        "vary": "1.1.1"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.2.9",
+        "typedarray": "0.0.6"
+      }
+    },
+    "configstore": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz",
+      "integrity": "sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE=",
+      "dev": true,
+      "requires": {
+        "dot-prop": "4.1.1",
+        "graceful-fs": "4.1.11",
+        "make-dir": "1.0.0",
+        "unique-string": "1.0.0",
+        "write-file-atomic": "2.1.0",
+        "xdg-basedir": "3.0.0"
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz",
+      "integrity": "sha1-5R0X+PDvDbkKZP20feMFFVbp8Wk=",
+      "dev": true
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "content-type": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz",
+      "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "copyfiles": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/copyfiles/-/copyfiles-1.2.0.tgz",
+      "integrity": "sha1-qNo6xBqiIgrim9PFi2mEKU8sWTw=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "ltcdr": "2.2.1",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "noms": "0.0.0",
+        "through2": "2.0.3"
+      }
+    },
+    "core-js": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.1.3.tgz",
+      "integrity": "sha1-lSdx6w3dwcs/ovb75RpSLpOz7go=",
+      "dev": true,
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.7.0",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
+      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "elliptic": "6.4.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.3",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
+      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+      "dev": true,
+      "requires": {
+        "cipher-base": "1.0.3",
+        "create-hash": "1.1.3",
+        "inherits": "2.0.3",
+        "ripemd160": "2.0.1",
+        "safe-buffer": "5.0.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "create-react-class": {
+      "version": "15.6.0",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.0.tgz",
+      "integrity": "sha1-q0SEl8JlZuHilBPogyB9V8/nvtQ=",
+      "requires": {
+        "fbjs": "0.8.12",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "cross-env": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.0.5.tgz",
+      "integrity": "sha1-Q4PTZNlmCHPdGFs5ivO/717//vM=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "is-windows": "1.0.1"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.0.2",
+        "shebang-command": "1.2.0",
+        "which": "1.2.14"
+      }
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
+      "integrity": "sha1-NlKgkGq5sqfgw85mpAjpV6JIVSI=",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "1.0.0",
+        "browserify-sign": "4.0.4",
+        "create-ecdh": "4.0.0",
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "diffie-hellman": "5.0.2",
+        "inherits": "2.0.3",
+        "pbkdf2": "3.0.12",
+        "public-encrypt": "4.0.0",
+        "randombytes": "2.0.3"
+      }
+    },
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
+      "dev": true
+    },
+    "css": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
+      "integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
+      "requires": {
+        "inherits": "2.0.3",
+        "source-map": "0.1.43",
+        "source-map-resolve": "0.3.1",
+        "urix": "0.1.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-in-js-utils": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-1.0.3.tgz",
+      "integrity": "sha1-msfgL3Y8+F2UAXZmVl7WiltfMhU=",
+      "dev": true,
+      "requires": {
+        "hyphenate-style-name": "1.0.2"
+      }
+    },
+    "css-loader": {
+      "version": "0.28.4",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz",
+      "integrity": "sha1-bPNXkZLONV6LONX0Ldeh8uyJjQ8=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.22.0",
+        "css-selector-tokenizer": "0.7.0",
+        "cssnano": "3.10.0",
+        "icss-utils": "2.1.0",
+        "loader-utils": "1.1.0",
+        "lodash.camelcase": "4.3.0",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.17",
+        "postcss-modules-extract-imports": "1.1.0",
+        "postcss-modules-local-by-default": "1.2.0",
+        "postcss-modules-scope": "1.1.0",
+        "postcss-modules-values": "1.3.0",
+        "postcss-value-parser": "3.3.0",
+        "source-list-map": "0.1.8"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.1.3",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1"
+          }
+        },
+        "source-list-map": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+          "dev": true
+        }
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
+      "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
+      "dev": true,
+      "requires": {
+        "cssesc": "0.1.0",
+        "fastparse": "1.1.1",
+        "regexpu-core": "1.0.0"
+      },
+      "dependencies": {
+        "regexpu-core": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+          "dev": true,
+          "requires": {
+            "regenerate": "1.3.2",
+            "regjsgen": "0.2.0",
+            "regjsparser": "0.1.5"
+          }
+        }
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
+      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "6.7.7",
+        "decamelize": "1.2.0",
+        "defined": "1.0.0",
+        "has": "1.0.1",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.17",
+        "postcss-calc": "5.3.1",
+        "postcss-colormin": "2.2.2",
+        "postcss-convert-values": "2.6.1",
+        "postcss-discard-comments": "2.0.4",
+        "postcss-discard-duplicates": "2.1.0",
+        "postcss-discard-empty": "2.1.0",
+        "postcss-discard-overridden": "0.1.1",
+        "postcss-discard-unused": "2.2.3",
+        "postcss-filter-plugins": "2.0.2",
+        "postcss-merge-idents": "2.1.7",
+        "postcss-merge-longhand": "2.0.2",
+        "postcss-merge-rules": "2.1.2",
+        "postcss-minify-font-values": "1.0.5",
+        "postcss-minify-gradients": "1.0.5",
+        "postcss-minify-params": "1.2.2",
+        "postcss-minify-selectors": "2.1.1",
+        "postcss-normalize-charset": "1.1.1",
+        "postcss-normalize-url": "3.0.8",
+        "postcss-ordered-values": "2.2.3",
+        "postcss-reduce-idents": "2.4.0",
+        "postcss-reduce-initial": "1.0.1",
+        "postcss-reduce-transforms": "1.0.4",
+        "postcss-svgo": "2.1.6",
+        "postcss-unique-selectors": "2.0.2",
+        "postcss-value-parser": "3.3.0",
+        "postcss-zindex": "2.2.0"
+      }
+    },
+    "csso": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
+      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
+      "dev": true,
+      "requires": {
+        "clap": "1.1.3",
+        "source-map": "0.5.6"
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "d": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.21"
+      }
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz",
+      "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+      "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+      "requires": {
+        "ms": "0.7.1"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
+      }
+    },
+    "defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+      "dev": true
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "5.0.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz",
+      "integrity": "sha1-4b2Cxqq2ztlluXuIsX7T5SjKGMM=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "detect-node": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz",
+      "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
+      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "miller-rabin": "4.0.0",
+        "randombytes": "2.0.3"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.1.1.tgz",
+      "integrity": "sha1-I2nUUDivBF84mOb6VoYq7T9AKWw=",
+      "dev": true,
+      "requires": {
+        "ip": "1.1.5",
+        "safe-buffer": "5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "1.1.0"
+      }
+    },
+    "doctrine": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+      "dev": true,
+      "requires": {
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
+      }
+    },
+    "dom-helpers": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.2.1.tgz",
+      "integrity": "sha1-MgPgf+0he9H0JLAZc1WC/Deyglo=",
+      "dev": true
+    },
+    "dom-walk": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
+      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
+    },
+    "domain-browser": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
+      "dev": true
+    },
+    "dot-prop": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz",
+      "integrity": "sha1-qEk/C3te7sglJbXHWH+n3nyoWcE=",
+      "dev": true,
+      "requires": {
+        "is-obj": "1.0.1"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.13",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz",
+      "integrity": "sha1-GzperObgh7teJXoQCwy/6Bsokfw=",
+      "dev": true
+    },
+    "element-class": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/element-class/-/element-class-0.2.2.tgz",
+      "integrity": "sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4=",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
+      "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "brorand": "1.1.0",
+        "hash.js": "1.0.3",
+        "hmac-drbg": "1.0.1",
+        "inherits": "2.0.3",
+        "minimalistic-assert": "1.0.0",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "emoji-regex": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.4.2.tgz",
+      "integrity": "sha1-owtv7jU9QG2Wz7n6dlvcgol+/24=",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+    },
+    "encodeurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
+      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
+      "dev": true
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "0.4.17"
+      }
+    },
+    "errno": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "dev": true,
+      "requires": {
+        "prr": "0.0.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "error-stack-parser": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz",
+      "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=",
+      "requires": {
+        "stackframe": "0.3.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz",
+      "integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.0",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.21",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz",
+      "integrity": "sha1-Gacl+eUdAwC7wejoIRCf2dr1WSU=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es5-shim": {
+      "version": "4.5.9",
+      "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.5.9.tgz",
+      "integrity": "sha1-Kh4rnlg/9f7Qwgo+4svz91IwpcA=",
+      "dev": true
+    },
+    "es6-iterator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+      "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.21",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.21",
+        "es6-iterator": "2.0.1",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.21",
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-shim": {
+      "version": "0.35.3",
+      "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.3.tgz",
+      "integrity": "sha1-m/tzY/7//4emzbbNk+QF7DxLbyY=",
+      "dev": true
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.21"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.21",
+        "es6-iterator": "2.0.1",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.1.0",
+        "estraverse": "4.2.0"
+      }
+    },
+    "eslint": {
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz",
+      "integrity": "sha512-qy4i3wODqKMYfz9LUI8N2qYDkHkoieTbiHpMrYUI/WbjhXJQr7lI4VngixTgaG+yHX+NBCv7nW4hA0ShbvaNKw==",
+      "dev": true,
+      "requires": {
+        "ajv": "5.5.2",
+        "babel-code-frame": "6.22.0",
+        "chalk": "2.3.2",
+        "concat-stream": "1.6.0",
+        "cross-spawn": "5.1.0",
+        "debug": "3.1.0",
+        "doctrine": "2.1.0",
+        "eslint-scope": "3.7.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "3.5.4",
+        "esquery": "1.0.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "2.0.0",
+        "functional-red-black-tree": "1.0.1",
+        "glob": "7.1.2",
+        "globals": "11.3.0",
+        "ignore": "3.3.3",
+        "imurmurhash": "0.1.4",
+        "inquirer": "3.3.0",
+        "is-resolvable": "1.0.0",
+        "js-yaml": "3.11.0",
+        "json-stable-stringify-without-jsonify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "pluralize": "7.0.0",
+        "progress": "2.0.0",
+        "require-uncached": "1.0.3",
+        "semver": "5.3.0",
+        "strip-ansi": "4.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "4.0.2",
+        "text-table": "0.2.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "5.5.3",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+          "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+          "dev": true
+        },
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.1.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
+          }
+        },
+        "ajv-keywords": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
+          "dev": true
+        },
+        "ansi-escapes": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
+          "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
+          "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.3.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "2.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2"
+          }
+        },
+        "espree": {
+          "version": "3.5.4",
+          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+          "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+          "dev": true,
+          "requires": {
+            "acorn": "5.5.3",
+            "acorn-jsx": "3.0.1"
+          }
+        },
+        "esprima": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+          "dev": true
+        },
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "1.0.5"
+          }
+        },
+        "globals": {
+          "version": "11.3.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
+          "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "inquirer": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+          "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "3.0.0",
+            "chalk": "2.3.2",
+            "cli-cursor": "2.1.0",
+            "cli-width": "2.1.0",
+            "external-editor": "2.1.0",
+            "figures": "2.0.0",
+            "lodash": "4.17.4",
+            "mute-stream": "0.0.7",
+            "run-async": "2.3.0",
+            "rx-lite": "4.0.8",
+            "rx-lite-aggregates": "4.0.8",
+            "string-width": "2.1.1",
+            "strip-ansi": "4.0.0",
+            "through": "2.3.8"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "3.11.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+          "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
+          "dev": true,
+          "requires": {
+            "argparse": "1.0.9",
+            "esprima": "4.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+          "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+          "dev": true
+        },
+        "onetime": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "1.1.0"
+          }
+        },
+        "pluralize": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
+          "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
+          "dev": true
+        },
+        "progress": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
+          "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
+          "dev": true
+        },
+        "restore-cursor": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+          "dev": true,
+          "requires": {
+            "onetime": "2.0.1",
+            "signal-exit": "3.0.2"
+          }
+        },
+        "run-async": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+          "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+          "dev": true,
+          "requires": {
+            "is-promise": "2.1.0"
+          }
+        },
+        "rx-lite": {
+          "version": "4.0.8",
+          "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+          "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
+          "dev": true
+        },
+        "slice-ansi": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+          "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
+          "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        },
+        "table": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
+          "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
+          "dev": true,
+          "requires": {
+            "ajv": "5.5.2",
+            "ajv-keywords": "2.1.1",
+            "chalk": "2.3.2",
+            "lodash": "4.17.4",
+            "slice-ansi": "1.0.0",
+            "string-width": "2.1.1"
+          }
+        }
+      }
+    },
+    "eslint-config-airbnb": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-15.1.0.tgz",
+      "integrity": "sha512-m0q9fiMBzDAIbirlGnpJNWToIhdhJmXXnMG+IFflYzzod9231ZhtmGKegKg8E9T8F1YuVaDSU1FnCm5b9iXVhQ==",
+      "dev": true,
+      "requires": {
+        "eslint-config-airbnb-base": "11.3.1"
+      },
+      "dependencies": {
+        "eslint-config-airbnb-base": {
+          "version": "11.3.1",
+          "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.1.tgz",
+          "integrity": "sha512-BXVH7PV5yiLjnkv49iOLJ8dWp+ljZf310ytQpqwrunFADiEbWRyN0tPGDU36FgEbdLvhJDWcJOngYDzPF4shDw==",
+          "dev": true,
+          "requires": {
+            "eslint-restricted-globals": "0.1.1"
+          }
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz",
+      "integrity": "sha512-HGYmpU9f/zJaQiKNQOVfHUh2oLWW3STBrCgH0sHTX1xtsxYlH1zjLh8FlQGEIdZSdTbUMaV36WaZ6ImXkenGxQ==",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1",
+        "contains-path": "0.1.0",
+        "debug": "2.6.8",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "0.3.1",
+        "eslint-module-utils": "2.1.1",
+        "has": "1.0.1",
+        "lodash.cond": "4.5.2",
+        "minimatch": "3.0.4",
+        "read-pkg-up": "2.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2",
+            "isarray": "1.0.0"
+          }
+        },
+        "eslint-import-resolver-node": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.1.tgz",
+          "integrity": "sha512-yUtXS15gIcij68NmXmP9Ni77AQuCN0itXbCc/jWd8C6/yKZaSNXicpC8cgvjnxVdmfsosIXrjpzFq7GcDryb6A==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.8",
+            "resolve": "1.3.3"
+          }
+        },
+        "eslint-module-utils": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz",
+          "integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.8",
+            "pkg-dir": "1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.3.8",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-jsx-a11y": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz",
+      "integrity": "sha512-5I9SpoP7gT4wBFOtXT8/tXNPYohHBVfyVfO17vkbC7r9kEIxYJF12D3pKqhk8+xnk12rfxKClS3WCFpVckFTPQ==",
+      "dev": true,
+      "requires": {
+        "aria-query": "0.7.0",
+        "array-includes": "3.0.3",
+        "ast-types-flow": "0.0.7",
+        "axobject-query": "0.1.0",
+        "damerau-levenshtein": "1.0.4",
+        "emoji-regex": "6.4.2",
+        "jsx-ast-utils": "1.4.1"
+      },
+      "dependencies": {
+        "aria-query": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-0.7.0.tgz",
+          "integrity": "sha512-/r2lHl09V3o74+2MLKEdewoj37YZqiQZnfen1O4iNlrOjUgeKuu1U2yF3iKh6HJxqF+OXkLMfQv65Z/cvxD6vA==",
+          "dev": true,
+          "requires": {
+            "ast-types-flow": "0.0.7"
+          }
+        }
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.2.0.tgz",
+      "integrity": "sha512-GhgT80V8R3Xz/Rusosd/j7UuvSHakriJlcLHkAYaF0ENLUwFirWU3xCfBSbI5KdNURqHOhy7xtzZ4nC4npC3Kw==",
+      "dev": true,
+      "requires": {
+        "doctrine": "2.0.0",
+        "has": "1.0.1",
+        "jsx-ast-utils": "2.0.0"
+      },
+      "dependencies": {
+        "jsx-ast-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.0.tgz",
+          "integrity": "sha1-7Aaj1gzzB+XhGdrHutgeifCW8Pg=",
+          "dev": true,
+          "requires": {
+            "array-includes": "3.0.3"
+          }
+        }
+      }
+    },
+    "eslint-restricted-globals": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz",
+      "integrity": "sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
+      "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
+      "dev": true,
+      "requires": {
+        "esrecurse": "4.1.0",
+        "estraverse": "4.2.0"
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
+    "esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz",
+      "integrity": "sha1-RxO2U2rffyrE8yfVWed1a/9kgiA=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.1.1",
+        "object-assign": "4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
+          "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "etag": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz",
+      "integrity": "sha1-b2Ma7zNtbEY2K1F2QETOIWvjwFE=",
+      "dev": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.21"
+      }
+    },
+    "eventemitter3": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
+      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
+      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "dev": true,
+      "requires": {
+        "original": "1.0.0"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz",
+      "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=",
+      "dev": true,
+      "requires": {
+        "create-hash": "1.1.3"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      }
+    },
+    "exenv": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.0.tgz",
+      "integrity": "sha1-ODXxJ6vwdb/ggtCu1EhAV8eOPIk=",
+      "dev": true
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.3"
+      }
+    },
+    "express": {
+      "version": "4.15.3",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz",
+      "integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "array-flatten": "1.1.1",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.2",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.7",
+        "depd": "1.1.0",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.0",
+        "finalhandler": "1.0.3",
+        "fresh": "0.5.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.1",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "1.1.4",
+        "qs": "6.4.0",
+        "range-parser": "1.2.0",
+        "send": "0.15.3",
+        "serve-static": "1.12.3",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1",
+        "type-is": "1.6.15",
+        "utils-merge": "1.0.0",
+        "vary": "1.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
+    },
+    "external-editor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
+      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
+      "dev": true,
+      "requires": {
+        "chardet": "0.4.2",
+        "iconv-lite": "0.4.17",
+        "tmp": "0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extsprintf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
+      "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fast-memoize": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.2.7.tgz",
+      "integrity": "sha1-8UXFwiA5zt8KHU/2ylkq0CaEcMo=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",
+      "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.6.5"
+      }
+    },
+    "fbjs": {
+      "version": "0.8.12",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.12.tgz",
+      "integrity": "sha1-ELXZL3bUVXX9Y6IX1OoCvqL47QQ=",
+      "requires": {
+        "core-js": "1.2.7",
+        "isomorphic-fetch": "2.2.1",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "promise": "7.1.1",
+        "setimmediate": "1.0.5",
+        "ua-parser-js": "0.7.12"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "1.2.2",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-loader": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
+      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.6",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
+      "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.7",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.1",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "dev": true,
+      "requires": {
+        "commondir": "1.0.1",
+        "make-dir": "1.0.0",
+        "pkg-dir": "2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0"
+          }
+        }
+      }
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
+      "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.1",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
+      "dev": true
+    },
+    "flow-bin": {
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/flow-bin/-/flow-bin-0.52.0.tgz",
+      "integrity": "sha1-ttmr6LzR7lxi3zhkUaTiVTytw6M=",
+      "dev": true
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.15"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz",
+      "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=",
+      "dev": true
+    },
+    "fresh": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz",
+      "integrity": "sha1-9HTKXmqSRtb9jglTz6m5yAWvp44=",
+      "dev": true
+    },
+    "fs-readdir-recursive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
+      "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.1"
+      }
+    },
+    "function-bind": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
+      "dev": true
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "fuse.js": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.0.5.tgz",
+      "integrity": "sha1-tY2Fh4gCMh3pRGFlSUe5OvEIZyc=",
+      "dev": true
+    },
+    "fuzzysearch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fuzzysearch/-/fuzzysearch-1.0.3.tgz",
+      "integrity": "sha1-3/yA9tawQiPyImqnndGUIxCW0Ag=",
+      "dev": true
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.1.2",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
+      }
+    },
+    "gaze": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
+      "dev": true,
+      "requires": {
+        "globule": "1.2.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "glamor": {
+      "version": "2.20.25",
+      "resolved": "https://registry.npmjs.org/glamor/-/glamor-2.20.25.tgz",
+      "integrity": "sha1-cbhLgrZ6kyd3GsWd5T7pFdFIpKM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "fbjs": "0.8.12",
+        "object-assign": "4.1.1",
+        "prop-types": "15.5.10"
+      }
+    },
+    "glamorous": {
+      "version": "3.23.5",
+      "resolved": "https://registry.npmjs.org/glamorous/-/glamorous-3.23.5.tgz",
+      "integrity": "sha1-SfYTop9kze6AlIZ5xm281AhOX9U=",
+      "dev": true,
+      "requires": {
+        "brcast": "2.0.1",
+        "fast-memoize": "2.2.7",
+        "html-tag-names": "1.1.2",
+        "react-html-attributes": "1.3.0",
+        "svg-tag-names": "1.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "global": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
+      "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "requires": {
+        "min-document": "2.19.0",
+        "process": "0.5.2"
+      },
+      "dependencies": {
+        "process": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
+          "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
+        }
+      }
+    },
+    "globals": {
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
+      "integrity": "sha1-DAymltm5u2lNLlRwvTd3fKrVAoY="
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "globule": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
+      "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "handle-thing": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
+      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "dev": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      }
+    },
+    "has": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "dev": true,
+      "requires": {
+        "function-bind": "1.1.0"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+      "dev": true
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
+    "hash-base": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "hash.js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
+      "integrity": "sha1-EzL/ABVsCg/92CNgE9B7d6BFFXM=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "history": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.6.3.tgz",
+      "integrity": "sha1-bXI6hxLFgda+836MJvSu3G64aWc=",
+      "requires": {
+        "invariant": "2.2.2",
+        "loose-envify": "1.3.1",
+        "resolve-pathname": "2.1.0",
+        "value-equal": "0.2.1",
+        "warning": "3.0.0"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "1.0.3",
+        "minimalistic-assert": "1.0.0",
+        "minimalistic-crypto-utils": "1.0.1"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "hoist-non-react-statics": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
+      "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs="
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
+      "integrity": "sha1-AHa59GonBQbduq6lZJaJdGBhKmc=",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "obuf": "1.1.1",
+        "readable-stream": "2.2.9",
+        "wbuf": "1.7.2"
+      }
+    },
+    "html-comment-regex": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz",
+      "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
+      "dev": true
+    },
+    "html-element-attributes": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/html-element-attributes/-/html-element-attributes-1.3.0.tgz",
+      "integrity": "sha1-8G69/OIt6XnbggICZcrFQfsX1Pw=",
+      "dev": true
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "html-tag-names": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-tag-names/-/html-tag-names-1.1.2.tgz",
+      "integrity": "sha1-9lFolkxanIJnXv2ogoddyyqHXCI=",
+      "dev": true
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz",
+      "integrity": "sha1-X4uO2YrKVFZWv1cplzh/kEpyIlc=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.0",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1"
+      }
+    },
+    "http-proxy": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
+      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "1.2.0",
+        "requires-port": "1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
+      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "dev": true,
+      "requires": {
+        "http-proxy": "1.16.2",
+        "is-glob": "3.1.0",
+        "lodash": "4.17.4",
+        "micromatch": "2.3.11"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+      "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "0.2.0",
+        "jsprim": "1.4.0",
+        "sshpk": "1.13.1"
+      }
+    },
+    "https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+      "dev": true
+    },
+    "hyphenate-style-name": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz",
+      "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz",
+      "integrity": "sha1-T9qjs4rLwsAxsEXQ7c3+HsqxjI0="
+    },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+      "dev": true
+    },
+    "icss-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
+      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.1"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+          "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3"
+          }
+        }
+      }
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
+      "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=",
+      "dev": true
+    },
+    "immutable": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz",
+      "integrity": "sha1-IAgH8Rqw9ycQ6khVQt4IgHX2jNI=",
+      "dev": true
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "inline-style-prefixer": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.6.tgz",
+      "integrity": "sha1-sn/jCbQWijHq84yOjGCrnnwRcx8=",
+      "dev": true,
+      "requires": {
+        "bowser": "1.7.0",
+        "css-in-js-utils": "1.0.3"
+      }
+    },
+    "internal-ip": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
+      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
+      "dev": true,
+      "requires": {
+        "meow": "3.7.0"
+      }
+    },
+    "interpret": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
+      "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+      "requires": {
+        "loose-envify": "1.3.1"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
+      "integrity": "sha1-HgOlL9rYOou7KyXL9JmLTP/NPew=",
+      "dev": true
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.8.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+      "dev": true
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dom": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.0.9.tgz",
+      "integrity": "sha1-SDgy1SlyBz3hK5/j9gMghw2oNw0=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.3.tgz",
+      "integrity": "sha1-wVvz5LZrYtcu+vKSWEhmPsvGGbY=",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.0.tgz",
+          "integrity": "sha1-OVZSF/NmF4nooKDAgNX35rxG4aA=",
+          "dev": true
+        }
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
+      "dev": true,
+      "requires": {
+        "tryit": "1.0.3"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-svg": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
+      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
+      "dev": true,
+      "requires": {
+        "html-comment-regex": "1.1.1"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
+      "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "1.7.0",
+        "whatwg-fetch": "2.0.3"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
+      "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
+      "integrity": "sha1-COnxMkhKLEWjCQfp3E1VZ7fxFNc="
+    },
+    "js-yaml": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
+      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "2.7.3"
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-loader": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz",
+      "integrity": "sha1-i6oTZaYy9Yo8RtIBdfxgAsluN94=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "dev": true,
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
+      "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.0.2",
+        "json-schema": "0.2.3",
+        "verror": "1.3.6"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
+      "dev": true
+    },
+    "keycode": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.1.9.tgz",
+      "integrity": "sha1-lkojxU5IiUBbSGGlyfBIDUUUHfo=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.5"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
+      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "requires": {
+        "big.js": "3.1.3",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "2.0.0",
+        "path-exists": "3.0.0"
+      },
+      "dependencies": {
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+    },
+    "lodash-es": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
+      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
+      "dev": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.cond": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
+      "dev": true
+    },
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "dev": true
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "3.9.1",
+        "lodash.isarguments": "3.1.0",
+        "lodash.isarray": "3.0.4"
+      }
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.mergewith": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
+      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
+      "dev": true
+    },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=",
+      "dev": true
+    },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "loglevel": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz",
+      "integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=",
+      "dev": true
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "requires": {
+        "js-tokens": "3.0.1"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lru-cache": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+      "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "ltcdr": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltcdr/-/ltcdr-2.2.1.tgz",
+      "integrity": "sha1-Wrh60dTB2rjowIu/A37gwZAih88=",
+      "dev": true
+    },
+    "macaddress": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
+      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
+      "dev": true
+    },
+    "make-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+      "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      }
+    },
+    "mantra-core": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/mantra-core/-/mantra-core-1.7.0.tgz",
+      "integrity": "sha1-qMg+jO6D72pzgxMVGf6AMa1UY4Y=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "react-komposer": "1.13.1",
+        "react-simple-di": "1.2.0"
+      },
+      "dependencies": {
+        "react-komposer": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/react-komposer/-/react-komposer-1.13.1.tgz",
+          "integrity": "sha1-S4rEvMcTI710E9yrlcgxGX9Q7tA=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.23.0",
+            "hoist-non-react-statics": "1.2.0",
+            "invariant": "2.2.2",
+            "mobx": "2.7.0",
+            "shallowequal": "0.2.2"
+          }
+        }
+      }
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "material-colors": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.5.tgz",
+      "integrity": "sha1-UpJZPmdUyxvMK5gDDk4Najr8nqE="
+    },
+    "math-expression-evaluator": {
+      "version": "1.2.17",
+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
+      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "1.1.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.4",
+        "readable-stream": "2.2.9"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.3.8",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.3"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
+      "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "brorand": "1.1.0"
+      }
+    },
+    "mime": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
+      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
+      "integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
+      "integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.27.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
+      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "dev": true
+    },
+    "min-document": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
+      "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "requires": {
+        "dom-walk": "0.1.1"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "0.1.8",
+        "is-extendable": "0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mobx": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-2.7.0.tgz",
+      "integrity": "sha1-zz2C0YwMp/RY2PKiQIF7PcflSgE=",
+      "dev": true
+    },
+    "ms": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+      "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
+    },
+    "multicast-dns": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz",
+      "integrity": "sha1-bn3oalcIcqsXBYrepxYLvsqBTd4=",
+      "dev": true,
+      "requires": {
+        "dns-packet": "1.1.1",
+        "thunky": "0.1.0"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz",
+      "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
+      "dev": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "node-dir": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
+      "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=",
+      "dev": true,
+      "requires": {
+        "minimatch": "3.0.4"
+      }
+    },
+    "node-fetch": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.0.tgz",
+      "integrity": "sha1-P/bFZUT5t/sAaCM4u1Xub1SooO8=",
+      "requires": {
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
+      }
+    },
+    "node-forge": {
+      "version": "0.6.33",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.6.33.tgz",
+      "integrity": "sha1-RjgRh59XPUUVWtap9D3ClujoXrw=",
+      "dev": true
+    },
+    "node-gyp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
+      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "npmlog": "4.1.2",
+        "osenv": "0.1.4",
+        "request": "2.81.0",
+        "rimraf": "2.6.1",
+        "semver": "5.3.0",
+        "tar": "2.2.1",
+        "which": "1.2.14"
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",
+      "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",
+      "dev": true,
+      "requires": {
+        "assert": "1.4.1",
+        "browserify-zlib": "0.1.4",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.11.0",
+        "domain-browser": "1.1.7",
+        "events": "1.1.1",
+        "https-browserify": "0.0.1",
+        "os-browserify": "0.2.1",
+        "path-browserify": "0.0.0",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.2.9",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.7.1",
+        "string_decoder": "0.10.31",
+        "timers-browserify": "2.0.2",
+        "tty-browserify": "0.0.0",
+        "url": "0.11.0",
+        "util": "0.10.3",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "node-sass": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",
+      "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=",
+      "dev": true,
+      "requires": {
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.2",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.2",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.0",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.6.2",
+        "node-gyp": "3.6.2",
+        "npmlog": "4.1.2",
+        "request": "2.81.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "4.0.2",
+            "which": "1.2.14"
+          }
+        }
+      }
+    },
+    "noms": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz",
+      "integrity": "sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "1.0.34"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.1.0"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
+      "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "2.4.2",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.3.0",
+        "validate-npm-package-license": "3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.0.1"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "prepend-http": "1.0.4",
+        "query-string": "4.3.4",
+        "sort-keys": "1.1.2"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "1.1.4",
+        "console-control-strings": "1.1.0",
+        "gauge": "2.7.4",
+        "set-blocking": "2.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-keys": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+      "dev": true
+    },
+    "object.entries": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
+      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.7.0",
+        "function-bind": "1.1.0",
+        "has": "1.0.1"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.7.0"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "object.values": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz",
+      "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.7.0",
+        "function-bind": "1.1.0",
+        "has": "1.0.1"
+      }
+    },
+    "obuf": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.1.tgz",
+      "integrity": "sha1-EEEktsYCxnlogaBCVB0220OlJk4=",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "opn": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
+      "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
+        }
+      }
+    },
+    "original": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
+      "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=",
+      "dev": true,
+      "requires": {
+        "url-parse": "1.0.5"
+      },
+      "dependencies": {
+        "url-parse": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz",
+          "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=",
+          "dev": true,
+          "requires": {
+            "querystringify": "0.0.4",
+            "requires-port": "1.0.0"
+          }
+        }
+      }
+    },
+    "os-browserify": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
+      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "requires": {
+        "lcid": "1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+      "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
+      "dev": true
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
+      "integrity": "sha1-BfXkrpegaDcbwqXMhr+9vBnErno=",
+      "dev": true
+    },
+    "pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+      "dev": true
+    },
+    "parse-asn1": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
+      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+      "dev": true,
+      "requires": {
+        "asn1.js": "4.9.1",
+        "browserify-aes": "1.0.6",
+        "create-hash": "1.1.3",
+        "evp_bytestokey": "1.0.0",
+        "pbkdf2": "3.0.12"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz",
+      "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz",
+      "integrity": "sha1-vjZ4XFBn6kjYBv+SMojF91C2uKI=",
+      "dev": true,
+      "requires": {
+        "create-hash": "1.1.3",
+        "create-hmac": "1.1.6",
+        "ripemd160": "2.0.1",
+        "safe-buffer": "5.0.1",
+        "sha.js": "2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+      "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2"
+      }
+    },
+    "podda": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/podda/-/podda-1.2.2.tgz",
+      "integrity": "sha1-FbDtvTNK3hRYEzQ/Xs+cEKcc9QA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "immutable": "3.8.1"
+      }
+    },
+    "portfinder": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz",
+      "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "debug": "2.2.0",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        }
+      }
+    },
+    "postcss": {
+      "version": "5.2.17",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz",
+      "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "js-base64": "2.1.9",
+        "source-map": "0.5.6",
+        "supports-color": "3.2.3"
+      }
+    },
+    "postcss-calc": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
+      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-message-helpers": "2.0.0",
+        "reduce-css-calc": "1.3.0"
+      }
+    },
+    "postcss-colormin": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
+      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
+      "dev": true,
+      "requires": {
+        "colormin": "1.1.2",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-convert-values": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
+      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
+      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
+      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
+      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
+      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-discard-unused": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
+      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "uniqs": "2.0.0"
+      }
+    },
+    "postcss-filter-plugins": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
+      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "uniqid": "4.1.1"
+      }
+    },
+    "postcss-flexbugs-fixes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.0.0.tgz",
+      "integrity": "sha1-ezHLbCfQQXo1pnkUwpX4PEA8ftQ=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.4"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
+          "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
+          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.1.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.4.tgz",
+          "integrity": "sha1-VzrN33P0LsskqmGNQO49WnwEplQ=",
+          "dev": true,
+          "requires": {
+            "chalk": "2.0.1",
+            "source-map": "0.5.6",
+            "supports-color": "4.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz",
+          "integrity": "sha1-M6fGgKpRLJ0D75KcrLuXTSA9J5A=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        }
+      }
+    },
+    "postcss-load-config": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
+      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "2.1.3",
+        "object-assign": "4.1.1",
+        "postcss-load-options": "1.2.0",
+        "postcss-load-plugins": "2.3.0"
+      }
+    },
+    "postcss-load-options": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
+      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "2.1.3",
+        "object-assign": "4.1.1"
+      }
+    },
+    "postcss-load-plugins": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
+      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "2.1.3",
+        "object-assign": "4.1.1"
+      }
+    },
+    "postcss-loader": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.6.tgz",
+      "integrity": "sha512-HIq7yy1hh9KI472Y38iSRV4WupZUNy6zObkxQM/ZuInoaE2+PyX4NcO6jjP5HG5mXL7j5kcNEl0fAG4Kva7O9w==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "postcss": "6.0.4",
+        "postcss-load-config": "1.2.0",
+        "schema-utils": "0.3.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz",
+          "integrity": "sha1-CcIC1ckX7CMYjKpcnLkXnNlUd1A=",
+          "dev": true,
+          "requires": {
+            "color-convert": "1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz",
+          "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "3.1.0",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.4",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.4.tgz",
+          "integrity": "sha1-VzrN33P0LsskqmGNQO49WnwEplQ=",
+          "dev": true,
+          "requires": {
+            "chalk": "2.0.1",
+            "source-map": "0.5.6",
+            "supports-color": "4.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.0.0.tgz",
+          "integrity": "sha1-M6fGgKpRLJ0D75KcrLuXTSA9J5A=",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-idents": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
+      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
+      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
+      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-api": "1.6.1",
+        "postcss": "5.2.17",
+        "postcss-selector-parser": "2.2.3",
+        "vendors": "1.0.1"
+      }
+    },
+    "postcss-message-helpers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
+      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=",
+      "dev": true
+    },
+    "postcss-minify-font-values": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
+      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
+      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-minify-params": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
+      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "1.0.2",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0",
+        "uniqs": "2.0.0"
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
+      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "1.0.2",
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "postcss-selector-parser": "2.2.3"
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
+      "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
+      "dev": true,
+      "requires": {
+        "postcss": "6.0.1"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+          "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3"
+          }
+        }
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
+      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.1"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+          "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3"
+          }
+        }
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
+      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "dev": true,
+      "requires": {
+        "css-selector-tokenizer": "0.7.0",
+        "postcss": "6.0.1"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+          "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3"
+          }
+        }
+      }
+    },
+    "postcss-modules-values": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "dev": true,
+      "requires": {
+        "icss-replace-symbols": "1.1.0",
+        "postcss": "6.0.1"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
+          "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
+          "dev": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "source-map": "0.5.6",
+            "supports-color": "3.2.3"
+          }
+        }
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
+      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
+      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "2.1.0",
+        "normalize-url": "1.9.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
+      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-reduce-idents": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
+      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
+      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.17"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
+      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "dev": true,
+      "requires": {
+        "flatten": "1.0.2",
+        "indexes-of": "1.0.1",
+        "uniq": "1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
+      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
+      "dev": true,
+      "requires": {
+        "is-svg": "2.1.0",
+        "postcss": "5.2.17",
+        "postcss-value-parser": "3.3.0",
+        "svgo": "0.7.2"
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
+      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "1.0.2",
+        "postcss": "5.2.17",
+        "uniqs": "2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "postcss-zindex": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
+      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "postcss": "5.2.17",
+        "uniqs": "2.0.0"
+      }
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "private": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
+      "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz",
+      "integrity": "sha1-SJZUxpJha4qlWwck+oCbt9tJxb8=",
+      "requires": {
+        "asap": "2.0.5"
+      }
+    },
+    "prop-types": {
+      "version": "15.5.10",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz",
+      "integrity": "sha1-J5ffwxJhguOpXj37suiT3ddFYVQ=",
+      "requires": {
+        "fbjs": "0.8.12",
+        "loose-envify": "1.3.1"
+      }
+    },
+    "proxy-addr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz",
+      "integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM=",
+      "dev": true,
+      "requires": {
+        "forwarded": "0.1.0",
+        "ipaddr.js": "1.3.0"
+      }
+    },
+    "prr": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
+      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+      "dev": true,
+      "requires": {
+        "bn.js": "4.11.6",
+        "browserify-rsa": "4.0.1",
+        "create-hash": "1.1.3",
+        "parse-asn1": "5.1.0",
+        "randombytes": "2.0.3"
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
+      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+      "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
+      "dev": true
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "strict-uri-encode": "1.1.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz",
+      "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
+      "dev": true
+    },
+    "radium": {
+      "version": "0.19.4",
+      "resolved": "https://registry.npmjs.org/radium/-/radium-0.19.4.tgz",
+      "integrity": "sha1-VqpJ/eYYHS9eH6V7RxD/0MI96CA=",
+      "dev": true,
+      "requires": {
+        "array-find": "1.0.0",
+        "exenv": "1.2.2",
+        "inline-style-prefixer": "2.0.5",
+        "prop-types": "15.5.10"
+      },
+      "dependencies": {
+        "exenv": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+          "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=",
+          "dev": true
+        },
+        "inline-style-prefixer": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz",
+          "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=",
+          "dev": true,
+          "requires": {
+            "bowser": "1.7.0",
+            "hyphenate-style-name": "1.0.2"
+          }
+        }
+      }
+    },
+    "ramda": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
+      "integrity": "sha1-oAGr7bP/YQd9T/HVd9RN536NCjU="
+    },
+    "randomatic": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz",
+      "integrity": "sha1-EQ3Kv/OX6dz/fAeJzMCkmt8exbs=",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "kind-of": "3.2.2"
+      }
+    },
+    "randombytes": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz",
+      "integrity": "sha1-Z0yZdgkBw8QRJ3GjHlIdw0nMCew=",
+      "dev": true
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "react": {
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-15.6.1.tgz",
+      "integrity": "sha1-uqhDTsZ4C96ZfNw4C3nNM7ljk98=",
+      "requires": {
+        "create-react-class": "15.6.0",
+        "fbjs": "0.8.12",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "prop-types": "15.5.10"
+      }
+    },
+    "react-color": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/react-color/-/react-color-2.14.0.tgz",
+      "integrity": "sha512-5D/2rRGuqTA9fgKLXdHDyCuQJrjgu257B4+ORsoJ1mOPCw7dvPdCJdC5q+/QO6QGQAPe0TSPHGObBPIkMUNhQg==",
+      "requires": {
+        "lodash": "4.17.4",
+        "material-colors": "1.2.5",
+        "prop-types": "15.5.10",
+        "reactcss": "1.2.3",
+        "tinycolor2": "1.4.1"
+      }
+    },
+    "react-deep-force-update": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz",
+      "integrity": "sha1-T39sEsPn3kLzRZkqPFGCNvoeytM="
+    },
+    "react-docgen": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-2.16.0.tgz",
+      "integrity": "sha1-A8nrqTXegDHXkatiZXt7ZgbsXaY=",
+      "dev": true,
+      "requires": {
+        "async": "2.4.1",
+        "babel-runtime": "6.23.0",
+        "babylon": "5.8.38",
+        "commander": "2.10.0",
+        "doctrine": "2.0.0",
+        "node-dir": "0.1.17",
+        "recast": "0.11.23"
+      },
+      "dependencies": {
+        "babylon": {
+          "version": "5.8.38",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz",
+          "integrity": "sha1-7JsSCxG/bM1Bc6GL8hfmC3mFn/0=",
+          "dev": true
+        }
+      }
+    },
+    "react-dom": {
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz",
+      "integrity": "sha1-LLDtQZEDjlPCCes6eaI+Kkz5lHA=",
+      "requires": {
+        "fbjs": "0.8.12",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "prop-types": "15.5.10"
+      }
+    },
+    "react-dom-factories": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom-factories/-/react-dom-factories-1.0.0.tgz",
+      "integrity": "sha1-9DwF5QUbME8zJRYY1byFmynka20=",
+      "dev": true
+    },
+    "react-draggable": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-3.0.3.tgz",
+      "integrity": "sha512-ekb3dKvZFC6QaBNBpAWwGk9aoaDPkSVkrZl/LEU92THoX72Pv6uQ2ZpfYjmBrbrTQcAYmuUAkp9pHJ7j8FUYJA==",
+      "requires": {
+        "classnames": "2.2.5",
+        "prop-types": "15.5.10"
+      }
+    },
+    "react-hot-loader": {
+      "version": "3.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.0.0-beta.7.tgz",
+      "integrity": "sha1-1YR7gWXXMcTVsw2G1dRxYieg+oM=",
+      "requires": {
+        "babel-template": "6.24.1",
+        "global": "4.3.2",
+        "react-deep-force-update": "2.0.1",
+        "react-proxy": "3.0.0-alpha.1",
+        "redbox-react": "1.3.7",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "react-html-attributes": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/react-html-attributes/-/react-html-attributes-1.3.0.tgz",
+      "integrity": "sha1-yXiW6crEetnE5mGLg1ApqCb10ow=",
+      "dev": true,
+      "requires": {
+        "html-element-attributes": "1.3.0"
+      }
+    },
+    "react-icon-base": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/react-icon-base/-/react-icon-base-2.0.7.tgz",
+      "integrity": "sha1-C9GHNr1s55ym1pzoOHoH+41M7/4=",
+      "dev": true,
+      "requires": {
+        "prop-types": "15.5.8"
+      },
+      "dependencies": {
+        "prop-types": {
+          "version": "15.5.8",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.8.tgz",
+          "integrity": "sha1-a3suFBCDvjjIWVqlH8VXdccZk5Q=",
+          "dev": true,
+          "requires": {
+            "fbjs": "0.8.12"
+          }
+        }
+      }
+    },
+    "react-icons": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-2.2.5.tgz",
+      "integrity": "sha1-+UJQHCGkzARWziu+5QMsk/YFHc8=",
+      "dev": true,
+      "requires": {
+        "react-icon-base": "2.0.7"
+      }
+    },
+    "react-input-autosize": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-1.1.4.tgz",
+      "integrity": "sha1-y8RQctQITdxXgG2447NOZEuDZqw=",
+      "requires": {
+        "create-react-class": "15.6.0",
+        "prop-types": "15.5.10"
+      }
+    },
+    "react-inspector": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/react-inspector/-/react-inspector-2.1.4.tgz",
+      "integrity": "sha1-ISP6t09orjE2+9AjkvrbdkMm0E0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "is-dom": "1.0.9"
+      }
+    },
+    "react-komposer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/react-komposer/-/react-komposer-2.0.0.tgz",
+      "integrity": "sha1-uWRzgBSptK7klKg8C1uDPWYHKpA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "hoist-non-react-statics": "1.2.0",
+        "lodash.pick": "4.4.0",
+        "react-stubber": "1.0.0",
+        "shallowequal": "0.2.2"
+      }
+    },
+    "react-modal": {
+      "version": "1.9.7",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-1.9.7.tgz",
+      "integrity": "sha512-oZNqI0ZnPD7NnfObrCMz2hxHTAw5oEuhZJ+gnyFNIQB2rR8h1YbLQTfhms1mtSJigb0J23OOWElHjXYYaKO+wg==",
+      "dev": true,
+      "requires": {
+        "create-react-class": "15.6.0",
+        "element-class": "0.2.2",
+        "exenv": "1.2.0",
+        "lodash.assign": "4.2.0",
+        "prop-types": "15.5.10",
+        "react-dom-factories": "1.0.0"
+      }
+    },
+    "react-proxy": {
+      "version": "3.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz",
+      "integrity": "sha1-RABCa8+oDKpnJMd1VpUxUgn6Swc=",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "react-redux": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.0.7.tgz",
+      "integrity": "sha512-5VI8EV5hdgNgyjfmWzBbdrqUkrVRKlyTKk1sGH3jzM2M2Mhj/seQgPXaz6gVAj2lz/nz688AdTqMO18Lr24Zhg==",
+      "requires": {
+        "hoist-non-react-statics": "2.5.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.5",
+        "lodash-es": "4.17.7",
+        "loose-envify": "1.3.1",
+        "prop-types": "15.6.1"
+      },
+      "dependencies": {
+        "fbjs": {
+          "version": "0.8.16",
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+          "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+          "requires": {
+            "core-js": "1.2.7",
+            "isomorphic-fetch": "2.2.1",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1",
+            "promise": "7.1.1",
+            "setimmediate": "1.0.5",
+            "ua-parser-js": "0.7.12"
+          }
+        },
+        "hoist-non-react-statics": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz",
+          "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w=="
+        },
+        "lodash": {
+          "version": "4.17.5",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
+          "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
+        },
+        "lodash-es": {
+          "version": "4.17.7",
+          "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.7.tgz",
+          "integrity": "sha512-jzqTi3vk4J5Dxq43cNjB0ekfCjPLHixoY2Sc0WHTo+0r928taLqe/VCt02vY5uQBvg0rdXgL3xWkK4X0MCmZcw=="
+        },
+        "prop-types": {
+          "version": "15.6.1",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz",
+          "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==",
+          "requires": {
+            "fbjs": "0.8.16",
+            "loose-envify": "1.3.1",
+            "object-assign": "4.1.1"
+          }
+        }
+      }
+    },
+    "react-router": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.1.2.tgz",
+      "integrity": "sha512-VyM87OP+GkijVkkOXJw39A9fKtFelLoZYYDxtELhpZefjYatxI2SUxZcImo/9Tv52rR9UnNJBPSBpVRQMdvi8A==",
+      "requires": {
+        "history": "4.6.3",
+        "hoist-non-react-statics": "1.2.0",
+        "invariant": "2.2.2",
+        "loose-envify": "1.3.1",
+        "path-to-regexp": "1.7.0",
+        "prop-types": "15.5.10",
+        "warning": "3.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "path-to-regexp": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+          "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "react-router-dom": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.1.2.tgz",
+      "integrity": "sha512-CU6pFlpfvIj/xi36rZAbUiN0x39241q+d5bAfJJLtlEqlM62F3zgyv5aERH9zesmKqyDBBp2kd85rkq9Mo/iNQ==",
+      "requires": {
+        "history": "4.6.3",
+        "loose-envify": "1.3.1",
+        "prop-types": "15.5.10",
+        "react-router": "4.1.2"
+      }
+    },
+    "react-select": {
+      "version": "1.0.0-rc.5",
+      "resolved": "https://registry.npmjs.org/react-select/-/react-select-1.0.0-rc.5.tgz",
+      "integrity": "sha1-nTFvJSsa3Dct21zfHxGca3z9tdY=",
+      "requires": {
+        "classnames": "2.2.5",
+        "create-react-class": "15.6.0",
+        "prop-types": "15.5.10",
+        "react-input-autosize": "1.1.4"
+      }
+    },
+    "react-simple-di": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-simple-di/-/react-simple-di-1.2.0.tgz",
+      "integrity": "sha1-3eDlv2ifOR7yqwLJBDshP+I5xtA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "hoist-non-react-statics": "1.2.0"
+      }
+    },
+    "react-stubber": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/react-stubber/-/react-stubber-1.0.0.tgz",
+      "integrity": "sha1-Qe4srHLU1P1wpjiW2pjhNzm4Rig=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0"
+      }
+    },
+    "react-style-proptype": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/react-style-proptype/-/react-style-proptype-3.0.0.tgz",
+      "integrity": "sha1-ieC2RvJmxlarsPDdggLb1QNsMeY=",
+      "dev": true,
+      "requires": {
+        "prop-types": "15.5.10"
+      }
+    },
+    "react-transition-group": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.0.tgz",
+      "integrity": "sha1-tR/JIbDDg1p+98Vxx5/ILHPpIE8=",
+      "dev": true,
+      "requires": {
+        "chain-function": "1.0.0",
+        "dom-helpers": "3.2.1",
+        "loose-envify": "1.3.1",
+        "prop-types": "15.5.10",
+        "warning": "3.0.0"
+      }
+    },
+    "react-treebeard": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/react-treebeard/-/react-treebeard-2.0.3.tgz",
+      "integrity": "sha512-fqSmx0RPuUxvG5kQantyW89HnOCjz6e53o3AajuaXSVWL8O8tXNUCoSdxaO6xScXpujIV+iVaYUGBpOm5Pdhiw==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "deep-equal": "1.0.1",
+        "prop-types": "15.5.10",
+        "radium": "0.19.4",
+        "shallowequal": "0.2.2",
+        "velocity-react": "1.3.3"
+      }
+    },
+    "reactcss": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
+      "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.3.8",
+        "path-type": "1.1.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
+      "integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
+      "dev": true,
+      "requires": {
+        "buffer-shims": "1.0.0",
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "string_decoder": "1.0.1",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.2.9",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "recast": {
+      "version": "0.11.23",
+      "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
+      "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
+      "dev": true,
+      "requires": {
+        "ast-types": "0.9.6",
+        "esprima": "3.1.3",
+        "private": "0.1.7",
+        "source-map": "0.5.6"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        }
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.3.3"
+      }
+    },
+    "redbox-react": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.3.7.tgz",
+      "integrity": "sha512-Zm3OvQfX1q4O5nyhxrFZOefvEvd4nS7Z5y5o6/HofRgkUHiE5LI+6MddR6XRAfSg+mO46dXKgjqyVYAcO8+lJA==",
+      "requires": {
+        "error-stack-parser": "1.3.6",
+        "object-assign": "4.1.1",
+        "prop-types": "15.5.10",
+        "sourcemapped-stacktrace": "1.1.6"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "reduce-css-calc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "0.4.2",
+        "math-expression-evaluator": "1.2.17",
+        "reduce-function-call": "1.0.2"
+      }
+    },
+    "reduce-function-call": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz",
+      "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=",
+      "dev": true,
+      "requires": {
+        "balanced-match": "0.4.2"
+      }
+    },
+    "redux": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
+      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
+      "requires": {
+        "lodash": "4.17.4",
+        "lodash-es": "4.17.4",
+        "loose-envify": "1.3.1",
+        "symbol-observable": "1.0.4"
+      }
+    },
+    "regenerate": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
+      "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+    },
+    "regenerator-transform": {
+      "version": "0.9.11",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
+      "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.23.0",
+        "babel-types": "6.24.1",
+        "private": "0.1.7"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
+      "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3",
+        "is-primitive": "2.0.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.3.2",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz",
+      "integrity": "sha1-YV67lq9VlVLUv0BXyENtSGq2PMQ=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.81.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+      "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.6.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.1.4",
+        "har-validator": "4.2.1",
+        "hawk": "3.1.3",
+        "http-signature": "1.1.1",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.15",
+        "oauth-sign": "0.8.2",
+        "performance-now": "0.2.0",
+        "qs": "6.4.0",
+        "safe-buffer": "5.0.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.2",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+          "dev": true
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
+      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
+      }
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+      "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "resolve-pathname": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.1.0.tgz",
+      "integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ="
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
+      "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+      "dev": true,
+      "requires": {
+        "hash-base": "2.0.2",
+        "inherits": "2.0.3"
+      }
+    },
+    "rx": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
+      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I="
+    },
+    "rx-lite": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
+      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
+      "dev": true
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "dev": true,
+      "requires": {
+        "rx-lite": "3.1.2"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+      "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
+      "dev": true
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "scss-tokenizer": "0.2.3",
+        "yargs": "7.1.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
+          }
+        },
+        "yargs": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "1.4.0",
+            "read-pkg-up": "1.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "1.0.2",
+            "which-module": "1.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "5.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+          "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
+      }
+    },
+    "sass-loader": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz",
+      "integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==",
+      "dev": true,
+      "requires": {
+        "async": "2.4.1",
+        "clone-deep": "0.3.0",
+        "loader-utils": "1.1.0",
+        "lodash.tail": "4.1.1",
+        "pify": "3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        }
+      }
+    },
+    "sax": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz",
+      "integrity": "sha1-/YYxojvHgmvvXYcb24c3jJVkeCg="
+    },
+    "schema-utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+      "dev": true,
+      "requires": {
+        "ajv": "5.1.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.1.5",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.1.5.tgz",
+          "integrity": "sha1-hzSTG2AfANT+73xlc4130bZdH2g=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        }
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "requires": {
+        "js-base64": "2.1.9",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selfsigned": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.9.1.tgz",
+      "integrity": "sha1-zdpEktcNSGVw+HxlVGAjVY4d+lo=",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.6.33"
+      }
+    },
+    "semver": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+      "dev": true
+    },
+    "send": {
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz",
+      "integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.7",
+        "depd": "1.1.0",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.0",
+        "fresh": "0.5.0",
+        "http-errors": "1.6.1",
+        "mime": "1.3.4",
+        "ms": "2.0.0",
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "serve-favicon": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz",
+      "integrity": "sha1-WYaxewUCZCtkHCH4GLGszjICXSM=",
+      "dev": true,
+      "requires": {
+        "etag": "1.8.0",
+        "fresh": "0.5.0",
+        "ms": "2.0.0",
+        "parseurl": "1.3.1",
+        "safe-buffer": "5.0.1"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "serve-index": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.0.tgz",
+      "integrity": "sha1-0rKA/FYNYW7oG0i/D6gqvtJIXOc=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "batch": "0.6.1",
+        "debug": "2.6.8",
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.1",
+        "mime-types": "2.1.15",
+        "parseurl": "1.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz",
+      "integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=",
+      "dev": true,
+      "requires": {
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.1",
+        "send": "0.15.3"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+      "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.8",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz",
+      "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "shallow-clone": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "dev": true,
+      "requires": {
+        "is-extendable": "0.1.1",
+        "kind-of": "2.0.1",
+        "lazy-cache": "0.2.7",
+        "mixin-object": "2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "1.1.5"
+          }
+        },
+        "lazy-cache": {
+          "version": "0.2.7",
+          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+          "dev": true
+        }
+      }
+    },
+    "shallowequal": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz",
+      "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=",
+      "dev": true,
+      "requires": {
+        "lodash.keys": "3.1.2"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "sockjs": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz",
+      "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "0.10.0",
+        "uuid": "2.0.3"
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "1.1.0"
+      }
+    },
+    "source-map": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+      "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
+    },
+    "source-map-resolve": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
+      "integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
+      "requires": {
+        "atob": "1.1.3",
+        "resolve-url": "0.2.1",
+        "source-map-url": "0.3.0",
+        "urix": "0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
+      "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6"
+      }
+    },
+    "source-map-url": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
+      "integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk="
+    },
+    "sourcemapped-stacktrace": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.6.tgz",
+      "integrity": "sha1-ES2HSclCw807Yw36yVFFd7hqOlE=",
+      "requires": {
+        "source-map": "0.5.6"
+      }
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "dev": true,
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
+      "dev": true
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
+      "dev": true
+    },
+    "spdy": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
+      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.8",
+        "handle-thing": "1.2.5",
+        "http-deceiver": "1.2.7",
+        "safe-buffer": "5.0.1",
+        "select-hose": "2.0.0",
+        "spdy-transport": "2.0.20"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "spdy-transport": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.0.20.tgz",
+      "integrity": "sha1-c15yBUxIayNU/onnAiVgBKOazk0=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.8",
+        "detect-node": "2.0.3",
+        "hpack.js": "2.1.6",
+        "obuf": "1.1.1",
+        "readable-stream": "2.2.9",
+        "safe-buffer": "5.0.1",
+        "wbuf": "1.7.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        }
+      }
+    },
+    "stackframe": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz",
+      "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ="
+    },
+    "statuses": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+      "dev": true
+    },
+    "stdout-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
+      "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.2.9"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.2.9"
+      }
+    },
+    "stream-http": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz",
+      "integrity": "sha1-VGpRdBrVprB+njGwsQRBqRffUoo=",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.2.9",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "string.prototype.padend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
+      "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.7.0",
+        "function-bind": "1.1.0"
+      }
+    },
+    "string.prototype.padstart": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz",
+      "integrity": "sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.7.0",
+        "function-bind": "1.1.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+      "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.0.1"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "style-loader": {
+      "version": "0.18.2",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz",
+      "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "schema-utils": "0.3.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.1.3",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+      "dev": true,
+      "requires": {
+        "has-flag": "1.0.0"
+      }
+    },
+    "svg-react-loader": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/svg-react-loader/-/svg-react-loader-0.4.5.tgz",
+      "integrity": "sha1-HzJMnHuFj1yJ+sdSu+nKP2IU+FA=",
+      "requires": {
+        "css": "2.2.1",
+        "loader-utils": "1.1.0",
+        "ramda": "0.21.0",
+        "rx": "4.1.0",
+        "traverse": "0.6.6",
+        "xml2js": "0.4.17"
+      }
+    },
+    "svg-tag-names": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/svg-tag-names/-/svg-tag-names-1.1.1.tgz",
+      "integrity": "sha1-lkGynvcQJe4JTHBD983efZn71Qo=",
+      "dev": true
+    },
+    "svgo": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
+      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
+      "dev": true,
+      "requires": {
+        "coa": "1.0.2",
+        "colors": "1.1.2",
+        "csso": "2.3.2",
+        "js-yaml": "3.7.0",
+        "mkdirp": "0.5.1",
+        "sax": "1.2.2",
+        "whet.extend": "0.9.9"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "requires": {
+        "block-stream": "0.0.9",
+        "fstream": "1.0.11",
+        "inherits": "2.0.3"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.2.9",
+        "xtend": "4.0.1"
+      }
+    },
+    "thunky": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz",
+      "integrity": "sha1-vzAUaCTituZ7Dy16Ssi+smkIaE4=",
+      "dev": true
+    },
+    "time-stamp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz",
+      "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz",
+      "integrity": "sha1-q0iDz1l9zVCvIRNJoA+8pWrIa4Y=",
+      "dev": true,
+      "requires": {
+        "setimmediate": "1.0.5"
+      }
+    },
+    "tinycolor2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
+      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+    },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
+      "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "traverse": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.15",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
+      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.15"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "ua-parser-js": {
+      "version": "0.7.12",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz",
+      "integrity": "sha1-BMgamb3V3FImPqKdJMa/jUgYpLs="
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true,
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.6",
+        "uglify-js": "2.8.29",
+        "webpack-sources": "1.0.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+          "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.6",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          }
+        },
+        "webpack-sources": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+          "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "2.0.0",
+            "source-map": "0.5.6"
+          }
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uniqid": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
+      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
+      "dev": true,
+      "requires": {
+        "macaddress": "0.2.8"
+      }
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "dev": true,
+      "requires": {
+        "crypto-random-string": "1.0.0"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-loader": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
+      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "mime": "1.3.4"
+      }
+    },
+    "url-parse": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz",
+      "integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=",
+      "dev": true,
+      "requires": {
+        "querystringify": "1.0.0",
+        "requires-port": "1.0.0"
+      },
+      "dependencies": {
+        "querystringify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
+          "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=",
+          "dev": true
+        }
+      }
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz",
+      "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+      "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+      "dev": true
+    },
+    "v8flags": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "dev": true,
+      "requires": {
+        "user-home": "1.1.1"
+      },
+      "dependencies": {
+        "user-home": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+          "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+          "dev": true
+        }
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
+    },
+    "value-equal": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.2.1.tgz",
+      "integrity": "sha1-wiCjBDYfzmmU277ao8fhobiVhx0="
+    },
+    "vary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz",
+      "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=",
+      "dev": true
+    },
+    "velocity-animate": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/velocity-animate/-/velocity-animate-1.5.0.tgz",
+      "integrity": "sha1-/Idx2N/hE2/wKnB+EPuwlXxLAw8=",
+      "dev": true
+    },
+    "velocity-react": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/velocity-react/-/velocity-react-1.3.3.tgz",
+      "integrity": "sha1-1tRyds/Ivip1Yjh5sgFArFjBuCs=",
+      "dev": true,
+      "requires": {
+        "lodash": "3.10.1",
+        "prop-types": "15.5.10",
+        "react-transition-group": "1.2.0",
+        "velocity-animate": "1.5.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        }
+      }
+    },
+    "vendors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
+      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
+      "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
+      "dev": true,
+      "requires": {
+        "extsprintf": "1.0.2"
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "warning": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
+      "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+      "requires": {
+        "loose-envify": "1.3.1"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.2.tgz",
+      "integrity": "sha1-1pe5nx9ZUS3ydRvkJ2nBWAtYAf4=",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "1.0.0"
+      }
+    },
+    "webpack": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.3.tgz",
+      "integrity": "sha1-5oZTljvaFG4hKDLASk2AQdK0uMg=",
+      "dev": true,
+      "requires": {
+        "acorn": "5.0.3",
+        "acorn-dynamic-import": "2.0.2",
+        "ajv": "5.2.2",
+        "ajv-keywords": "2.1.0",
+        "async": "2.4.1",
+        "enhanced-resolve": "3.4.1",
+        "escope": "3.6.0",
+        "interpret": "1.0.3",
+        "json-loader": "0.5.4",
+        "json5": "0.5.1",
+        "loader-runner": "2.3.0",
+        "loader-utils": "1.1.0",
+        "memory-fs": "0.4.1",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "2.0.0",
+        "source-map": "0.5.6",
+        "supports-color": "4.2.1",
+        "tapable": "0.2.8",
+        "uglifyjs-webpack-plugin": "0.4.6",
+        "watchpack": "1.4.0",
+        "webpack-sources": "1.0.1",
+        "yargs": "8.0.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz",
+          "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ajv-keywords": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+          "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+          "dev": true
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
+          },
+          "dependencies": {
+            "string-width": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+              "dev": true,
+              "requires": {
+                "code-point-at": "1.1.0",
+                "is-fullwidth-code-point": "1.0.0",
+                "strip-ansi": "3.0.1"
+              }
+            }
+          }
+        },
+        "enhanced-resolve": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+          "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "memory-fs": "0.4.1",
+            "object-assign": "4.1.1",
+            "tapable": "0.2.8"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+          "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+          "dev": true
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "dev": true
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "requires": {
+            "execa": "0.7.0",
+            "lcid": "1.0.0",
+            "mem": "1.1.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.3.8",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "source-list-map": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+          "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          },
+          "dependencies": {
+            "is-fullwidth-code-point": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+              "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
+          "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
+          "dev": true,
+          "requires": {
+            "has-flag": "2.0.0"
+          }
+        },
+        "tapable": {
+          "version": "0.2.8",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+          "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+          "dev": true
+        },
+        "watchpack": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
+          "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=",
+          "dev": true,
+          "requires": {
+            "async": "2.4.1",
+            "chokidar": "1.7.0",
+            "graceful-fs": "4.1.11"
+          }
+        },
+        "webpack-sources": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+          "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+          "dev": true,
+          "requires": {
+            "source-list-map": "2.0.0",
+            "source-map": "0.5.6"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "2.1.0",
+            "read-pkg-up": "2.0.0",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "2.1.1",
+            "which-module": "2.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "7.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "dev": true,
+          "requires": {
+            "camelcase": "4.1.0"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz",
+      "integrity": "sha1-LiUs4d+wINvaHMs33ybzCrAU29E=",
+      "dev": true,
+      "requires": {
+        "memory-fs": "0.4.1",
+        "mime": "1.3.4",
+        "path-is-absolute": "1.0.1",
+        "range-parser": "1.2.0"
+      }
+    },
+    "webpack-dev-server": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz",
+      "integrity": "sha1-IVgPWgjNBlxxFEz29hw0W8pZqLg=",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "3.5.0",
+        "chokidar": "1.7.0",
+        "compression": "1.6.2",
+        "connect-history-api-fallback": "1.3.0",
+        "del": "3.0.0",
+        "express": "4.15.3",
+        "html-entities": "1.2.1",
+        "http-proxy-middleware": "0.17.4",
+        "internal-ip": "1.2.0",
+        "ip": "1.1.5",
+        "loglevel": "1.4.1",
+        "opn": "4.0.2",
+        "portfinder": "1.0.13",
+        "selfsigned": "1.9.1",
+        "serve-index": "1.9.0",
+        "sockjs": "0.3.18",
+        "sockjs-client": "1.1.4",
+        "spdy": "3.4.7",
+        "strip-ansi": "3.0.1",
+        "supports-color": "3.2.3",
+        "webpack-dev-middleware": "1.12.0",
+        "yargs": "6.6.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "del": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+          "dev": true,
+          "requires": {
+            "globby": "6.1.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.0",
+            "p-map": "1.1.1",
+            "pify": "3.0.0",
+            "rimraf": "2.6.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": "0.6.5"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "sockjs-client": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+          "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.8",
+            "eventsource": "0.1.6",
+            "faye-websocket": "0.11.1",
+            "inherits": "2.0.3",
+            "json3": "3.3.2",
+            "url-parse": "1.1.9"
+          }
+        },
+        "webpack-dev-middleware": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
+          "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
+          "dev": true,
+          "requires": {
+            "memory-fs": "0.4.1",
+            "mime": "1.3.4",
+            "path-is-absolute": "1.0.1",
+            "range-parser": "1.2.0",
+            "time-stamp": "2.0.0"
+          }
+        }
+      }
+    },
+    "webpack-hot-middleware": {
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz",
+      "integrity": "sha1-oWu1Nbg6aslKeKxevOTzBZ6CdNM=",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "html-entities": "1.2.1",
+        "querystring": "0.2.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
+      "dev": true,
+      "requires": {
+        "websocket-extensions": "0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz",
+      "integrity": "sha1-domUmcGEtu91Q3fC27DNbLVdKec=",
+      "dev": true
+    },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    },
+    "whet.extend": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
+      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.2.14",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz",
+      "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true
+    },
+    "wide-align": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
+      "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+      "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+      "dev": true
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "write-file-atomic": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz",
+      "integrity": "sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "slide": "1.1.6"
+      }
+    },
+    "xdg-basedir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
+      "dev": true
+    },
+    "xml2js": {
+      "version": "0.4.17",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz",
+      "integrity": "sha1-F76T6q4/O3eTWceVtBlwWogX6Gg=",
+      "requires": {
+        "sax": "1.2.2",
+        "xmlbuilder": "4.2.1"
+      }
+    },
+    "xmlbuilder": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz",
+      "integrity": "sha1-qlijBBoGb5DqoWwvU4n/GfP0YaU=",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+      "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "4.2.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+          "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+          "dev": true,
+          "requires": {
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wrap-ansi": "2.1.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+      "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+      "dev": true,
+      "requires": {
+        "camelcase": "3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true
+        }
+      }
+    }
+  }
+}
diff --git a/modules/webgui/web/package.json b/modules/webgui/web/package.json
new file mode 100644
index 0000000000..f1e2372a94
--- /dev/null
+++ b/modules/webgui/web/package.json
@@ -0,0 +1,71 @@
+{
+  "name": "openspace-webgui",
+  "version": "1.0.0",
+  "description": "",
+  "main": "src/index.jsx",
+  "private": true,
+  "scripts": {
+    "lint": "eslint --ext .jsx --ext .js src",
+    "lint-nice": "eslint --ext .jsx --ext .js src || exit 0;",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "storybook": "start-storybook -p 9001 -c .storybook",
+    "start": "copyfiles index.html dist && webpack-dev-server --progress --colors",
+    "prebuild": "echo rimraf dist && exit 1;",
+    "build": "echo NOT YET SUPPORTED && echo 'cross-env NODE_ENV=production webpack -p --config webpack.config.production.js'; && exit 1;",
+    "postbuild": "echo NOT YET SUPPORTED && echo 'copyfiles index.html dist'; && exit 1;",
+    "flow": "flow"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/OpenSpace/OpenSpace.git"
+  },
+  "author": "Klas Eskilson <klas.eskilson@gmail.com> (https://klaseskilson.se)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/OpenSpace/OpenSpace/issues"
+  },
+  "homepage": "https://github.com/OpenSpace/OpenSpace#readme",
+  "dependencies": {
+    "lodash": "^4.17.4",
+    "prop-types": "^15.5.10",
+    "react": "^15.6.1",
+    "react-color": "^2.13.8",
+    "react-dom": "^15.6.1",
+    "react-draggable": "^3.0.3",
+    "react-hot-loader": "^3.0.0-beta.7",
+    "react-input-autosize": "^1.1.4",
+    "react-redux": "^5.0.6",
+    "react-router-dom": "^4.1.2",
+    "react-select": "^1.0.0-rc.5",
+    "redux": "^3.7.2",
+    "svg-react-loader": "^0.4.5"
+  },
+  "devDependencies": {
+    "@storybook/addon-actions": "^3.2.0",
+    "@storybook/react": "^3.2.3",
+    "babel-cli": "^6.24.1",
+    "babel-core": "^6.25.0",
+    "babel-eslint": "^7.2.3",
+    "babel-loader": "^7.1.1",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-flow": "^6.23.0",
+    "babel-preset-react": "^6.24.1",
+    "copyfiles": "^1.2.0",
+    "cross-env": "^5.0.5",
+    "css-loader": "^0.28.4",
+    "eslint": "^4.4.1",
+    "eslint-config-airbnb": "^15.1.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^5.1.1",
+    "eslint-plugin-react": "^7.2.0",
+    "file-loader": "^0.11.2",
+    "flow-bin": "^0.52.0",
+    "node-sass": "^4.5.3",
+    "rimraf": "^2.6.1",
+    "sass-loader": "^6.0.6",
+    "style-loader": "^0.18.2",
+    "url-loader": "^0.5.9",
+    "webpack": "^3.5.3",
+    "webpack-dev-server": "^2.7.1"
+  }
+}
diff --git a/modules/webgui/web/src/App.jsx b/modules/webgui/web/src/App.jsx
new file mode 100644
index 0000000000..4911764524
--- /dev/null
+++ b/modules/webgui/web/src/App.jsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { HashRouter as Router, Switch, Route } from 'react-router-dom';
+import OnScreenGui from './views/OnScreenGui';
+import NotFound from './views/NotFound';
+
+// TODO: add routing
+const App = () => (
+  <Router>
+    <Switch>
+      <Route path="/onscreen" component={OnScreenGui} />
+      {/* Here, more GUI variations can be added. */}
+      {/* <Route path="/tablet" component={TabletGui} /> */}
+      <Route component={NotFound} />
+    </Switch>
+  </Router>
+);
+
+export default App;
diff --git a/modules/webgui/web/src/api/Actions/actionTypes.js b/modules/webgui/web/src/api/Actions/actionTypes.js
new file mode 100644
index 0000000000..73c372f4f2
--- /dev/null
+++ b/modules/webgui/web/src/api/Actions/actionTypes.js
@@ -0,0 +1,31 @@
+/* All the action types are collected here, to make it easier for debugging. */
+
+export const actionTypes = {
+  // action types for property tree
+  updatePropertyTreeNode: 'PROPERTY_TREE_UPDATE_NODE',
+  changePropertyTreeNode: 'PROPERTY_TREE_CHANGE_NODE',
+  initializePropertyTree: 'PROPERTY_TREE_INITIALIZE',
+  startListeningToNode: 'PROPERTY_TREE_START_LISTENING',
+  stopListeningToNode: 'PROPERTY_TREE_STOP_LISTENING',
+  removeNode: 'PROPERTY_TREE_REMOVE_NODE',
+  addNode: 'PROPERTY_TREE_ADD_NODE',
+  insertNode: 'PROPERTY_TREE_INSERT_NODE',
+
+  // action types for connection
+  startConnection: 'CONNECTION_START',
+  onOpenConnection: 'CONNECTION_ON_OPEN',
+  onCloseConnection: 'CONNECTION_ON_CLOSE',
+  changeConnectionWait: 'CONNECTION_CHANGE_WAIT',
+
+  // action types for transfer function editor
+  addTransferFunction: 'TRANSFERFUNCTION_ADD_TRANSFER_FUNCTION',
+  addEnvelope: 'TRANSFERFUNCTION_ADD_ENVELOPE',
+  addPoint: 'TRANSFERFUNCTION_ADD_POINT',
+  deleteEnvelope: 'TRANSFERFUNCTION_DELETE_ENVELOPE',
+  clearEnvelopes: 'TRANSFERFUNCTION_CLEAR_ENVELOPES',
+  movePoint: 'TRANSFERFUNCTION_MOVE_POINT',
+  changeColor: 'TRANSFERFUNCTION_CHANGE_COLOR',
+  toggleActiveEnvelope: 'TRANSFERFUNCTION_TOGGLE_ACTIVE_ENVELOPE',
+  toggleActivePoint: 'TRANSFERFUNCTION_TOGGLE_ACTIVE_POINT',
+  setClickablePoint: 'TRANSFERFUNCTION_TOGGLE_CLICKABLE_POINT',
+};
diff --git a/modules/webgui/web/src/api/Actions/index.js b/modules/webgui/web/src/api/Actions/index.js
new file mode 100644
index 0000000000..75b8c6d5e0
--- /dev/null
+++ b/modules/webgui/web/src/api/Actions/index.js
@@ -0,0 +1,69 @@
+import { actionTypes } from './actionTypes';
+
+export const updatePropertyValue = (description, value) => ({
+  type: actionTypes.updatePropertyTreeNode,
+  payload: {
+    URI: description.Identifier,
+    description,
+    value,
+  },
+});
+
+export const changePropertyValue = (description, value) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    URI: description.Identifier,
+    description,
+    value,
+  },
+});
+
+export const initializePropertyTree = node => ({
+  type: actionTypes.insertNode,
+  payload: {
+    node,
+  },
+});
+
+
+export const startListening = URI => ({
+  type: actionTypes.startListeningToNode,
+  payload: {
+    URI,
+  },
+});
+
+export const stopListening = URI => ({
+  type: actionTypes.stopListeningToNode,
+  payload: {
+    URI,
+  },
+});
+
+export const startConnection = () => ({
+  type: actionTypes.startConnection,
+  payload: {
+
+  },
+});
+
+export const onOpenConnection = () => ({
+  type: actionTypes.onOpenConnection,
+  payload: {
+
+  },
+});
+
+export const onCloseConnection = () => ({
+  type: actionTypes.onCloseConnection,
+  payload: {
+
+  },
+});
+
+export const changeConnectionWait = value => ({
+  type: actionTypes.changeConnectionWait,
+  payload: {
+    value,
+  },
+});
diff --git a/modules/webgui/web/src/api/Actions/transferFunctionActions.js b/modules/webgui/web/src/api/Actions/transferFunctionActions.js
new file mode 100644
index 0000000000..38cf63406c
--- /dev/null
+++ b/modules/webgui/web/src/api/Actions/transferFunctionActions.js
@@ -0,0 +1,93 @@
+import { actionTypes } from './actionTypes';
+
+const IdContainer = [];
+
+export const addEnvelope = (points, URI) => {
+  if (!(URI in IdContainer)) {
+    IdContainer[URI] = 0;
+  }
+  return {
+    type: actionTypes.changePropertyTreeNode,
+    payload: {
+      type: actionTypes.addEnvelope,
+      id: IdContainer[URI]++,
+      points,
+      URI,
+    },
+  };
+};
+
+export const addPoint = (color, URI) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.addPoint,
+    color,
+    URI,
+  },
+});
+
+export const deleteEnvelope = URI => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.deleteEnvelope,
+    URI,
+  },
+});
+
+export const clearEnvelopes = URI => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.clearEnvelopes,
+    URI,
+  },
+});
+
+export const movePoint = (deltaPosition, id, envelopeId, URI) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.movePoint,
+    envelopeId,
+    id,
+    deltaPosition,
+    URI,
+  },
+});
+
+export const changeColor = (color, URI) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.changeColor,
+    color,
+    URI,
+  },
+});
+
+export const toggleActiveEnvelope = (envelopeId, URI) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.toggleActiveEnvelope,
+    envelopeId,
+    URI,
+  },
+});
+
+export const toggleActivePoint = (envelopeId, pointId, URI) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.toggleActivePoint,
+    envelopeId,
+    pointId,
+    URI,
+  },
+});
+
+export const setClickablePoint = (isClickable, envelopeId, pointId, URI) => ({
+  type: actionTypes.changePropertyTreeNode,
+  payload: {
+    type: actionTypes.setClickablePoint,
+    isClickable,
+    envelopeId,
+    pointId,
+    URI,
+  },
+});
diff --git a/modules/webgui/web/src/api/Connection.js b/modules/webgui/web/src/api/Connection.js
new file mode 100644
index 0000000000..5b1eb25044
--- /dev/null
+++ b/modules/webgui/web/src/api/Connection.js
@@ -0,0 +1,147 @@
+/* globals WebSocket */
+
+const TOPIC_KEY = 'topic';
+
+class Connection {
+  /**
+   * Start a connection to the web socket server
+   * @param url - the server url
+   */
+  constructor(url = Connection.DEFAULT_URL) {
+    this.commandQueue = [];
+    this.reconnectionCommandQueue = [];
+    this.statusCallbacks = [];
+    this.topics = {};
+    this.url = url;
+    this.connect();
+  }
+
+  connect() {
+    this.socket = new WebSocket(this.url);
+    this.socket.onopen = this.onOpen.bind(this);
+    this.socket.onclose = this.onClose.bind(this);
+    this.socket.onerror = this.onError.bind(this);
+    this.socket.onmessage = this.onMessage.bind(this);
+  }
+
+  reconnect() {
+    this.connect();
+  }
+
+  onOpen(event) {
+    this.statusCallbacks.forEach(cb => cb(this, event, 'onOpen'));
+
+    // flush command queue, save the messages that still fail to send
+    this.commandQueue = this.commandQueue.filter(message => !this.sendOrStore(message));
+  }
+
+  onClose(event) {
+    this.reconnectionCommandQueue
+      .filter(m => !this.commandQueue.includes(m))
+      .forEach(m => this.commandQueue.push(m));
+    this.statusCallbacks.forEach(cb => cb(this, event, 'onClose'));
+  }
+
+  onError(event) {
+    console.error('WebSocket error:', event);
+    this.statusCallbacks.forEach(cb => cb(this, event, 'onError'));
+  }
+
+  /**
+   * Callback for all messages on this connection
+   * @param event
+   */
+  onMessage(event) {
+    const message = JSON.parse(event.data);
+    const topicId = message[TOPIC_KEY];
+    const topicCallback = this.topics[topicId];
+
+    if (topicId && topicCallback) {
+      topicCallback(message.payload);
+    } else if (topicId) {
+      // eslint-disable-next-line no-console
+      console.error(`Could not find topic ${topicId}. Dropping message.`, event);
+    } else {
+      // consider this some sort of broadcast from the server
+      // eslint-disable-next-line no-console
+      console.log('Unknown message from server', message, event);
+    }
+  }
+
+  /**
+   * Send a message to the server
+   * @param payload [object] - the payload to send to the server
+   * @param callback [[function]] - This replaces any existing callback. Expects response.
+   * @param resendOnReconnect - if this message should be resent after a disconnection
+   */
+  send(payload, callback, resendOnReconnect = false) {
+    const message = JSON.stringify(payload);
+    const { topic } = payload;
+
+    // store callback
+    if (callback && topic) {
+      this.topics[topic] = callback;
+    }
+
+    if (resendOnReconnect) {
+      this.reconnectionCommandQueue.push(message);
+    }
+
+    // send it!
+    this.sendOrStore(message);
+  }
+
+  /**
+   * meant to be private method storing or sending an already prepared message
+   * @param message
+   * @return {boolean} true on send, false on store
+   */
+  sendOrStore(message) {
+    if (this.isOpen()) {
+      this.socket.send(message);
+      return true;
+    }
+
+    this.commandQueue.push(message);
+    return false;
+  }
+
+  /**
+   * Remove topic callback
+   * @param topicId - the topicId
+   * @returns {boolean} - true if callback was removed, false otherwise
+   */
+  clearTopic(topicId) {
+    if (this.topics[topicId]) {
+      delete this.topics[topicId];
+      return true;
+    }
+    return false;
+  }
+
+  isConnecting() {
+    return this.socket.readyState === this.socket.CONNECTING;
+  }
+
+  isOpen() {
+    return this.socket.readyState === this.socket.OPEN;
+  }
+
+  isClosed() {
+    return [this.socket.CLOSED, this.socket.CLOSING].includes(this.socket.readyState);
+  }
+
+  close() {
+    this.socket.close();
+  }
+
+  static get DEFAULT_URL() {
+    return 'ws://localhost:8001';
+  }
+
+  addStatusCallback(cb) {
+    this.statusCallbacks.push(cb);
+  }
+}
+
+export default Connection;
diff --git a/modules/webgui/web/src/api/DataManager.js b/modules/webgui/web/src/api/DataManager.js
new file mode 100644
index 0000000000..4c94e08360
--- /dev/null
+++ b/modules/webgui/web/src/api/DataManager.js
@@ -0,0 +1,216 @@
+// @flow
+import Subscription from './Subscription';
+import Connection from './Connection';
+
+const TOPIC_TYPES = {
+  get: 'get',
+  interaction: 'interaction',
+  luascript: 'luascript',
+  set: 'set',
+  subscribe: 'subscribe',
+  time: 'time',
+  trigger: 'trigger',
+};
+
+const SUBSCRIPTION_EVENTS = {
+  start: 'start_subscription',
+  stop: 'stop_subscription',
+}
+
+const ResubscribeOnReconnect = true;
+Object.freeze(ResubscribeOnReconnect);
+
+function UnknownTypeException(message, type = '') {
+  this.message = message;
+  this.type = type;
+  this.allowedTypes = TOPIC_TYPES;
+}
+
+/**
+ * Send and receive data from the socket server. This allows you to
+ * set, get and subscription to properties. Singleton.
+ */
+class DataManager {
+  topicId: number;
+  subscriptions: Object;
+  privateConnection: Connection;
+
+  constructor() {
+    this.topicId = 1;
+    this.subscriptions = {};
+    this.privateConnection = undefined;
+  }
+
+  /**
+   * Subscribe to a property.
+   * @param key - the uri of the property
+   * @param callback (function) - callback to handle the incoming subscription
+   */
+  subscribe(key: string, callback: Function, type: string = TOPIC_TYPES.subscribe) {
+    let subscription = this.subscriptions[key];
+    if (!subscription) {
+      subscription = this.createSubscription(key, type, SUBSCRIPTION_EVENTS.start);
+      this.subscriptions[key] = subscription;
+    }
+    return subscription.addCallback(callback); 
+  }
+
+  /**
+   * Unsubscribe from a property
+   * @param key - the key to unsubscribe from
+   * @param callback - the callback stored in the subscription
+   */
+  unsubscribe(key: string, callbackId: number) {
+    const subscription = this.subscriptions[key];
+    if (subscription) {
+      subscription.removeCallback(callbackId);
+      // TODO: should subscriptions be killed or should we let them be for future snappiness?
+       if (!subscription.hasAnyCallbacks()) {
+          this.deleteSubscription(key, subscription.topic);
+          this.connection.clearTopic(subscription.topic);
+          delete this.subscriptions[subscription.key];
+       }
+       return true;
+    }
+  }
+
+  /**
+   * Get a property from OpenSpace
+   * @param key - the URI/key to get
+   * @param receivingCallback - the callback that takes care of the response
+   */
+  getValue(key: string, receivingCallback: Function) {
+    const message = this.wrapMessage({
+      type: TOPIC_TYPES.get,
+      payload: {
+        property: key,
+      },
+    });
+    const callback = (...args) => {
+      this.connection.clearTopic(message.topic);
+      receivingCallback(...args);
+    };
+    this.send(message, callback);
+  }
+
+  /**
+   * Set the value of a property
+   * @param key - the URI of the property
+   * @param value - the value
+   */
+  setValue(key: string, value: mixed) {
+    const message = this.wrapMessage({
+      type: TOPIC_TYPES.set,
+      payload: {
+        property: key,
+        value,
+      },
+    });
+    this.send(message);
+  }
+
+  /**
+   * trigger a trigger property
+   * @param key - the uri
+   */
+  trigger(key: string) {
+    const message = this.wrapMessage({
+      type: TOPIC_TYPES.trigger,
+      payload: {
+        property: key,
+      },
+    });
+    this.send(message);
+  }
+
+  /**
+   * Run a lua script
+   * @param script - the script to run
+   */
+  runScript(script: string) {
+    const message = this.wrapMessage({
+      type: TOPIC_TYPES.luascript,
+      payload: {
+        script,
+      },
+    });
+    this.send(message);
+  }
+
+  createSubscription(key: string, type: string = TOPIC_TYPES.subscribe) {
+    const message = this.wrapMessage({
+      type,
+      payload: {
+        property: key,
+        event: SUBSCRIPTION_EVENTS.start,
+      },
+    });
+    const subscription = new Subscription(key, message.topic);
+    this.send(message, subscription.onMessage, ResubscribeOnReconnect);
+    return subscription;
+  }
+
+  deleteSubscription(key: string, topic: number, type: string = TOPIC_TYPES.subscribe) {
+    const message = this.wrapMessage({
+      type,
+      payload: {
+        property: key,
+        event: SUBSCRIPTION_EVENTS.stop,
+      },
+      topic,
+    });
+    this.send(message);
+  }
+
+  /**
+   * wrap the Connection.send method
+   * @param message - the message to send
+   * @param args - optional args to send Connection.send
+   */
+  send(message: Object, ...args: Array<mixed>) {
+    this.connection.send(message, ...args);
+  }
+
+  /**
+   * Wrap a message to be sent
+   *
+   * @param payload - the payload to send
+   * @param type - the topic type to use one of TOPIC_TYPES
+   * @param topic - optional. the topicID to use.
+   *
+   * @returns {{payload: *, type: *, topic: *}}
+   * @throws UnknownTypeException - unless provided `type` is in `TOPIC_TYPES`
+   */
+  wrapMessage({ payload, type, topic = this.nextTopicId }) {
+    if (!TOPIC_TYPES[type]) {
+      throw new UnknownTypeException('Unknown type provided.', type);
+    }
+    return { payload, type, topic };
+  }
+
+  get nextTopicId(): number {
+    const { topicId } = this;
+    this.topicId += 1;
+    return topicId;
+  }
+
+  get connection(): Connection {
+    this.privateConnection = this.privateConnection || new Connection();
+    return this.privateConnection;
+  }
+
+  set connection(newConnection: Connection) {
+    if (this.privateConnection) {
+      this.connection.close();
+    }
+
+    this.privateConnection = newConnection;
+  }
+}
+
+// Export as a singleton
+const instance = new DataManager();
+Object.seal(instance);
+
+export const TopicTypes = TOPIC_TYPES;
+export default instance;
diff --git a/modules/webgui/web/src/api/Middleware/connection.js b/modules/webgui/web/src/api/Middleware/connection.js
new file mode 100644
index 0000000000..5698eb13d8
--- /dev/null
+++ b/modules/webgui/web/src/api/Middleware/connection.js
@@ -0,0 +1,52 @@
+import { onOpenConnection, changeConnectionWait, onCloseConnection } from '../Actions';
+import { actionTypes } from '../Actions/actionTypes';
+
+/**
+ * start reconnection attempts, at intervals ever increasing
+ */
+const tryToReconnect = (store) => {
+  const { connection } = store.getState();
+
+  console.log('Attempting to connect in', connection.connectionWait, 'ms.'); // eslint-disable-line
+  setTimeout(() => {
+    connection.connection.reconnect();
+    connection.connectionWait *= 2;
+    store.dispatch(changeConnectionWait(connection.connectionWait));
+  }, connection.connectionWait);
+};
+
+const connectionStatusCallback = (store, event, origin) => {
+  store.getState();
+  switch (origin) {
+    case 'onOpen':
+      // everything is all right!
+      store.dispatch(onOpenConnection());
+      break;
+    case 'onClose':
+      store.dispatch(onCloseConnection());
+      tryToReconnect(store);
+      break;
+    case 'onError':
+      break;
+    default:
+      // unknown
+  }
+};
+
+const initializeConnection = (store) => {
+  store.getState().connection.connection.addStatusCallback((connection, event, origin) => {
+    connectionStatusCallback(store, event, origin);
+  });
+};
+
+export const connection = store => next => (action) => {
+  const result = next(action);
+  switch (action.type) {
+    case actionTypes.startConnection:
+      initializeConnection(store);
+      break;
+    default:
+      break;
+  }
+  return result;
+};
diff --git a/modules/webgui/web/src/api/Middleware/index.js b/modules/webgui/web/src/api/Middleware/index.js
new file mode 100644
index 0000000000..0cd94b11be
--- /dev/null
+++ b/modules/webgui/web/src/api/Middleware/index.js
@@ -0,0 +1,12 @@
+import { applyMiddleware } from 'redux';
+import { updateBackend } from './propertyTree';
+import { connection } from './connection';
+// import logger from './logger';
+
+const middleware = applyMiddleware(
+  // logger, //middleWare for logging state change
+  updateBackend,
+  connection,
+);
+
+export default middleware;
diff --git a/modules/webgui/web/src/api/Middleware/logger.js b/modules/webgui/web/src/api/Middleware/logger.js
new file mode 100644
index 0000000000..c5826c92b8
--- /dev/null
+++ b/modules/webgui/web/src/api/Middleware/logger.js
@@ -0,0 +1,10 @@
+const logger = store => next => (action) => {
+  console.group(action.type);
+  console.info('dispatching', action);
+  const result = next(action);
+  console.log('next state', store.getState());
+  console.groupEnd(action.type);
+  return result;
+};
+
+export default logger;
diff --git a/modules/webgui/web/src/api/Middleware/propertyTree.js b/modules/webgui/web/src/api/Middleware/propertyTree.js
new file mode 100644
index 0000000000..44617df381
--- /dev/null
+++ b/modules/webgui/web/src/api/Middleware/propertyTree.js
@@ -0,0 +1,93 @@
+import DataManager from '../DataManager';
+import { updatePropertyValue, initializePropertyTree } from '../Actions';
+import * as helperFunctions from '../../utils/propertyTreeHelpers';
+import { actionTypes } from '../Actions/actionTypes';
+import { rootOwnerKey } from '../keys';
+
+const subscriptionIds = [];
+
+const handleUpdatedValues = store => ({ Description, Value }) => {
+  store.dispatch(updatePropertyValue(Description, Value));
+  const state = store.getState();
+  const property = helperFunctions.traverseTreeWithURI(state.propertyTree, Description.Identifier);
+  if (property.listeners < 1) {
+    if (DataManager.unsubscribe(Description.Identifier, subscriptionIds[Description.Identifier])) {
+      delete subscriptionIds[Description.Identifier];
+    }
+  }
+};
+
+const startSubscription = (URI, store) => {
+  subscriptionIds[URI] = DataManager.subscribe(URI, handleUpdatedValues(store));
+};
+
+const populatePropertyTree = (Value, dispatch) => {
+  dispatch(initializePropertyTree(Value));
+};
+
+const getPropertyTree = (dispatch) => {
+  DataManager.getValue(rootOwnerKey, (Value) => {
+    populatePropertyTree(Value, dispatch);
+  });
+};
+
+const sendDataToBackEnd = (node) => {
+  switch (node.Description.Type) {
+    case 'Vec2Property':
+    case 'Vec3Property':
+    case 'Vec4Property':
+    case 'MatrixProperty':
+    case 'DMat4Property': {
+      const convertedValue = helperFunctions.jsonToLuaTable(node.Value);
+      DataManager.setValue(node.Description.Identifier, convertedValue);
+      break;
+    }
+    case 'TransferFunctionProperty': {
+      const convertedEnvelopes = helperFunctions.convertEnvelopes(node.Value);
+      DataManager.setValue(node.Description.Identifier, convertedEnvelopes);
+      break;
+    }
+    case 'TriggerProperty': {
+      DataManager.trigger(node.Description.Identifier);
+      break;
+    }
+    case 'StringProperty': {
+      const convertedString = helperFunctions.jsonToLuaString(node.Value);
+      DataManager.setValue(node.Description.Identifier, convertedString);
+      break;
+    }
+    default: {
+      DataManager.setValue(node.Description.Identifier, node.Value);
+      break;
+    }
+  }
+};
+
+export const updateBackend = store => next => (action) => {
+  const result = next(action);
+  const state = store.getState();
+  switch (action.type) {
+    case actionTypes.onOpenConnection:
+      getPropertyTree(store.dispatch);
+      break;
+    case actionTypes.changePropertyTreeNode: {
+      const nodeToUpdate = helperFunctions
+        .traverseTreeWithURI(state.propertyTree, action.payload.URI);
+      sendDataToBackEnd(nodeToUpdate);
+      break;
+    }
+    case actionTypes.startListeningToNode: {
+      const nodeToListen = helperFunctions
+        .traverseTreeWithURI(state.propertyTree, action.payload.URI);
+      if (nodeToListen.listeners === 1) {
+        startSubscription(action.payload.URI, store);
+      }
+      break;
+    }
+    default:
+      break;
+  }
+  return result;
+};
+
+export default updateBackend;
diff --git a/modules/webgui/web/src/api/Reducers/connection.js b/modules/webgui/web/src/api/Reducers/connection.js
new file mode 100644
index 0000000000..2ff55e62ec
--- /dev/null
+++ b/modules/webgui/web/src/api/Reducers/connection.js
@@ -0,0 +1,38 @@
+import Connection from '../Connection';
+import DataManager from '../DataManager';
+import { actionTypes } from '../Actions/actionTypes';
+
+export const connection = (state = {}, action) => { // state refers to connection
+  switch (action.type) {
+    case actionTypes.startConnection:
+      return {
+        connection: DataManager.connection,
+        url: Connection.DEFAULT_URL,
+        isConnected: false,
+        connectionLost: false,
+        connectionWait: 1000,
+      };
+    case actionTypes.onOpenConnection:
+      return {
+        ...state,
+        isConnected: true,
+        connectionLost: false,
+        connectionWait: 1000,
+      };
+    case actionTypes.onCloseConnection:
+      return {
+        ...state,
+        isConnected: false,
+        connectionLost: true,
+      };
+    case actionTypes.changeConnectionWait:
+      return {
+        ...state,
+        connectionWait: action.payload.value,
+      };
+    default:
+      return {
+        ...state,
+      };
+  }
+};
diff --git a/modules/webgui/web/src/api/Reducers/envelopes.js b/modules/webgui/web/src/api/Reducers/envelopes.js
new file mode 100644
index 0000000000..4f8d216b1a
--- /dev/null
+++ b/modules/webgui/web/src/api/Reducers/envelopes.js
@@ -0,0 +1,170 @@
+import { actionTypes } from '../Actions/actionTypes';
+
+const point = (state = {}, action, value, id) => {
+  switch (action.payload.type) {
+    case actionTypes.addEnvelope: {
+      let anchor = false;
+      if (id === 0 || id === 3) {
+        anchor = true;
+      }
+      return {
+        id,
+        position: value.position,
+        active: false,
+        clickable: true,
+        anchor,
+        color: value.color,
+      };
+    }
+    case actionTypes.addPoint: {
+      return {
+        id,
+        position: value.position,
+        active: false,
+        clickable: true,
+        anchor: false,
+        color: value.color,
+      };
+    }
+    default:
+      return state;
+  }
+};
+
+/*
+  Envelopes are just an arbitrary amount of points that can be moved in the TF-editor
+*/
+const envelope = (state = {}, action) => { // state refers to individual envelope
+  switch (action.payload.type) {
+    case actionTypes.addTransferFunction:
+      return [...state];
+    case actionTypes.addEnvelope: {
+      let counter = 0;
+      const points = action.payload.points.map(value =>
+        point(undefined, action, value, counter++),
+      );
+      return {
+        id: action.payload.id,
+        points,
+        active: false,
+      };
+    }
+    case actionTypes.addPoint: {
+      const pointPos = Math.ceil(state.points.length / 2);
+      const pointId = state.points.length;
+      const pointValue = Object.assign({},
+        {
+          position: {
+            x: (state.points[pointPos - 1].position.x + state.points[pointPos].position.x) / 2,
+            y: (state.points[pointPos - 1].position.y + state.points[pointPos].position.y) / 2,
+          },
+          color: action.payload.color,
+        });
+      // TODO Clean up
+      state.points.splice(pointPos, 0, point(undefined, action, pointValue, pointId));
+      return {
+        ...state,
+        points: state.points.map((point) => ({
+          ...point,
+        })),
+      };
+    }
+    case actionTypes.movePoint: {
+      const points = state.points.map(point => ({
+        ...point,
+        position: (point.id === action.payload.id) ?
+          {
+            x: point.position.x + action.payload.deltaPosition.x,
+            y: point.position.y + action.payload.deltaPosition.y,
+          }
+          : point.position,
+      }));
+      const swapPoints = points
+        .slice(1, points.length - 1).sort((a, b) => a.position.x - b.position.x);
+
+      swapPoints.splice(0, 0, points[0]);
+      swapPoints.splice(points.length - 1, 0, points[points.length - 1]);
+      return {
+        ...state,
+        points: swapPoints,
+      };
+    }
+    case actionTypes.changeColor:
+      return {
+        ...state,
+        points: state.points.map(point => ({
+          ...point,
+          color: (point.active || state.active) ?
+            action.payload.color
+            : point.color })),
+      };
+    case actionTypes.toggleActiveEnvelope:
+      return {
+        ...state,
+        active: (state.id === action.payload.envelopeId) ?
+          !state.active
+          : false,
+        points: state.points.map(point => ({
+          ...point,
+          active: false,
+        })),
+      };
+    case actionTypes.toggleActivePoint:
+      return {
+        ...state,
+        active: false,
+        points: state.points.map(point => ({
+          ...point,
+          active: (point.id === action.payload.pointId) ?
+            !point.active
+            : false,
+        })),
+      };
+    case actionTypes.setClickablePoint:
+      return {
+        ...state,
+        points: state.points.map(point => ({
+          ...point,
+          clickable: (point.id === action.payload.pointId) ?
+            action.payload.isClickable
+            : true,
+        })),
+      };
+    default:
+      return state;
+  }
+};
+
+const envelopes = (state = [], action) => { // state refers to array of envelopes
+  switch (action.payload.type) {
+    case actionTypes.addEnvelope:
+      return [...state, envelope(undefined, action)];
+    case actionTypes.clearEnvelopes:
+      return [];
+    case actionTypes.deleteEnvelope:
+      return state.filter(envelope => envelope.active !== true);
+    case actionTypes.addPoint:
+      return state.map((element) => {
+        if (element.active === true) {
+          return envelope(element, action);
+        }
+        return element;
+      });
+    case actionTypes.movePoint:
+    case actionTypes.toggleActivePoint:
+    case actionTypes.setClickablePoint:
+      return state.map((element) => {
+        if (action.payload.envelopeId === element.id) {
+          return envelope(element, action);
+        }
+        return element;
+      });
+    case actionTypes.toggleActiveEnvelope:
+    case actionTypes.changeColor:
+      return state.map(element => envelope(element, action));
+    default:
+      return state;
+  }
+};
+
+export default envelopes;
diff --git a/modules/webgui/web/src/api/Reducers/index.js b/modules/webgui/web/src/api/Reducers/index.js
new file mode 100644
index 0000000000..83723ca01e
--- /dev/null
+++ b/modules/webgui/web/src/api/Reducers/index.js
@@ -0,0 +1,11 @@
+import { combineReducers } from 'redux';
+import { propertyOwner as propertyTree } from './propertyTree';
+import { connection } from './connection';
+
+// Add more reducers here
+const openspaceApp = combineReducers({
+  propertyTree,
+  connection,
+});
+
+export default openspaceApp;
diff --git a/modules/webgui/web/src/api/Reducers/propertyTree.js b/modules/webgui/web/src/api/Reducers/propertyTree.js
new file mode 100644
index 0000000000..62f85cede3
--- /dev/null
+++ b/modules/webgui/web/src/api/Reducers/propertyTree.js
@@ -0,0 +1,221 @@
+import * as helperFunctions from '../../utils/propertyTreeHelpers';
+import envelopes from './envelopes';
+import { actionTypes } from '../Actions/actionTypes';
+
+const updateActionURI = (action, splittedURI) => {
+  return {
+    ...action,
+    payload: {
+      ...action.payload,
+      URI: splittedURI.URI,
+      identifier: splittedURI.identifier,
+      isLastNode: splittedURI.isLastNode,
+    },
+  };
+};
+
+const updateActionNode = (action, node) => {
+  return {
+    ...action,
+    payload: {
+      node,
+    },
+  };
+};
+
+const updateActionType = (action, type) => {
+  return {
+    ...action,
+    type,
+  };
+};
+
+const changePropertyOwnerState = (state, action) => {
+  switch (action.type) {
+    case actionTypes.startListeningToNode:
+    case actionTypes.stopListeningToNode:
+      return {
+        ...state,
+        listeners: (action.type === actionTypes.startListeningToNode) ?
+          state.listeners + 1 : state.listeners - 1,
+      };
+    case actionTypes.updatePropertyTreeNode:
+      return {
+        identifier: action.payload.node.identifier,
+        properties: properties(undefined, action),
+        subowners: action.payload.node.subowners.map((subowner) => {
+          const newAction = {
+            ...action,
+            payload: {
+              node: subowner,
+            },
+          };
+          return propertyOwner(undefined, newAction);
+        }),
+        tag: (action.payload.node.tag === undefined) ? [] : action.payload.node.tag,
+        listeners: 0,
+      };
+    default:
+      return state;
+  }
+};
+
+export const setPropertyValue = (state, action) => {
+  switch (action.type) {
+    case actionTypes.insertNode:
+      if (action.payload.node.Description.Type === 'TransferFunctionProperty') {
+        return envelopes(undefined, action);
+      }
+      return action.payload.node.Value;
+    case actionTypes.updatePropertyTreeNode:
+    case actionTypes.changePropertyTreeNode:
+      if (state.Description.Type === 'TransferFunctionProperty') {
+        return envelopes(state.Value, action);
+      }
+      return action.payload.value;
+    default:
+      return action.payload.Value;
+  }
+};
+
+const property = (state = {}, action) => { // state refers to a single property
+  switch (action.type) {
+    case actionTypes.insertNode:
+      return {
+        id: helperFunctions.getIdOfProperty(action.payload.node.Description.Identifier),
+        Description: action.payload.node.Description,
+        Value: setPropertyValue(undefined, action),
+        listeners: 0,
+      };
+    case actionTypes.updatePropertyTreeNode:
+    case actionTypes.changePropertyTreeNode:
+      return {
+        ...state,
+        Value: setPropertyValue(state, action),
+      };
+    case actionTypes.startListeningToNode:
+    case actionTypes.stopListeningToNode:
+      return {
+        ...state,
+        listeners: (action.type === actionTypes.startListeningToNode) ?
+          state.listeners + 1 : state.listeners - 1,
+      };
+    default:
+      return state;
+  }
+};
+
+const properties = (state = [], action) => { // state refers to an array of properties
+  switch (action.type) {
+    case actionTypes.insertNode:
+      return action.payload.node.properties.map((element) => {
+        return property(undefined, updateActionNode(action, element));
+      });
+    case actionTypes.updatePropertyTreeNode:
+    case actionTypes.changePropertyTreeNode:
+    case actionTypes.startListeningToNode:
+    case actionTypes.stopListeningToNode:
+      return state.map((element) => {
+        if (element.id === action.payload.identifier) {
+          return property(element, action);
+        }
+        return element;
+      });
+    case actionTypes.removeNode: {
+      return state.map((element) => {
+        if (!(element.id === action.payload.identifier)) {
+          return element;
+        }
+      });
+    }
+    default:
+      return state;
+  }
+};
+
+export const propertyOwner = (state = {}, action) => { // state refers to a single node
+  switch (action.type) {
+    case actionTypes.insertNode:
+      return {
+        identifier: action.payload.node.identifier,
+        properties: properties(undefined, action),
+        subowners: action.payload.node.subowners.map((subowner) => {
+          return propertyOwner(undefined, updateActionNode(action, subowner));
+        }),
+        tag: (action.payload.node.tag === undefined) ? [] : action.payload.node.tag,
+        listeners: 0,
+      };
+
+    case actionTypes.startListeningToNode:
+    case actionTypes.stopListeningToNode:
+    case actionTypes.updatePropertyTreeNode:
+    case actionTypes.changePropertyTreeNode: {
+      const splittedURI = helperFunctions.splitURI(action.payload.URI);
+      if (action.payload.isLastNode) {
+        return changePropertyOwnerState(state, action);
+      }
+      const newAction = updateActionURI(action, splittedURI);
+      return {
+        ...state,
+        subowners: state.subowners.map((element) => {
+          if (element.identifier === splittedURI.identifier) {
+            return propertyOwner(element, newAction);
+          }
+          return element;
+        }),
+        properties: properties(state.properties, newAction),
+      };
+    }
+
+    case actionTypes.removeNode: {
+      const splittedURI = helperFunctions.splitURI(action.payload.URI);
+      const newAction = updateActionURI(action, splittedURI);
+      return {
+        ...state,
+        subowners: state.subowners.map((element) => {
+          if (element.identifier === splittedURI.identifier) {
+            if (!splittedURI.isLastNode) {
+              return propertyOwner(element, newAction);
+            }
+          } else {
+            return element;
+          }
+        }),
+        properties: (splittedURI.isLastOwner) ?
+          properties(state.properties, newAction) :
+          state.properties,
+      };
+    }
+
+    case actionTypes.addNode: {
+      const splittedURI = helperFunctions.splitURI(action.payload.URI);
+      if (action.payload.isLastOwner) {
+        if (action.payload.subowners === undefined) {
+          return {
+            ...state,
+            properties: properties(state.properties, action),
+          };
+        }
+        return {
+          ...state,
+          subowners: [
+            ...state.subowners,
+            propertyOwner(undefined, updateActionType( action, actionTypes.insertNode) ), 
+          ],
+        };
+      }
+      const newAction = getNewNodeAction(action, splittedURI);
+      return {
+        ...state,
+        subowners: state.subowners.map((element) => {
+          if (element.identifier === splittedURI.identifier) {
+            return propertyOwner(element, newAction);
+          }
+          return element;
+        }),
+      };
+    }
+    default:
+      return state;
+  }
+};
\ No newline at end of file
diff --git a/modules/webgui/web/src/api/Subscription.js b/modules/webgui/web/src/api/Subscription.js
new file mode 100644
index 0000000000..1f619da53a
--- /dev/null
+++ b/modules/webgui/web/src/api/Subscription.js
@@ -0,0 +1,49 @@
+class Subscription {
+  constructor(key, topic) {
+    this.key = key;
+    this.topic = topic;
+    this.callbacks = new Map();
+    this.lastData = null;
+    this.callbackId = -1;
+    this.onMessage = this.onMessage.bind(this);
+  }
+
+  onMessage(...args) {
+    this.lastData = args;
+    for (const cb of this.callbacks.values()) {
+      cb(...args);
+    }
+  }
+
+  addCallback(callback) {
+    // don't add the same callback twice
+    if (this.hasCallback(callback)) return;
+
+    this.callbackId = this.callbackId + 1;
+    this.callbacks.set(this.callbackId, callback);
+    // if we have stored some data -- send it to the callback
+    if (this.lastData) {
+      callback(...this.lastData);
+    }
+    return this.callbackId;
+  }
+
+  hasCallback(callback) {
+    for (const cb of this.callbacks.values()) {
+      if (cb === callback) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  removeCallback(callbackIndex) {
+    this.callbacks.delete(callbackIndex);
+  }
+
+  hasAnyCallbacks() {
+    return this.callbacks.size !== 0;
+  }
+}
+
+export default Subscription;
diff --git a/modules/webgui/web/src/api/keys.js b/modules/webgui/web/src/api/keys.js
new file mode 100644
index 0000000000..f717b768f8
--- /dev/null
+++ b/modules/webgui/web/src/api/keys.js
@@ -0,0 +1,33 @@
+// eslint-disable import/prefer-default-export
+
+// key for setting/getting the Origin (focus) node
+export const OriginKey = 'NavigationHandler.Origin';
+// key to get all scene graph nodes
+// export const SceneGraphKey = '__allNodes';
+// key to get all properties in openspace engine
+// export const AllPropertiesKey = '__allProperties';
+export const rootOwnerKey = '__rootOwner';
+// export const AllScreenSpaceRenderablesKey = '__screenSpaceRenderables';
+export const VersionInfoKey = 'VersionInfo';
+export const SCMInfoKey = 'SCMInfo';
+// script to toggle pause
+export const TogglePauseScript = 'openspace.time.togglePause()';
+// key for getting current time subscription
+export const TimeKey = 'special:currentTime';
+// script to toggle shutdown
+export const ShutdownScript = 'openspace.toggleShutdown()';
+// toggle console
+export const ToggleConsoleScript = 'openspace.setPropertyValueSingle("LuaConsole.IsVisible", ' +
+                                   'not openspace.getPropertyValue("LuaConsole.IsVisible"))';
+export const ToggleNativeGuiScript = 'local b = openspace.getPropertyValue("Modules.ImGUI.Main.Enabled");' + 
+                                     'openspace.setPropertyValueSingle("Modules.ImGUI.Main.Enabled", not b);' +
+                                     'openspace.setPropertyValueSingle("Modules.ImGUI.Main.IsHidden", b);';
+
+// key for getting current simulation time
+export const CurrenTimeKey = 'currentTime';
+// key for getting the delta time
+export const DeltaTime = 'deltaTime';
+// value placeholder in scripts with parameter
+export const ValuePlaceholder = '___value___';
+// script for setting deltatime
+export const SetDeltaTimeScript = `openspace.time.setDeltaTime(${ValuePlaceholder})`;
diff --git a/modules/webgui/web/src/api/sceneGraphHelperFunctions.js b/modules/webgui/web/src/api/sceneGraphHelperFunctions.js
new file mode 100644
index 0000000000..de7f3613c0
--- /dev/null
+++ b/modules/webgui/web/src/api/sceneGraphHelperFunctions.js
@@ -0,0 +1,114 @@
+export const splitURI = (URI) => {
+  const indexForIdentifier = URI.indexOf('.');
+  const identifier = URI.substring(0, indexForIdentifier != -1 ?
+    indexForIdentifier : URI.length);
+  URI = URI.substring(indexForIdentifier + 1, URI.length);
+
+  return { identifier, URI, isLastOwner: URI.indexOf('.') === -1, isLastNode: URI.length === 0 };
+};
+
+export const getIdOfProperty = (URI) => {
+  const indexForIdentifier = URI.lastIndexOf('.');
+  return URI.substring(indexForIdentifier != -1 ?
+    indexForIdentifier + 1 : 0, URI.length);
+};
+
+export const changePropertyOwnerState = (state, action) => {
+  switch (action.type) {
+    case 'SCENEGRAPH_START_LISTENING':
+    case 'SCENEGRAPH_START_LISTENING':
+      return {
+        ...state,
+        listeners: (action.type == 'SCENEGRAPH_START_LISTENING') ?
+          state.listeners + 1 : state.listeners - 1,
+      };
+    case 'SCENEGRAPH_UPDATE_PROPERTY':
+      return {
+        identifier: action.payload.node.identifier,
+        properties: properties(undefined, action),
+        subowners: action.payload.node.subowners.map((subowner) => {
+          const newAction = {
+            ...action,
+            payload: {
+              node: subowner,
+            },
+          };
+          return propertyOwner(undefined, newAction);
+        }),
+        tag: (action.payload.node.tag === undefined) ? [] : action.payload.node.tag,
+        listeners: 0,
+      };
+    default:
+      return state;
+  }
+};
+
+const convertPointsBeforeSending = (position) => {
+  const x = (position.x);
+  const y = (600 - position.y);
+  return { x, y };
+};
+
+const keepCloning = (objectpassed) => {
+  if (objectpassed === null || typeof objectpassed !== 'object') {
+    return objectpassed;
+  }
+  // give temporary-storage the original obj's constructor
+  const temporaryStorage = objectpassed.constructor();
+  for (const key in objectpassed) {
+    temporaryStorage[key] = keepCloning(objectpassed[key]);
+  }
+  return temporaryStorage;
+};
+
+const convertEnvelopes = (envelopes) => {
+  let convertedEnvelopes = keepCloning(envelopes);
+  convertedEnvelopes = convertedEnvelopes.map(envelope =>
+    Object.assign({},
+      { points: envelope.points.map(point =>
+        Object.assign({},
+          { color: point.color,
+            position: point.position,
+          }),
+      ),
+      },
+    ),
+  );
+  return JSON.stringify(convertedEnvelopes);
+};
+
+
+const jsonToLua = json => json.replace('[', '').replace(']', '');
+
+const traverseTree = (node, URI) => {
+  const splittedURI = splitURI(URI);
+  let tmpValue;
+  if (splittedURI.isLastNode) {
+    node.properties.forEach((element) => {
+      if (element.id === splittedURI.URI) {
+        tmpValue = element;
+      }
+    });
+    return tmpValue;
+  }
+
+  node.subowners.forEach((element) => {
+    if (element.identifier === splittedURI.identifier) {
+      tmpValue = traverseTree(element, splittedURI.URI);
+      return tmpValue;
+    }
+  });
+  return tmpValue;
+};
+
+const findUpdatedProperty = (state, URI) => {
+  let property;
+  const splittedURI = splitURI(URI);
+  let returnNode;
+  state.forEach((element) => {
+    if (element.identifier === splittedURI.identifier) {
+      returnNode = traverseTree(element, splittedURI.URI);
+    }
+  });
+  return returnNode;
+};
diff --git a/modules/webgui/web/src/components/BottomBar/BottomBar.jsx b/modules/webgui/web/src/components/BottomBar/BottomBar.jsx
new file mode 100644
index 0000000000..ba38f86657
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/BottomBar.jsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import OriginPicker from './Origin/OriginPicker';
+import TimePicker from './TimePicker';
+import TfEditor from './TfEditor/containers/TfEditor';
+import styles from './BottomBar.scss';
+
+const BottomBar = () => (
+  <div className={styles.BottomBar}>
+    <TfEditor />
+    <OriginPicker />
+    <TimePicker />
+  </div>
+);
+
+export default BottomBar;
diff --git a/modules/webgui/web/src/components/BottomBar/BottomBar.scss b/modules/webgui/web/src/components/BottomBar/BottomBar.scss
new file mode 100644
index 0000000000..9014cf0889
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/BottomBar.scss
@@ -0,0 +1,11 @@
+@import "../../styles/all";
+
+.BottomBar {
+  display: flex;
+  height: $bottom-bar-height;
+  transition: $background-transition;
+
+  &:hover {
+    background: $ui-background;
+  }
+}
diff --git a/modules/webgui/web/src/components/BottomBar/Origin/FocusEntry.jsx b/modules/webgui/web/src/components/BottomBar/Origin/FocusEntry.jsx
new file mode 100644
index 0000000000..36b31dff78
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/Origin/FocusEntry.jsx
@@ -0,0 +1,51 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import DataManager from '../../../api/DataManager';
+import styles from './FocusEntry.scss';
+import { jsonToLuaString } from '../../../utils/propertyTreeHelpers';
+
+const ORIGIN_KEY = 'NavigationHandler.Origin';
+
+class FocusEntry extends Component {
+  constructor(props) {
+    super(props);
+    this.select = this.select.bind(this);
+  }
+
+  select() {
+    const { identifier } = this.props;
+    if (this.props.onClick) {
+      this.props.onClick(identifier);
+    } else {
+      DataManager.setValue(ORIGIN_KEY, jsonToLuaString(identifier));
+    }
+  }
+
+  get isActive() {
+    return this.props.identifier === this.props.active;
+  }
+
+  render() {
+    const { identifier } = this.props;
+    return (
+      <li className={`${styles.entry} ${this.isActive && styles.active}`} onClick={this.select}>
+        <span className={styles.title}>
+          { identifier }
+        </span>
+      </li>
+    );
+  }
+}
+
+FocusEntry.propTypes = {
+  identifier: PropTypes.string.isRequired,
+  onClick: PropTypes.func,
+  active: PropTypes.string,
+};
+
+FocusEntry.defaultProps = {
+  onClick: null,
+  active: '',
+};
+
+export default FocusEntry;
diff --git a/modules/webgui/web/src/components/BottomBar/Origin/FocusEntry.scss b/modules/webgui/web/src/components/BottomBar/Origin/FocusEntry.scss
new file mode 100644
index 0000000000..1d4bfc809a
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/Origin/FocusEntry.scss
@@ -0,0 +1,15 @@
+@import "../../../styles/all";
+
+.entry {
+  padding: $popover-horizontal-padding;
+
+  &:hover {
+    background: $ui-background-hover;
+  }
+
+  &.active {
+    background: $ui-background-hover;
+    border-left: 4px solid $blue;
+  }
+}
+
diff --git a/modules/webgui/web/src/components/BottomBar/Origin/OriginPicker.jsx b/modules/webgui/web/src/components/BottomBar/Origin/OriginPicker.jsx
new file mode 100644
index 0000000000..64aed1df2a
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/Origin/OriginPicker.jsx
@@ -0,0 +1,122 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+
+import SmallLabel from '../../common/SmallLabel/SmallLabel';
+import Icon from '../../common/Icon/Icon';
+import LoadingString from '../../common/LoadingString/LoadingString';
+import Picker from '../Picker';
+import Popover from '../../common/Popover/Popover';
+import FilterList from '../../common/FilterList/FilterList';
+import DataManager from '../../../api/DataManager';
+import { OriginKey } from '../../../api/keys';
+import FocusEntry from './FocusEntry';
+
+import Earth from './images/earth.png';
+import styles from './OriginPicker.scss';
+
+const icons = {
+  Earth,
+};
+
+// tag that each focusable node must have
+const REQUIRED_TAG = 'planet_solarSystem';
+
+class OriginPicker extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      origin: 'Mercury',
+      hasOrigin: false,
+      sceneGraphNodes: [],
+      showPopover: false,
+    };
+
+    this.updateOrigin = this.updateOrigin.bind(this);
+    this.togglePopover = this.togglePopover.bind(this);
+  }
+
+  componentDidMount() {
+    DataManager.subscribe(OriginKey, this.updateOrigin);
+  }
+
+  componentWillUnmount() {
+    DataManager.unsubscribe(OriginKey, this.updateOrigin);
+  }
+
+  get icon() {
+    const icon = icons[this.state.origin];
+    if (icon) {
+      return (
+        <img src={icon} className={styles.iconImage} alt={this.state.origin} />
+      );
+    }
+    return (<Icon icon="language" className={styles.Icon} />);
+  }
+
+  get origin() {
+    return this.state.origin;
+  }
+
+  updateOrigin(data) {
+    const { Value } = data;
+    this.setState({ origin: Value, hasOrigin: Value !== '' });
+  }
+
+  togglePopover() {
+    this.setState({ showPopover: !this.state.showPopover });
+  }
+
+  render() {
+    const { hasOrigin, showPopover } = this.state;
+    const { nodes } = this.props;
+    return (
+      <div className={Picker.Wrapper}>
+        <Picker onClick={this.togglePopover} className={(showPopover ? Picker.Active : '')}>
+          { this.icon }
+          <div className={Picker.Title}>
+            <span className={Picker.Name}>
+              <LoadingString loading={!hasOrigin}>
+                { this.origin }
+              </LoadingString>
+            </span>
+            <SmallLabel>Focus</SmallLabel>
+          </div>
+        </Picker>
+        { showPopover && (
+          <Popover closeCallback={this.togglePopover} title="Select focus" className={Picker.Popover}>
+            <FilterList
+              data={nodes}
+              className={styles.list}
+              searchText="Search the universe..."
+              viewComponent={FocusEntry}
+              active={this.origin}
+            />
+          </Popover>
+        )}
+      </div>
+    );
+  }
+}
+
+const mapStateToProps = (state) => {
+  const sceneType = 'Scene';
+  let nodes = [];
+  if (Object.keys(state.propertyTree).length !== 0) {
+    const rootNodes = state.propertyTree.subowners.filter(element => element.identifier === sceneType);
+    rootNodes.forEach((node) => {
+      nodes = [...nodes, ...node.subowners];
+    });
+    nodes = nodes.filter(node => node.tag.some(tag => tag.includes(REQUIRED_TAG)))
+      .map(node => Object.assign(node, { key: node.identifier }));
+  }
+  return {
+    nodes,
+  };
+};
+
+OriginPicker = connect(
+  mapStateToProps,
+)(OriginPicker);
+
+export default OriginPicker;
diff --git a/modules/webgui/web/src/components/BottomBar/Origin/OriginPicker.scss b/modules/webgui/web/src/components/BottomBar/Origin/OriginPicker.scss
new file mode 100644
index 0000000000..2b3932d211
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/Origin/OriginPicker.scss
@@ -0,0 +1,20 @@
+@import "../../../styles/all";
+
+$icon-size: 48px;
+
+.Icon {
+  font-size: $icon-size;
+  margin-right: ($base-padding / 2);
+}
+
+.iconImage {
+  animation: $appear-animation;
+  height: $icon-size - 8px;
+  margin-right: ($base-padding / 2);
+}
+
+.list :global(.scroll-content) {
+  height: 100%;
+  margin-top: 1px;
+  max-height: 200px;
+}
diff --git a/modules/webgui/web/src/components/BottomBar/Origin/images/earth.png b/modules/webgui/web/src/components/BottomBar/Origin/images/earth.png
new file mode 100644
index 0000000000..5de06fc83a
Binary files /dev/null and b/modules/webgui/web/src/components/BottomBar/Origin/images/earth.png differ
diff --git a/modules/webgui/web/src/components/BottomBar/Picker.jsx b/modules/webgui/web/src/components/BottomBar/Picker.jsx
new file mode 100644
index 0000000000..fa1fc500d7
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/Picker.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './Picker.scss';
+
+const Picker = (props) => {
+  const { children, className } = props;
+  return (
+    <div {...props} className={`${styles.Picker} ${className}`}>
+      { children }
+    </div>
+  );
+};
+
+Picker.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+Picker.defaultProps = {
+  className: '',
+};
+
+Picker.Active = styles.Active;
+Picker.Name = styles.Name;
+Picker.Popover = styles.Popover;
+Picker.Title = styles.Title;
+Picker.Wrapper = styles.Wrapper;
+Picker.Window = styles.Window;
+
+export default Picker;
+
diff --git a/modules/webgui/web/src/components/BottomBar/Picker.scss b/modules/webgui/web/src/components/BottomBar/Picker.scss
new file mode 100644
index 0000000000..d58747fb7b
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/Picker.scss
@@ -0,0 +1,45 @@
+@import "../../styles/all";
+
+.Picker {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  padding: $button-padding;
+  text-shadow: 0 1px 10px rgba(#000, 0.5);
+
+  &:hover,
+  &:focus {
+    background: $ui-background-hover;
+    outline: none;
+    text-shadow: none;
+  }
+
+  &.Active {
+    background: $ui-background;
+  }
+}
+
+.Title {
+  display: flex;
+  flex-direction: column;
+}
+
+.Name {
+  font-size: 1.2rem;
+  height: 21px;
+  line-height: 1;
+}
+
+.Wrapper {
+  position: relative;
+}
+
+.Popover {
+  bottom: unquote("calc(100% + #{$popover-arrow-size})");
+  left: 50%;
+  position: absolute;
+  transform: translateX(-50%);
+  width: 300px;
+  z-index: 10;
+}
+
diff --git a/modules/webgui/web/src/components/BottomBar/SimulationIncrement.jsx b/modules/webgui/web/src/components/BottomBar/SimulationIncrement.jsx
new file mode 100644
index 0000000000..8f094d4b64
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/SimulationIncrement.jsx
@@ -0,0 +1,158 @@
+import React, { Component } from 'react';
+import { throttle } from 'lodash/function';
+import DataManager, { TopicTypes } from '../../api/DataManager';
+import { DeltaTime, ValuePlaceholder, SetDeltaTimeScript } from '../../api/keys';
+import NumericInput from '../common/Input/NumericInput/NumericInput';
+import Row from '../common/Row/Row';
+import Select from '../common/Input/Select/Select';
+import { round10 } from '../../utils/rounding';
+import ScaleInput from '../common/Input/ScaleInput/ScaleInput';
+
+const UpdateDelayMs = 1000;
+// Throttle the delta time updating, so that we don't accidentally flood
+// the simulation with updates.
+const UpdateDeltaTimeNow = (value) => {
+  const script = SetDeltaTimeScript.replace(ValuePlaceholder, value);
+  DataManager.runScript(script);
+};
+const UpdateDeltaTime = throttle(UpdateDeltaTimeNow, UpdateDelayMs);
+
+const Steps = {
+  seconds: 'Seconds',
+  minutes: 'Minutes',
+  hours: 'Hours',
+  days: 'Days',
+  months: 'Months',
+  years: 'Years',
+};
+const StepSizes = {
+  [Steps.seconds]: 1,
+  [Steps.minutes]: 60,
+  [Steps.hours]: 3600,
+  [Steps.days]: 86400,
+  [Steps.months]: 2678400,
+  [Steps.years]: 31536000,
+};
+const StepPrecisions = {
+  [Steps.seconds]: 0,
+  [Steps.minutes]: -3,
+  [Steps.hours]: -4,
+  [Steps.days]: -7,
+  [Steps.months]: -10,
+  [Steps.years]: -14,
+};
+const Limits = {
+  [Steps.seconds]: { min: -20000, max: 20000, step: 1 },
+  [Steps.minutes]: { min: -20000, max: 20000, step: 0.001 },
+  [Steps.hours]: { min: -1000, max: 1000, step: 0.0001 },
+  [Steps.days]: { min: -10, max: 10, step: 0.000001 },
+  [Steps.months]: { min: -10, max: 10, step: 0.00000001 },
+  [Steps.years]: { min: -1, max: 1, step: 0.0000000001 },
+};
+Object.freeze(Steps);
+Object.freeze(StepSizes);
+Object.freeze(StepPrecisions);
+Object.freeze(Limits);
+
+class SimulationIncrement extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      deltaTime: 1,
+      stepSize: Steps.seconds,
+      quickAdjust: 1,
+    };
+
+    this.deltaTimeUpdated = this.deltaTimeUpdated.bind(this);
+    this.setDeltaTime = this.setDeltaTime.bind(this);
+    this.setStepSize = this.setStepSize.bind(this);
+    this.setQuickAdjust = this.setQuickAdjust.bind(this);
+  }
+
+  componentDidMount() {
+    DataManager.subscribe(DeltaTime, this.deltaTimeUpdated, TopicTypes.time);
+  }
+
+  componentWillUnmount() {
+    DataManager.unsubscribe(DeltaTime, this.deltaTimeUpdated);
+  }
+
+  get stepSize() {
+    const { stepSize } = this.state;
+    return StepSizes[stepSize];
+  }
+
+  get limits() {
+    const { stepSize } = this.state;
+    return Limits[stepSize];
+  }
+
+  setDeltaTime(event) {
+    const { value } = event.currentTarget;
+    const deltaTime = parseFloat(value) * this.stepSize;
+
+    // optimistic ui change
+    this.setState({ deltaTime });
+    UpdateDeltaTime(deltaTime);
+  }
+
+  setStepSize({ value }) {
+    if (!Object.values(Steps).includes(value)) return;
+
+    this.setState({ stepSize: value });
+  }
+
+  setQuickAdjust(value) {
+    if (value !== 0) {
+      this.beforeAdjust = this.beforeAdjust || this.state.deltaTime;
+      const quickAdjust = (value ** 5);
+      UpdateDeltaTimeNow(this.beforeAdjust * quickAdjust);
+    } else {
+      UpdateDeltaTime.cancel();
+      UpdateDeltaTimeNow(this.beforeAdjust || 1);
+      this.beforeAdjust = null;
+    }
+  }
+
+  deltaTimeUpdated({deltaTime}) {
+    this.setState({deltaTime});
+  }
+
+  render() {
+    const { deltaTime, stepSize } = this.state;
+    const adjustedDelta = round10(deltaTime / this.stepSize, StepPrecisions[stepSize]);
+
+    const options = Object.values(Steps)
+      .map(step => ({ value: step, label: step }));
+
+    return (
+      <div>
+        <Row>
+          <NumericInput
+            {...this.limits}
+            onChange={this.setDeltaTime}
+            placeholder={`${stepSize} / second`}
+            value={adjustedDelta}
+          />
+          <Select
+            direction="up"
+            label="Display unit"
+            onChange={this.setStepSize}
+            options={options}
+            value={stepSize}
+          />
+        </Row>
+        <div style={{ height: '10px' }} />
+        <ScaleInput
+          defaultValue={0}
+          label="Quick adjust"
+          min={-10}
+          max={10}
+          onChange={this.setQuickAdjust}
+        />
+      </div>
+    );
+  }
+}
+
+export default SimulationIncrement;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/containers/ColorPicker.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/ColorPicker.jsx
new file mode 100644
index 0000000000..1e3221437b
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/ColorPicker.jsx
@@ -0,0 +1,33 @@
+import React, { Component } from 'react';
+import { ChromePicker } from 'react-color';
+import PropTypes from 'prop-types';
+
+class ColorPicker extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      color: '#fff',
+    };
+  }
+
+  handleChangeComplete(color) {
+    this.setState({ color: color.hex });
+    this.props.onColorChange(color.hex);
+  }
+
+  render() {
+    return (
+      <ChromePicker
+        disableAlpha
+        {...this.props}
+        color={this.state.color}
+        onChangeComplete={color => this.handleChangeComplete(color)}
+      />
+    );
+  }
+}
+ColorPicker.propTypes = {
+  onColorChange: PropTypes.func.isRequired,
+};
+export default ColorPicker;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/containers/Envelope.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/Envelope.jsx
new file mode 100644
index 0000000000..b815b17a78
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/Envelope.jsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import EnvelopeCanvas from '../presentational/EnvelopeCanvas';
+import { toggleActiveEnvelope, toggleActivePoint, movePoint, setClickablePoint } from '../../../../api/Actions/transferFunctionActions';
+
+const hasActiveChild = (envelope) => {
+  let hasActiveChild = false;
+  envelope.points.forEach((point) => {
+    if (point.active) { hasActiveChild = true; }
+  });
+  return hasActiveChild;
+};
+
+const getPointPositions = (envelopes, height) => {
+  const convertedPoints = [];
+  if (envelopes.length !== 0) {
+    envelopes.map(envelope =>
+      envelope.points.map(point =>
+        convertedPoints.push(
+          Object.assign({},
+            { x1: point.position.x,
+              y1: point.position.y,
+              x2: point.position.x,
+              y2: height },
+          ),
+        ),
+      ),
+    );
+    return convertedPoints;
+  }
+};
+
+const mapStateToProps = (state, ownProps) => {
+  const envelopes = ownProps.activeVolume.properties.find(obj => obj.id === 'TransferFunction').Value.map(envelope => ({
+    ...envelope,
+    points: envelope.points.map(point => ({
+      ...point,
+      position: {
+        x: point.position.x * ownProps.width,
+        y: ownProps.height - point.position.y * ownProps.height,
+      },
+    })),
+  }));
+
+  const minValue = Number(ownProps.activeVolume.properties.find(obj => obj.id === 'MinValue').Value);
+  const maxValue = Number(ownProps.activeVolume.properties.find(obj => obj.id === 'MaxValue').Value);
+
+  const pointPositions = getPointPositions(envelopes, ownProps.height);
+
+  return {
+    envelopes,
+    minValue,
+    maxValue,
+    pointPositions,
+  };
+};
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+  handleDrag: (e, ui, index, envelope) => {
+    const id = envelope.points[index].id;
+    if (ui.deltaX !== 0 && ui.deltaY !== 0) {
+      dispatch(setClickablePoint(false, envelope.id, id, ownProps.URI));
+    }
+
+    const deltaPosition = {
+      x: ui.deltaX / ownProps.width,
+      y: 0,
+    };
+
+    if (!envelope.points[index].anchor) { deltaPosition.y = -ui.deltaY / ownProps.height; }
+
+    dispatch(movePoint(deltaPosition, id, envelope.id, ownProps.URI));
+  },
+  handleClick: (envelope, pointId) => {
+    if (envelope.points[pointId].clickable === false) {
+      dispatch(setClickablePoint(true, envelope.id, pointId, ownProps.URI));
+    } else if (envelope.active === true || hasActiveChild(envelope)) {
+      dispatch(toggleActivePoint(envelope.id, pointId, ownProps.URI));
+    } else {
+      dispatch(toggleActiveEnvelope(envelope.id, ownProps.URI));
+    }
+  },
+});
+
+const Envelope = connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(EnvelopeCanvas);
+
+export default Envelope;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/containers/Histogram.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/Histogram.jsx
new file mode 100644
index 0000000000..54f1f60246
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/Histogram.jsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import HistogramCanvas from '../presentational/HistogramCanvas';
+
+const normalizeHistogramDataToCanvas = (Value, width, height) => {
+  let normalizedHistogramData;
+  const convertedData = (eval(`(${Value})`));
+  if (convertedData.length < width) {
+    const maxValue = Math.max(...convertedData.map(o => o));
+    normalizedHistogramData = convertedData.map((value, index) =>
+      Object.assign({},
+        { x: (index / convertedData.length) * width,
+          y: (value / maxValue) * height,
+        },
+      ),
+    );
+    // Making sure the graphs body gets filled properly by adding 0 in the
+    // beginning and end of the histogram
+    normalizedHistogramData.unshift({ x: 0, y: 0 });
+    normalizedHistogramData.push({ x: width, y: 0 });
+    return normalizedHistogramData;
+  }
+};
+
+const mapStateToProps = (state, ownProps) => {
+  const histogram = normalizeHistogramDataToCanvas(ownProps.activeVolume.properties.find(obj => obj.id === 'Histogram').Value, ownProps.width, ownProps.height);
+
+  const unit = ownProps.activeVolume.properties.find(obj => obj.id === 'DataUnit').Value;
+  const minValue = Number(ownProps.activeVolume.properties.find(obj => obj.id === 'MinValue').Value);
+  const maxValue = Number(ownProps.activeVolume.properties.find(obj => obj.id === 'MaxValue').Value);
+
+  return {
+    histogram,
+    minValue,
+    maxValue,
+    unit,
+  };
+};
+
+const Histogram = connect(
+  mapStateToProps,
+)(HistogramCanvas);
+export default Histogram;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/containers/TfEditor.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/TfEditor.jsx
new file mode 100644
index 0000000000..b698e58490
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/containers/TfEditor.jsx
@@ -0,0 +1,188 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import TfIcon from 'svg-react-loader?name=TfIcon!../images/tf.svg';
+import { addEnvelope, deleteEnvelope, clearEnvelopes, addPoint, changeColor } from '../../../../api/Actions/transferFunctionActions';
+import EditorContainer from '../presentational/EditorContainer';
+import { startListening, stopListening } from '../../../../api/Actions';
+import { findAllNodesWithTag } from '../../../../utils/propertyTreeHelpers';
+import Window from '../../../common/Window/Window';
+import Picker from '../../Picker';
+import styles from '../style/TfEditor.scss';
+import ColorPicker from './ColorPicker';
+import Button from '../../../common/Input/Button/Button';
+import Select from '../../../common/Input/Select/Select';
+import SmallLabel from '../../../common/SmallLabel/SmallLabel';
+
+class TfEditor extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      currentVolume: null,
+      URI: null,
+      color: '#ffffff',
+      editorSize: {
+        height: 600,
+        width: 800,
+      },
+      showTfEditor: false,
+    };
+    this.handleVolumeChange = this.handleVolumeChange.bind(this);
+    this.toggleTfEditor = this.toggleTfEditor.bind(this);
+  }
+
+  componentDidMount() {
+    this.props.volumes.forEach((volume) => {
+      volume.data.properties.forEach((property) => {
+        this.props.StartListening(property.Description.Identifier);
+      });
+    });
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (this.state.currentVolume === null && this.props.volumes.length !== 0) {
+      this.setState({ currentVolume: this.props.volumes[0].name });
+      const URI = this.props.volumes[0].data.properties.find(obj => obj.id === 'TransferFunction').Description.Identifier;
+      this.setState({ URI });
+    }
+    if (this.state.color !== prevState.color) {
+      const { currentVolume } = this.state;
+      this.props.ChangeColor(this.state.color, this.props.volumes.find(obj => obj.id === currentVolume.name).data.properties.find(obj => obj.id === 'TransferFunction').Description.Identifier);
+    }
+  }
+
+  componentWillUnmount() {
+    this.props.volumes.forEach((volume) => {
+      volume.data.properties.forEach((property) => {
+        this.props.StopListening(property.Description.Identifier);
+      });
+    });
+  }
+
+  toggleTfEditor() {
+    this.setState({ showTfEditor: !this.state.showTfEditor });
+  }
+
+  handleVolumeChange(event) {
+    this.setState({ currentVolume: event.value });
+    const URI = this.props.volumes.find(obj => obj.id === this.state.currentVolume.name).data.properties.find(obj => obj.id === 'TransferFunction').Description.Identifier;
+    this.setState({ URI });
+  }
+
+  render() {
+    const { color, editorSize, currentVolume, showTfEditor, URI } = this.state;
+    const { volumes } = this.props;
+
+    const defaultEnvelopePoints = [
+      { color, position: { x: 0, y: 0 } },
+      { color, position: { x: 0.3, y: 1 } },
+      { color, position: { x: 0.7, y: 1 } },
+      { color, position: { x: 1, y: 0 } }];
+
+    return (
+      <div >
+        { (volumes.length !== 0) && (
+          <div className={styles.Wrapper}>
+            <Picker onClick={this.toggleTfEditor} className={(showTfEditor ? styles.Active : '')}>
+              <div className={styles.FlexColumn}>
+                <TfIcon className={styles.iconImage} />
+                <SmallLabel>Tf-Editor</SmallLabel>
+              </div>
+            </Picker>
+            <div>
+              { showTfEditor && (
+                <div>
+                  <Window size={{ width: 1200, height: 700 }} closeCallback={this.toggleTfEditor} title={'Transfer Function Editor'} className={styles.Window}>
+                    <div className={styles.Canvas}>
+                      <div className={styles.FlexContainer}>
+                        <EditorContainer
+                          height={editorSize.height}
+                          width={editorSize.width}
+                          activeVolume={volumes.find(obj => obj.id === currentVolume.name).data}
+                          URI={URI}
+                        />
+                        <div className={styles.FlexColumn}>
+                          <ColorPicker
+                            className={styles.ColorPicker}
+                            onColorChange={color => this.setState({ color })}
+                          />
+                          <div className={styles.FlexColumn}>
+                            <Button className={styles.Button} onClick={() => this.props.AddEnvelope(defaultEnvelopePoints, URI)} children={' Add Envelope'} />
+                            <Button className={styles.Button} onClick={() => this.props.DeleteEnvelope(URI)} children={' Delete Envelope'} />
+                            <Button className={styles.Button} onClick={() => this.props.AddPoint(color, URI)} children={' Add Point'} />
+
+                            <Select
+                              onChange={this.handleVolumeChange}
+                              label={'Select Volume'}
+                              value={this.state.currentVolume}
+                              options={this.props.volumes
+                                .map(volume => ({ value: volume.name, label: volume.name }))}
+                            />
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </Window>
+                </div>
+              )}
+            </div>
+          </div>
+        )}
+      </div>
+    );
+  }
+}
+TfEditor.propTypes = {
+  AddEnvelope: PropTypes.func.isRequired,
+  AddPoint: PropTypes.func.isRequired,
+  DeleteEnvelope: PropTypes.func.isRequired,
+  ClearEnvelopes: PropTypes.func.isRequired,
+};
+
+const mapStateToProps = (state) => {
+  const sceneType = 'Scene';
+  const TfTag = 'TF';
+  let volumes = [];
+  if (Object.keys(state.propertyTree).length !== 0) {
+    let nodes = [];
+    const rootNodes = state.propertyTree.subowners.filter(element => element.name === sceneType);
+    rootNodes.forEach((node) => {
+      nodes = [...nodes, ...node.subowners];
+    });
+    volumes = findAllNodesWithTag(nodes, TfTag);
+  }
+  return {
+    volumes,
+  };
+};
+
+const mapDispatchToProps = dispatch => ({
+  AddEnvelope: (envelope, URI) => {
+    dispatch(addEnvelope(envelope, URI));
+  },
+  AddPoint: (color, URI) => {
+    dispatch(addPoint(color, URI));
+  },
+  DeleteEnvelope: (URI) => {
+    dispatch(deleteEnvelope(URI));
+  },
+  ClearEnvelopes: (URI) => {
+    dispatch(clearEnvelopes(URI));
+  },
+  ChangeColor: (color, URI) => {
+    dispatch(changeColor(color, URI));
+  },
+  StartListening: (URI) => {
+    dispatch(startListening(URI));
+  },
+  StopListening: (URI) => {
+    dispatch(stopListening(URI));
+  },
+});
+
+TfEditor = connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(TfEditor);
+
+export default TfEditor;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/images/tf.svg b/modules/webgui/web/src/components/BottomBar/TfEditor/images/tf.svg
new file mode 100644
index 0000000000..792f0cb933
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/images/tf.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<polygon class="st0" points="46.9,16.3 23.8,51.9 17.6,47.2 40.7,11.6 "/>
+<path class="st0" d="M25,54.4c0,4.6-3.7,8.2-8.2,8.2s-8.2-3.7-8.2-8.2s3.7-8.2,8.2-8.2c2.2,0,4.3,0.9,5.8,2.3
+	C24.1,50,25,52.1,25,54.4z M20.2,50.8c-0.9-0.9-2.1-1.4-3.5-1.4c-2.7,0-4.9,2.2-4.9,4.9c0,2.7,2.2,4.9,4.9,4.9
+	c2.7,0,4.9-2.2,4.9-4.9C21.7,53,21.1,51.7,20.2,50.8z"/>
+<rect x="-0.1" y="50.9" class="st0" width="11.2" height="7.8"/>
+<path class="st0" d="M55.3,9.3c0,4.6-3.7,8.2-8.2,8.2s-8.2-3.7-8.2-8.2S42.5,1,47.1,1c2.2,0,4.3,0.9,5.8,2.3
+	C54.3,4.9,55.3,7,55.3,9.3z M50.5,5.7c-0.9-0.9-2.1-1.4-3.5-1.4c-2.7,0-4.9,2.2-4.9,4.9s2.2,4.9,4.9,4.9c2.7,0,4.9-2.2,4.9-4.9
+	C52,7.9,51.4,6.6,50.5,5.7z"/>
+<rect x="52.7" y="5.4" class="st0" width="11.3" height="7.7"/>
+</svg>
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/EditorContainer.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/EditorContainer.jsx
new file mode 100644
index 0000000000..b1b2232c1e
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/EditorContainer.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import styles from '../style/EditorCanvas.scss';
+import Histogram from '../containers/Histogram';
+import Envelope from '../containers/Envelope';
+
+const EditorContainer = ({
+  height,
+  width,
+  activeVolume,
+  URI,
+}) => (
+  <div className={styles.EditorContainer}>
+    <div className={styles.EnvelopeContainer}>
+      <Envelope
+        height={height}
+        width={width}
+        activeVolume={activeVolume}
+        URI={URI}
+      />
+    </div>
+    <div className={styles.HistogramContainer}>
+      <Histogram height={height} width={width} activeVolume={activeVolume} />
+    </div>
+  </div>
+);
+
+export default EditorContainer;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/EnvelopeCanvas.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/EnvelopeCanvas.jsx
new file mode 100644
index 0000000000..65538ca767
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/EnvelopeCanvas.jsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import styles from '../style/Envelope.scss';
+import GraphBody from '../../../common/Graph/GraphBody';
+import PointPosition from './PointPosition';
+import Point from './Point';
+
+const pointsForEnvelopeGraph = (data, height) => {
+  const convertedData = [];
+  data.forEach((point) => {
+    const tmpObject = Object.assign({},
+      { x: point.position.x,
+        y: height - point.position.y,
+        color: point.color },
+    );
+    convertedData.push(tmpObject);
+  });
+  return convertedData;
+};
+
+const EnvelopeCanvas = ({
+  handleClick,
+  handleDrag,
+  height,
+  width,
+  envelopes,
+  pointPositions,
+  minValue,
+  maxValue,
+}) => (
+  <div>
+    {(envelopes.length !== 0) && (
+      <div>
+        <PointPosition
+          className={styles.Line}
+          points={pointPositions}
+          width={width}
+          height={height}
+          envelopes={envelopes}
+          minValue={minValue}
+          maxValue={maxValue}
+        />
+        {envelopes.map(envelope =>
+          (<div key={envelope.id}>
+            <svg className={styles.Line} height={height} width={width}>
+              <GraphBody
+                UseLinearGradient
+                points={pointsForEnvelopeGraph(envelope.points, height)}
+                x={0}
+                y={600}
+                width={width}
+                fillOpacity={'0'}
+                strokeWidth={2}
+              />
+            </svg>
+            {envelope.points.map((point, index) =>
+              (<Point
+                className={styles.Envelope}
+                key={point.id}
+                handleClick={() => handleClick(envelope, point.id)}
+                handleDrag={(e, ui) => handleDrag(e, ui, index, envelope)}
+                height={height}
+                width={width}
+                {...point}
+                bounds={(index === 0) ? { x1: 0, x2: envelope.points[1].position.x } :
+                  (index === envelope.points.length - 1) ? { x1: envelope.points[envelope.points.length - 2].position.x, x2: width } :
+                    { x1: envelope.points[0].position.x, x2: envelope.points[envelope.points.length - 1].position.x }}
+                active={!!((point.active || envelope.active))}
+              />),
+            )}
+          </div>),
+        )}
+      </div>
+    )}
+  </div>
+);
+/* EnvelopeCanvas.propTypes = {
+  HandleDrag: PropTypes.func.isRequired,
+  handleClick: PropTypes.func.isRequired,
+  points: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.number.isRequired,
+      position: PropTypes.shape({
+              x: PropTypes.number.isRequired,
+              y: PropTypes.number.isRequired,
+            }).isRequired,
+      anchor: PropTypes.bool.isRequired,
+      color: PropTypes.string.isRequired,
+    }).isRequired,
+  ).isRequired,
+  height: PropTypes.number.isRequired,
+  width: PropTypes.number.isRequired,
+  active: PropTypes.bool.isRequired,
+} */
+export default EnvelopeCanvas;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/HistogramCanvas.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/HistogramCanvas.jsx
new file mode 100644
index 0000000000..e180a09ef9
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/HistogramCanvas.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import GraphBody from '../../../common/Graph/GraphBody';
+
+
+const HistogramCanvas = ({
+  histogram,
+  height,
+  width,
+  unit,
+  minValue,
+  maxValue,
+}) => (
+  <div>
+    <svg width={width} height={height}>
+      <GraphBody
+        UseLinearGradient={false}
+        color={'blue'}
+        points={histogram}
+        x={0}
+        y={600}
+        fill={'blue'}
+        fillOpacity={'.5'}
+        strokeWidth={1}
+      />
+      <text x={width - 40} y={height - 10} fontFamily={'Verdana'} fontSize={10} fill={'white'}>
+        {unit}
+      </text>
+    </svg>
+  </div>
+);
+HistogramCanvas.PropTypes = {
+  histogram: PropTypes.arrayOf(
+    PropTypes.shape({
+      x: PropTypes.number.isRequired,
+      y: PropTypes.number.isRequired,
+    }),
+  ).isRequired,
+};
+export default HistogramCanvas;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/Point.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/Point.jsx
new file mode 100644
index 0000000000..b75380d6a3
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/Point.jsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import DraggableCore from 'react-draggable';
+import styles from '../style/Point.scss';
+
+const Point = ({
+  handleClick,
+  handleDrag,
+  height,
+  width,
+  color,
+  active,
+  anchor,
+  bounds,
+  position,
+}) => (
+  <div>
+    <DraggableCore
+      defaultPosition={{ x: position.x - 10, y: position.y - 10 }}
+      onDrag={handleDrag}
+      axis={anchor ? 'x' : 'both'}
+      bounds={{ top: -10, left: bounds.x1 - 10, right: bounds.x2 - 10, bottom: height - 10 }}
+    >
+      <svg
+        className={active ? styles.Active : styles.Point}
+        width={20}
+        height={20}
+        onDrag={handleDrag}
+        onClick={handleClick}
+      >
+        <circle cx={10} cy={10} r={active ? 8 : 10} fill={color} />
+      </svg>
+    </DraggableCore>
+  </div>
+);
+Point.propTypes = {
+  handleDrag: PropTypes.func.isRequired,
+  handleClick: PropTypes.func.isRequired,
+  position: PropTypes.shape({
+    x: PropTypes.number.isRequired,
+    y: PropTypes.number.isRequired,
+  }).isRequired,
+  anchor: PropTypes.bool.isRequired,
+  color: PropTypes.string.isRequired,
+  active: PropTypes.bool.isRequired,
+  height: PropTypes.number.isRequired,
+  width: PropTypes.number.isRequired,
+};
+
+export default Point;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/PointPosition.jsx b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/PointPosition.jsx
new file mode 100644
index 0000000000..3fc567368b
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/presentational/PointPosition.jsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import styles from '../style/Envelope.scss';
+
+const normalizeBetweenValues = (value, min, max, width) => (min + (max - min) * (value / width));
+
+const PointPosition = ({
+  points,
+  width,
+  height,
+  value,
+  minValue,
+  maxValue,
+}) => (
+  <div >
+    {(points !== undefined) && (
+      points.map((point, index) =>
+        (<div className={styles.Line} key={index}>
+          <svg width={width + 100} height={height + 100}>
+            <line {...point} strokeDasharray={5, 5} stroke={'white'} strokeWidth={2} />
+            <text x={point.x1 - 10} y={point.y2 + 30} fontFamily={'Verdana'} fontSize={10} fill={'white'}>
+              {normalizeBetweenValues(point.x1, minValue, maxValue, width)
+                .toPrecision(5)
+                .toString()}
+            </text>
+          </svg>
+        </div>),
+      ))}
+  </div>
+);
+export default PointPosition;
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/style/EditorCanvas.scss b/modules/webgui/web/src/components/BottomBar/TfEditor/style/EditorCanvas.scss
new file mode 100644
index 0000000000..67657939a2
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/style/EditorCanvas.scss
@@ -0,0 +1,7 @@
+.EditorContainer {
+  width: 800px;
+  height: 600px;
+  border-style: solid;
+  border-width: 1px;
+  border-color: white;
+}
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/style/Envelope.scss b/modules/webgui/web/src/components/BottomBar/TfEditor/style/Envelope.scss
new file mode 100644
index 0000000000..6d51155df6
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/style/Envelope.scss
@@ -0,0 +1,9 @@
+.Envelope{
+  width: 0px;
+  height: 0px;
+  z-index: 9;
+}
+.Line{
+  position: absolute;
+  z-index: -1;
+}
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/style/Histogram.scss b/modules/webgui/web/src/components/BottomBar/TfEditor/style/Histogram.scss
new file mode 100644
index 0000000000..f1cf920ba2
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/style/Histogram.scss
@@ -0,0 +1,10 @@
+.Envelope{
+  width: 0px;
+  height: 0px;
+  z-index: -9;
+}
+.Line{
+  position: absolute;
+  left: 0;
+  top: 0;
+}
\ No newline at end of file
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/style/Point.scss b/modules/webgui/web/src/components/BottomBar/TfEditor/style/Point.scss
new file mode 100644
index 0000000000..c6906c3a68
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/style/Point.scss
@@ -0,0 +1,8 @@
+.Point {
+  position: absolute;
+}
+.Active {
+  position: absolute;
+  stroke:#000;
+  stroke-width:4px;
+}
diff --git a/modules/webgui/web/src/components/BottomBar/TfEditor/style/TfEditor.scss b/modules/webgui/web/src/components/BottomBar/TfEditor/style/TfEditor.scss
new file mode 100644
index 0000000000..7f17af901b
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TfEditor/style/TfEditor.scss
@@ -0,0 +1,82 @@
+@import "../../../../styles/all";
+
+.Editor {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  padding: $button-padding;
+  text-shadow: 0 1px 10px rgba(#000, 0.5);
+
+  &:hover,
+  &:focus {
+    background: $ui-background-hover;
+    outline: none;
+    text-shadow: none;
+  }
+
+  &.Active {
+    background: $ui-background;
+  }
+}
+
+.Title {
+  display: flex;
+  flex-direction: column;
+}
+
+.Name {
+  font-size: 1.2rem;
+  height: 21px;
+  line-height: 1;
+}
+
+.Wrapper {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.Window {
+  max-width: none !important;
+  bottom: unquote("calc(100% + #{$popover-arrow-size})");
+  left: 50%;
+  position: absolute;
+  transform: translateX(-50%);
+  z-index: 10;
+}
+
+.Canvas {
+  left: 0;
+  top: 0;
+}
+
+.ColorPicker {
+  height: 230px;
+}
+
+.FlexContainer {
+  height: 700;
+  width: 1200;
+  margin-top: 20px;
+  margin-left: 20px;
+  display: flex;
+  flex-flow: row wrap;
+}
+
+.FlexColumn {
+  margin-left: 20px;
+  display: flex;
+  flex-flow: column wrap;
+}
+
+.ButtonContainer {
+  margin-left: 20px;
+  height: 230px;
+  display: flex;
+  flex-flow: column wrap;
+}
+
+.iconImage {
+  height: 20px;
+  margin-right: ($base-padding / 2);
+}
\ No newline at end of file
diff --git a/modules/webgui/web/src/components/BottomBar/TimePicker.jsx b/modules/webgui/web/src/components/BottomBar/TimePicker.jsx
new file mode 100644
index 0000000000..2086731b14
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TimePicker.jsx
@@ -0,0 +1,148 @@
+import React, { Component } from 'react';
+import DataManager, { TopicTypes } from '../../api/DataManager';
+import LoadingString from '../common/LoadingString/LoadingString';
+import Popover from '../common/Popover/Popover';
+import SmallLabel from '../common/SmallLabel/SmallLabel';
+import Button from '../common/Input/Button/Button';
+import Calendar from '../common/Calendar/Calendar';
+import Picker from './Picker';
+import Time from '../common/Input/Time/Time';
+import { TogglePauseScript, CurrenTimeKey, ValuePlaceholder, SetDeltaTimeScript } from '../../api/keys';
+import SimulationIncrement from './SimulationIncrement';
+import styles from './TimePicker.scss';
+
+/**
+ * Make sure the date string contains a time zone
+ * @param date
+ * @param zone - the time zone in ISO 8601 format
+ * @constructor
+ */
+const DateStringWithTimeZone = (date, zone = 'Z') =>
+  (!date.includes('Z') ? `${date}${zone}` : date);
+
+class TimePicker extends Component {
+  static togglePause() {
+    DataManager.runScript(TogglePauseScript);
+  }
+
+  static realtime() {
+    const script = SetDeltaTimeScript.replace(ValuePlaceholder, 1);
+    DataManager.runScript(script);
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      time: new Date(),
+      hasTime: false,
+      showPopover: false,
+      subscriptionId: -1,
+    };
+
+    this.subscriptionCallback = this.subscriptionCallback.bind(this);
+    this.togglePopover = this.togglePopover.bind(this);
+    this.now = this.now.bind(this);
+    this.setDate = this.setDate.bind(this);
+  }
+
+  componentDidMount() {
+    // subscribe to data
+    this.state.subscriptionId = DataManager
+      .subscribe(CurrenTimeKey, this.subscriptionCallback, TopicTypes.time);
+  }
+
+  componentWillUnmount() {
+    DataManager.unsubscribe(CurrenTimeKey, subscriptionId);
+  }
+
+  get time() {
+    return this.state.time.toUTCString();
+  }
+
+  get popover() {
+    const { time } = this.state;
+    return (
+      <Popover
+        className={Picker.Popover}
+        title="Select date"
+        closeCallback={this.togglePopover}
+        detachable
+      >
+        <Calendar selected={time} activeMonth={time} onChange={this.setDate} todayButton />
+        <hr className={Popover.styles.delimiter} />
+        <div className={Popover.styles.title}>Select local time</div>
+        <div className={Popover.styles.content}>
+          <Time time={time} onChange={this.setDate} />
+        </div>
+        <hr className={Popover.styles.delimiter} />
+
+        <div className={Popover.styles.title}>Simulation speed</div>
+        <div className={Popover.styles.content}>
+          <SimulationIncrement />
+        </div>
+        <hr className={Popover.styles.delimiter} />
+
+        <div className={`${Popover.styles.row} ${Popover.styles.content}`}>
+          <Button block smalltext onClick={TimePicker.togglePause}>
+            Pause
+          </Button>
+          <Button block smalltext onClick={TimePicker.realtime}>
+            Realtime
+          </Button>
+          <Button block smalltext onClick={this.now}>
+            Now
+          </Button>
+        </div>
+      </Popover>
+    );
+  }
+
+  setDate(time) {
+    this.setState({ time });
+    // Spice, that is handling the time parsing in OpenSpace does not support
+    // ISO 8601-style time zones (the Z). It does, however, always assume that UTC
+    // is given.
+    const fixedTimeString = time.toJSON().replace('Z', '');
+    DataManager.setValue('__time', fixedTimeString);
+  }
+
+  togglePopover() {
+    this.setState({ showPopover: !this.state.showPopover });
+  }
+
+  now() {
+    this.setDate(new Date());
+  }
+
+  /**
+   * Callback for subscription
+   * @param message [object] - message object sent from Subscription
+   */
+  subscriptionCallback(message) {
+    const time = new Date(DateStringWithTimeZone(message.time));
+    this.setState({ time, hasTime: true });
+  }
+
+  render() {
+    const { showPopover } = this.state;
+    return (
+      <div className={Picker.Wrapper}>
+        <Picker onClick={this.togglePopover} className={`${styles.timePicker} ${showPopover ? Picker.Active : ''}`}>
+          <div className={Picker.Title}>
+            <span className={Picker.Name}>
+              <LoadingString loading={!this.state.hasTime}>
+                { this.time }
+              </LoadingString>
+            </span>
+            <SmallLabel>Date</SmallLabel>
+          </div>
+        </Picker>
+
+        { showPopover && this.popover }
+      </div>
+    );
+  }
+}
+
+export default TimePicker;
diff --git a/modules/webgui/web/src/components/BottomBar/TimePicker.scss b/modules/webgui/web/src/components/BottomBar/TimePicker.scss
new file mode 100644
index 0000000000..62bc0ed43d
--- /dev/null
+++ b/modules/webgui/web/src/components/BottomBar/TimePicker.scss
@@ -0,0 +1,4 @@
+.timePicker {
+  min-width: 280px;
+  width: 100%;
+}
diff --git a/modules/webgui/web/src/components/Sidebar/Pane.jsx b/modules/webgui/web/src/components/Sidebar/Pane.jsx
new file mode 100644
index 0000000000..136d47b00b
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Pane.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Icon from '../common/Icon/Icon';
+
+import styles from './Pane.scss';
+
+const Pane = ({ children, title, closeCallback }) => (
+  <section className={styles.Pane}>
+    <header>
+      <div className={styles.title}>
+        { title }
+      </div>
+
+      { closeCallback && (
+        <button onClick={closeCallback(false)} className={styles.close}>
+          <Icon icon="close" className="small" />
+        </button>
+      ) }
+    </header>
+    <div className={styles.content}>
+      { children }
+    </div>
+  </section>
+);
+
+Pane.propTypes = {
+  children: PropTypes.node,
+  closeCallback: PropTypes.func,
+  title: PropTypes.node,
+};
+
+Pane.defaultProps = {
+  children: [],
+  closeCallback: null,
+  title: null,
+};
+
+Pane.styles = styles;
+
+export default Pane;
diff --git a/modules/webgui/web/src/components/Sidebar/Pane.scss b/modules/webgui/web/src/components/Sidebar/Pane.scss
new file mode 100644
index 0000000000..4168eb31ac
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Pane.scss
@@ -0,0 +1,69 @@
+@import '../../styles/all';
+
+$font-size: 1rem;
+$icon-size: 18px;
+$header-height: 35px;
+$border-width: 1px;
+
+.Pane {
+  animation: $appear-animation;
+  background: $ui-background;
+  border-bottom: $border-width solid $ui-divider;
+  flex-basis: 1px;
+  flex-grow: 1;
+  height: unquote("calc(100% - #{$sidebar-tab-height + $border-width})");
+}
+
+.Pane > header {
+  align-items: center;
+  border-bottom: $border-width solid $ui-divider;
+  display: flex;
+  font-size: $font-size;
+  justify-content: space-between;
+  height: $header-height;
+  line-height: 1;
+
+  > * {
+    padding: 0 $sidebar-padding;
+  }
+}
+
+.content {
+  height: unquote("calc(100% - #{$header-height + $border-width})");
+
+  :global(.scroll-content) {
+    &::-webkit-scrollbar {
+      background-color: rgba(145, 145, 145, 0.32);
+    }
+
+    &:before,
+    &:after {
+      display: none;
+    }
+  }
+}
+
+.title {
+  font-weight: bold;
+  letter-spacing: 0.2em;
+  text-transform: uppercase;
+}
+
+.close {
+  background: none;
+  border: 0;
+  color: $text-color-blur;
+
+  &:hover, &:focus {
+    background: $ui-background-hover;
+    color: $text-color-focus;
+  }
+
+  i {
+    font-size: $icon-size !important;
+  }
+}
+
+.loading {
+  padding: $sidebar-padding;
+}
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/BoolProperty.jsx b/modules/webgui/web/src/components/Sidebar/Properties/BoolProperty.jsx
new file mode 100644
index 0000000000..52c1dc6373
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/BoolProperty.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import Property from './Property';
+import Checkbox from '../../common/Input/Checkbox/Checkbox';
+import { connectProperty } from './connectProperty';
+
+class BoolProperty extends Property {
+  constructor(props) {
+    super(props);
+    this.onChange = this.onChange.bind(this);
+  }
+
+  onChange(value) {
+    // convert to Lua compatible value
+    this.props.ChangeValue(value ? '1' : '0');
+  }
+
+  componentDidMount() {
+    this.props.StartListening(this.props.Description.Identifier);
+  }
+
+  componentWillUnmount() {
+    this.props.StopListening(this.props.Description.Identifier);
+  }
+
+  render() {
+    const { Description, Value } = this.props;
+    return (
+      <Checkbox
+        checked={Value === 'true'}
+        label={(<span>{Description.Name} {this.descriptionPopup}</span>)}
+        onChange={this.onChange}
+        disabled={this.disabled}
+      />
+    );
+  }
+}
+
+BoolProperty = connectProperty(BoolProperty);
+export default BoolProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/MatrixProperty.jsx b/modules/webgui/web/src/components/Sidebar/Properties/MatrixProperty.jsx
new file mode 100644
index 0000000000..d33d5c3611
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/MatrixProperty.jsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import Property from './Property';
+import NumericInput from '../../common/Input/NumericInput/NumericInput';
+import Row from '../../common/Row/Row';
+import styles from './Property.scss';
+import { connectProperty } from './connectProperty';
+
+class MatrixProperty extends Property {
+  constructor(props) {
+    super(props);
+    this.onChange = this.onChange.bind(this);
+  }
+
+  static jsonToLua(json) {
+    return json.replace('[', '').replace(']', '');
+  }
+
+  componentDidMount() {
+    this.props.StartListening(this.props.Description.Identifier);
+  }
+
+  componentWillUnmount() {
+    this.props.StopListening(this.props.Description.Identifier);
+  }
+
+  onChange(index) {
+    return (event) => {
+      const stateValue = JSON.parse(`[${this.props.Value}]`);
+      const { value } = event.currentTarget;
+      stateValue[index] = parseFloat(value);
+
+      this.props.ChangeValue(JSON.stringify(stateValue));
+    };
+  }
+
+  render() {
+    const { Description, Value } = this.props;
+    const { SteppingValue, MaximumValue, MinimumValue } = Description.AdditionalData;
+    const firstLabel = (<span>
+      { Description.Name } { this.descriptionPopup }
+    </span>);
+
+    // Convert the flat array into a 2D N*N array representing the matrix. Add '[' and ']' to
+    // compensate for formatting from the server.
+    const values = JSON.parse(`[${Value}]`)
+      .map((value, index) => ({
+        key: `${Description.Name}-${index}`,
+        value: parseFloat(value),
+        index,
+      }));
+    // Find N
+    const matrixSize = Math.sqrt(values.length);
+    // actually convert into N arrays of N length
+    const groups = Array.from(new Array(matrixSize), () => values.splice(0, matrixSize));
+
+    // eslint-disable react/no-array-index-key
+    return (
+      <div className={styles.matrixProperty}>
+        { groups.map((group, index) => (
+          <Row key={`row-${index}`}>
+            { group.map(comp => (
+              <NumericInput
+                key={comp.key}
+                value={comp.value}
+                label={comp.index === 0 ? firstLabel : ' '}
+                placeholder={`Value ${comp.index}`}
+                onChange={this.onChange(comp.index)}
+                step={SteppingValue[comp.index] || 0.01}
+                max={MaximumValue[comp.index] || 100}
+                min={MinimumValue[comp.index] || -100}
+                disabled={this.disabled}
+                noTooltip
+              />
+            ))}
+          </Row>
+        ))}
+      </div>
+    );
+  }
+}
+
+MatrixProperty = connectProperty(MatrixProperty);
+export default MatrixProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/NumericProperty.jsx b/modules/webgui/web/src/components/Sidebar/Properties/NumericProperty.jsx
new file mode 100644
index 0000000000..e0e1bb88d3
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/NumericProperty.jsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import Property from './Property';
+import NumericInput from '../../common/Input/NumericInput/NumericInput';
+import InfoBox from '../../common/InfoBox/InfoBox';
+import { connectProperty } from './connectProperty';
+
+class NumericProperty extends Property {
+  constructor(props) {
+    super(props);
+    this.onChange = this.onChange.bind(this);
+  }
+
+  componentDidMount() {
+    this.props.StartListening(this.props.Description.Identifier)
+  }
+
+  componentWillUnmount() {
+    this.props.StopListening(this.props.Description.Identifier)
+  }
+
+  onChange(event) {
+    const { value } = event.currentTarget;
+    this.props.ChangeValue(value);
+  }
+
+  get descriptionPopup() {
+    let { Description } = this.props;
+    const { MaximumValue, MinimumValue } = Description.AdditionalData;
+    const description = `${Description.description}\nMin: ${MinimumValue}, max: ${MaximumValue}`;
+    return description ? (<InfoBox text={description} />) : '';
+  }
+
+  render() {
+    const { Description, Value } = this.props;
+    const { SteppingValue, MaximumValue, MinimumValue } = Description.AdditionalData;
+    return (
+      <NumericInput
+        value={Value}
+        label={(<span>{Description.Name} {this.descriptionPopup}</span>)}
+        placeholder={Description.Name}
+        onChange={this.onChange}
+        step={SteppingValue}
+        max={MaximumValue}
+        min={MinimumValue}
+        disabled={this.disabled}
+      />
+    );
+  }
+}
+
+NumericProperty = connectProperty(NumericProperty)
+export default NumericProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/OptionProperty.jsx b/modules/webgui/web/src/components/Sidebar/Properties/OptionProperty.jsx
new file mode 100644
index 0000000000..cf50f3beb7
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/OptionProperty.jsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import Property from './Property';
+import Select from '../../common/Input/Select/Select';
+import { connectProperty } from './connectProperty';
+
+class OptionProperty extends Property {
+  constructor(props) {
+    super(props);
+    this.onChange = this.onChange.bind(this);
+  }
+
+  onChange({ value }) {
+    this.props.ChangeValue(value);
+  }
+
+  componentDidMount() {
+    this.props.StartListening(this.props.Description.Identifier)
+  }
+
+  componentWillUnmount() {
+    this.props.StopListening(this.props.Description.Identifier)
+  }
+
+  render() {
+    const { Description, Value } = this.props;
+    const label = (
+      <span>
+        { Description.Name } { this.descriptionPopup }
+      </span>
+    );
+    const options = Description.AdditionalData.Options
+      .map(option => ({ label: Object.values(option)[0], value: Object.keys(option)[0] }));
+    return (
+      <Select
+        label={label}
+        options={options}
+        value={Value}
+        onChange={this.onChange}
+        disabled={this.disabled}
+      />
+    );
+  }
+}
+OptionProperty = connectProperty(OptionProperty);
+
+export default OptionProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/Property.jsx b/modules/webgui/web/src/components/Sidebar/Properties/Property.jsx
new file mode 100644
index 0000000000..daf185199a
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/Property.jsx
@@ -0,0 +1,69 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import Input from '../../common/Input/Input/Input';
+import DataManager from '../../../api/DataManager';
+import InfoBox from '../../common/InfoBox/InfoBox';
+
+class Property extends Component {
+  constructor(props) {
+    super(props);
+  }
+
+  get uri() {
+    const { Identifier } = this.props.Description;
+    return Identifier;
+  }
+
+  get inputType() {
+    const { Description } = this.props;
+    switch (Description.Type) {
+      case 'StringProperty':
+      default:
+        return Input;
+    }
+  }
+
+  get descriptionPopup() {
+    const { description } = this.props.Description;
+    return description ? (<InfoBox text={description} />) : '';
+  }
+
+  get disabled() {
+    return this.props.Description.MetaData.isReadOnly;
+  }
+
+  render() {
+    const { Description, Value } = this.props;
+    const PropInput = this.inputType;
+    const placeholder = (<span>
+      { Description.Name } { this.descriptionPopup }
+    </span>);
+    return (
+      <PropInput
+        value={Value}
+        label={placeholder}
+        placeholder={Description.Name}
+        onChange={this.onChange}
+        disabled={this.disabled}
+      />
+    );
+  }
+}
+
+Property.propTypes = {
+  Description: PropTypes.shape({
+    Identifier: PropTypes.string,
+    Name: PropTypes.string,
+    MetaData: PropTypes.shape({
+      isReadOnly: PropTypes.bool,
+    }),
+    description: PropTypes.string,
+  }).isRequired,
+  subscribe: PropTypes.bool,
+  Value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+};
+
+Property.defaultProps = {
+  subscribe: false,
+};
+export default Property;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/Property.scss b/modules/webgui/web/src/components/Sidebar/Properties/Property.scss
new file mode 100644
index 0000000000..c8547d6e51
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/Property.scss
@@ -0,0 +1,10 @@
+@import "../../../styles/all";
+
+.matrixProperty,
+.vectorProperty {
+  margin-bottom: 3px;
+
+  &:hover label {
+    color: $green;
+  }
+}
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/PropertyOwner.jsx b/modules/webgui/web/src/components/Sidebar/Properties/PropertyOwner.jsx
new file mode 100644
index 0000000000..a9b591dcda
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/PropertyOwner.jsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ToggleContent from '../../common/ToggleContent/ToggleContent';
+import Property from './Property';
+import BoolProperty from './BoolProperty';
+import NumericProperty from './NumericProperty';
+import OptionProperty from './OptionProperty';
+import TriggerProperty from './TriggerProperty';
+import VecProperty from './VectorProperty';
+import MatrixProperty from './MatrixProperty';
+
+const types = {
+  BoolProperty,
+  OptionProperty,
+  TriggerProperty,
+  StringProperty: Property,
+  NumericProperty,
+  FloatProperty: NumericProperty,
+  IntProperty: NumericProperty,
+  Vec2Property: VecProperty,
+  Vec3Property: VecProperty,
+  Vec4Property: VecProperty,
+  MatrixProperty,
+  DMat4Property: MatrixProperty,
+  defaultProperty: Property,
+};
+
+const PropertyOwner = ({ identifier, properties, subowners }) => (
+  <ToggleContent title={identifier}>
+    { subowners.map(subowner => (
+      <PropertyOwner {...subowner} key={subowner.identifier} />
+    )) }
+    { properties.map((prop) => {
+      const { Description } = prop;
+      const Type = types[Description.Type] || types.defaultProperty;
+      return (
+        <Type key={Description.Identifier} {...prop} subscribe />
+      );
+    }) }
+  </ToggleContent>
+);
+
+PropertyOwner.propTypes = {
+  identifier: PropTypes.string.isRequired,
+  properties: PropTypes.arrayOf(PropTypes.object),
+  subowners: PropTypes.arrayOf(PropTypes.shape({
+    identifier: PropTypes.string,
+    subowners: PropTypes.array,
+    properties: PropTypes.array,
+  })),
+};
+
+PropertyOwner.defaultProps = {
+  properties: [],
+  subowners: [],
+};
+
+export default PropertyOwner;
+export const Types = types;
+export const GetType = type => types[type] || types.defaultProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/TriggerProperty.jsx b/modules/webgui/web/src/components/Sidebar/Properties/TriggerProperty.jsx
new file mode 100644
index 0000000000..a99261df50
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/TriggerProperty.jsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import Property from './Property';
+import Button from '../../common/Input/Button/Button';
+import { connectProperty } from './connectProperty';
+
+class TriggerProperty extends Property {
+  constructor(props) {
+    super(props);
+    this.onChange = this.onChange.bind(this);
+  }
+
+  onChange() {
+    this.props.ChangeValue('', this.props.Description.Identifier);
+  }
+
+  render() {
+    const { Name } = this.props.Description;
+    return (
+      <div>
+        <Button onClick={this.onChange}>
+          { Name }
+        </Button> { this.descriptionPopup }
+      </div>
+    );
+  }
+}
+
+TriggerProperty = connectProperty(TriggerProperty);
+
+export default TriggerProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/VectorProperty.jsx b/modules/webgui/web/src/components/Sidebar/Properties/VectorProperty.jsx
new file mode 100644
index 0000000000..03596bde78
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/VectorProperty.jsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import Property from './Property';
+import NumericInput from '../../common/Input/NumericInput/NumericInput';
+import Row from '../../common/Row/Row';
+import styles from './Property.scss';
+import { connectProperty } from './connectProperty';
+
+class VectorProperty extends Property {
+  static jsonToLua(json) {
+    return json.replace('[', '').replace(']', '');
+  }
+
+  componentDidMount() {
+    this.props.StartListening(this.props.Description.Identifier)
+  }
+
+  componentWillUnmount() {
+    this.props.StopListening(this.props.Description.Identifier)
+  }
+
+  onChange(index) {
+    return (event) => {
+      const stateValue = JSON.parse(this.props.Value);
+      const { value } = event.currentTarget;
+
+      stateValue[index] = parseFloat(value);
+      this.props.ChangeValue( JSON.stringify(stateValue));
+    };
+  }
+
+  render() {
+    const { Description } = this.props;
+    const { SteppingValue, MaximumValue, MinimumValue } = Description.AdditionalData;
+    const firstLabel = (<span>
+      { Description.Name } { this.descriptionPopup }
+    </span>);
+
+    // eslint-disable-next-line react/no-array-index-key
+    const values = JSON.parse(this.props.Value)
+      .map((value, index) => ({ key: `${Description.Name}-${index}`, value }));
+
+    return (
+      <Row className={styles.vectorProperty}>
+        { values.map((component, index) => (
+          <NumericInput
+            key={component.key}
+            value={component.value}
+            label={index === 0 ? firstLabel : ' '}
+            placeholder={`Value ${index}`}
+            onChange={this.onChange(index)}
+            step={SteppingValue[index]}
+            max={MaximumValue[index]}
+            min={MinimumValue[index]}
+            disabled={this.disabled}
+          />
+        ))}
+      </Row>
+    );
+  }
+}
+VectorProperty = connectProperty(VectorProperty);
+
+export default VectorProperty;
diff --git a/modules/webgui/web/src/components/Sidebar/Properties/connectProperty.js b/modules/webgui/web/src/components/Sidebar/Properties/connectProperty.js
new file mode 100644
index 0000000000..2db8fbf753
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Properties/connectProperty.js
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+import { startListening, stopListening, changePropertyValue } from '../../../api/Actions';
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+  StartListening: (URI) => {
+    dispatch(startListening(URI));
+  },
+  StopListening: (URI) => {
+    dispatch(stopListening(URI));
+  },
+  ChangeValue: (Value) => {
+    dispatch(changePropertyValue(ownProps.Description, Value));
+  },
+});
+export const connectProperty = Property => connect(null, mapDispatchToProps)(Property);
diff --git a/modules/webgui/web/src/components/Sidebar/SceneGraphNode.jsx b/modules/webgui/web/src/components/Sidebar/SceneGraphNode.jsx
new file mode 100644
index 0000000000..105e851a86
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/SceneGraphNode.jsx
@@ -0,0 +1,56 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import PropertyOwner from './Properties/PropertyOwner';
+import ToggleContent from '../common/ToggleContent/ToggleContent';
+import Button from '../common/Input/Button/Button';
+import Icon from '../common/Icon/Icon';
+import DataManager from '../../api/DataManager';
+import { OriginKey } from '../../api/keys';
+
+class SceneGraphNode extends Component {
+  constructor(props) {
+    super(props);
+
+    this.focusOnThis = this.focusOnThis.bind(this);
+  }
+
+  focusOnThis() {
+    const { identifier } = this.props;
+    DataManager.setValue(OriginKey, '"' + identifier + '"');
+  }
+
+  render() {
+    const { identifier, subowners } = this.props;
+
+    return (
+      <ToggleContent title={identifier}>
+        <Button onClick={this.focusOnThis}>
+          <Icon icon="gps_fixed" /> Focus
+        </Button>
+        { subowners.map(sub => (
+          <PropertyOwner
+            key={sub.identifier}
+            {...sub}
+          />
+        )) }
+      </ToggleContent>
+    );
+  }
+}
+
+SceneGraphNode.propTypes = {
+  identifier: PropTypes.string.isRequired,
+  // eslint-disable-next-line react/forbid-prop-types
+  subowners: PropTypes.arrayOf(PropTypes.shape({
+    identifier: PropTypes.string,
+    description: PropTypes.string,
+    properties: PropTypes.arrayOf(PropTypes.object),
+  })),
+};
+
+SceneGraphNode.defaultProps = {
+  properties: [],
+  subowners: [],
+};
+
+export default SceneGraphNode;
diff --git a/modules/webgui/web/src/components/Sidebar/ScenePane.jsx b/modules/webgui/web/src/components/Sidebar/ScenePane.jsx
new file mode 100644
index 0000000000..f5887f0589
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/ScenePane.jsx
@@ -0,0 +1,55 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import Pane from './Pane';
+import FilterList from '../common/FilterList/FilterList';
+import SceneGraphNode from './SceneGraphNode';
+import LoadingBlocks from '../common/LoadingBlock/LoadingBlocks';
+
+class ScenePane extends Component {
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    const { nodes } = this.props;
+    return (
+      <Pane title="View" closeCallback={this.props.closeCallback}>
+        { (nodes.length === 0) && (
+          <LoadingBlocks className={Pane.styles.loading} />
+        )}
+
+        { nodes.length > 0 && (
+          <FilterList data={nodes} viewComponent={SceneGraphNode} />
+        )}
+      </Pane>
+    );
+  }
+}
+
+ScenePane.propTypes = {
+  closeCallback: PropTypes.func,
+};
+
+ScenePane.defaultProps = {
+  closeCallback: null,
+};
+
+
+const mapStateToProps = (state) => {
+  const sceneType = 'Scene';
+  const rootNodes = state.propertyTree.subowners.filter(element => element.identifier === sceneType);
+  let nodes = [];
+  rootNodes.forEach((node) => {
+    nodes = [...nodes, ...node.subowners];
+  });
+  return {
+    nodes,
+  };
+};
+
+ScenePane = connect(
+  mapStateToProps,
+)(ScenePane);
+
+export default ScenePane;
diff --git a/modules/webgui/web/src/components/Sidebar/SettingsPane.jsx b/modules/webgui/web/src/components/Sidebar/SettingsPane.jsx
new file mode 100644
index 0000000000..fc6768b54b
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/SettingsPane.jsx
@@ -0,0 +1,57 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import Pane from './Pane';
+import LoadingBlocks from '../common/LoadingBlock/LoadingBlocks';
+import FilterList from '../common/FilterList/FilterList';
+import PropertyOwner from './Properties/PropertyOwner';
+
+import styles from './SettingsPane.scss';
+
+class SettingsPane extends Component {
+  constructor(props) {
+    super(props);
+  }
+
+  render() {
+    const { properties } = this.props;
+
+    return (
+      <Pane title="Settings" closeCallback={this.props.closeCallback}>
+        { (properties.length === 0) && (
+          <LoadingBlocks className={Pane.styles.loading} />
+        )}
+
+        {(properties.length > 0) && (
+          <FilterList
+            data={properties}
+            className={styles.list}
+            viewComponent={PropertyOwner}
+          />
+        )}
+      </Pane>
+    );
+  }
+}
+
+SettingsPane.propTypes = {
+  closeCallback: PropTypes.func,
+};
+
+SettingsPane.defaultProps = {
+  closeCallback: null,
+};
+
+const mapStateToProps = (state) => {
+  const sceneType = 'Scene';
+  const properties = state.propertyTree.subowners.filter(element => element.identifier !== sceneType);
+  return {
+    properties,
+  };
+};
+
+SettingsPane = connect(
+  mapStateToProps,
+)(SettingsPane);
+
+export default SettingsPane;
diff --git a/modules/webgui/web/src/components/Sidebar/SettingsPane.scss b/modules/webgui/web/src/components/Sidebar/SettingsPane.scss
new file mode 100644
index 0000000000..c0f7179f32
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/SettingsPane.scss
@@ -0,0 +1,4 @@
+.list {
+  height: 100%;
+  width: 100%;
+}
diff --git a/modules/webgui/web/src/components/Sidebar/Sidebar.jsx b/modules/webgui/web/src/components/Sidebar/Sidebar.jsx
new file mode 100644
index 0000000000..246ab49b7a
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Sidebar.jsx
@@ -0,0 +1,63 @@
+import React from 'react';
+
+import TabMenu from './TabMenu/TabMenu';
+import SystemMenu from '../SystemMenu/SystemMenu';
+import TabMenuItem from './TabMenu/TabMenuItem';
+import Icon from '../common/Icon/Icon';
+import SmallLabel from '../common/SmallLabel/SmallLabel';
+import ScenePane from './ScenePane';
+import SettingsPane from './SettingsPane';
+
+import styles from './Sidebar.scss';
+
+const views = {
+  settings: SettingsPane,
+  scene: ScenePane,
+};
+
+class Sidebar extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { view: null };
+
+    this.selectView = this.selectView.bind(this);
+    this.isActive = this.isActive.bind(this);
+  }
+
+  selectView(selectedView) {
+    return () => {
+      this.setState((previous) => {
+        const view = (previous.view === selectedView ? null : selectedView);
+        return Object.assign({}, previous, { view });
+      });
+    };
+  }
+
+  isActive(view) {
+    return this.state.view === view;
+  }
+
+  render() {
+    const { view } = this.state;
+    const SelectedView = views[view];
+    return (
+      <section className={`${styles.Sidebar} ${view ? styles.active : ''}`}>
+        { SelectedView && (<SelectedView closeCallback={this.selectView} />)}
+
+        <TabMenu>
+          <SystemMenu />
+          <TabMenuItem active={this.isActive('scene')} onClick={this.selectView('scene')}>
+            <Icon className={styles.icon} icon="layers" />
+            <SmallLabel>Scene</SmallLabel>
+          </TabMenuItem>
+          <TabMenuItem active={this.isActive('settings')} onClick={this.selectView('settings')}>
+            <Icon className={styles.icon} icon="settings" />
+            <SmallLabel>Settings</SmallLabel>
+          </TabMenuItem>
+        </TabMenu>
+      </section>
+    );
+  }
+}
+
+export default Sidebar;
diff --git a/modules/webgui/web/src/components/Sidebar/Sidebar.scss b/modules/webgui/web/src/components/Sidebar/Sidebar.scss
new file mode 100644
index 0000000000..933a8dea5a
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/Sidebar.scss
@@ -0,0 +1,13 @@
+.Sidebar {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+}
+
+.active {
+  height: 100%;
+}
+
+.icon {
+  font-size: 18px;
+}
diff --git a/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenu.jsx b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenu.jsx
new file mode 100644
index 0000000000..4011db929a
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenu.jsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './TabMenu.scss';
+
+const TabMenu = ({ children }) => (
+  <nav className={styles.TabMenu}>
+    { children }
+  </nav>
+);
+
+TabMenu.propTypes = {
+  children: PropTypes.node.isRequired,
+};
+
+export default TabMenu;
diff --git a/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenu.scss b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenu.scss
new file mode 100644
index 0000000000..c6e97f0ba1
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenu.scss
@@ -0,0 +1,7 @@
+@import "../../../styles/all";
+
+.TabMenu {
+  display: flex;
+  background: $ui-background;
+  height: $sidebar-tab-height;
+}
diff --git a/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenuItem.jsx b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenuItem.jsx
new file mode 100644
index 0000000000..86ddfc8d3e
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenuItem.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './TabMenuItem.scss';
+
+const TabMenuItem = ({ children, onClick, active }) => {
+  const activeClass = active ? styles.active : '';
+  return (
+    <div onClick={onClick} className={`${styles.TabMenuItem} ${activeClass}`} role="tab" tabIndex={0}>
+      {children}
+    </div>
+  );
+};
+
+TabMenuItem.propTypes = {
+  children: PropTypes.node.isRequired,
+  active: PropTypes.bool.isRequired,
+  onClick: PropTypes.func,
+};
+
+TabMenuItem.defaultProps = {
+  onClick: (() => {}),
+};
+
+export default TabMenuItem;
diff --git a/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenuItem.scss b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenuItem.scss
new file mode 100644
index 0000000000..7e4e979a5f
--- /dev/null
+++ b/modules/webgui/web/src/components/Sidebar/TabMenu/TabMenuItem.scss
@@ -0,0 +1,20 @@
+@import "../../../styles/all";
+
+.TabMenuItem {
+  align-items: center;
+  display: flex;
+  flex-basis: 1px;
+  flex-direction: column;
+  flex-grow: 1;
+  height: 100%;
+  justify-content: center;
+
+  &.active {
+    background: $ui-background-active;
+    border-bottom: 3px solid $ui-highlight-secondary;
+  }
+  &:hover, &:focus {
+    background: $ui-background-hover;
+    outline: 0;
+  }
+}
diff --git a/modules/webgui/web/src/components/SystemMenu/SystemMenu.jsx b/modules/webgui/web/src/components/SystemMenu/SystemMenu.jsx
new file mode 100644
index 0000000000..8844598f0e
--- /dev/null
+++ b/modules/webgui/web/src/components/SystemMenu/SystemMenu.jsx
@@ -0,0 +1,98 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import DataManager from '../../api/DataManager';
+import Icon from '../common/Icon/Icon';
+import Button from '../common/Input/Button/Button';
+import styles from './SystemMenu.scss';
+import Popover from '../common/Popover/Popover';
+import {
+  ShutdownScript,
+  ToggleConsoleScript,
+  ToggleNativeGuiScript } from '../../api/keys';
+
+class SystemMenu extends Component {
+  static quit() {
+    DataManager.runScript(ShutdownScript);
+  }
+
+  static console() {
+    DataManager.runScript(ToggleConsoleScript);
+  }
+
+  static nativeGui() {
+    DataManager.runScript(ToggleNativeGuiScript);
+  }
+
+  constructor(props) {
+    super(props);
+    this.state = { showMenu: false };
+    this.toggleMenu = this.toggleMenu.bind(this);
+  }
+
+  toggleMenu() {
+    this.setState({ showMenu: !this.state.showMenu });
+  }
+
+  render() {
+    return (
+      <div className={styles.SystemMenu}>
+        { this.state.showMenu && (
+          <Popover className={styles.popover} arrow="arrow bottom leftside">
+            <nav className={styles.links} onClick={this.toggleMenu}>
+              <button onClick={SystemMenu.console}>
+                Toggle console <span className={styles.shortcut}>~</span>
+              </button>
+              <button onClick={SystemMenu.nativeGui}>
+                Toggle native GUI <span className={styles.shortcut}>F3</span>
+              </button>
+
+              <hr className={Popover.styles.delimiter} />
+
+              <button onClick={SystemMenu.quit}>
+                <Icon icon="exit_to_app" className={styles.linkIcon} />
+                Quit OpenSpace <span className={styles.shortcut}>ESC</span>
+              </button>
+
+              <hr className={Popover.styles.delimiter} />
+
+              <a
+                href="https://github.com/OpenSpace/OpenSpace/wiki/General-Getting-Started-Guide-Using-OpenSpace"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <Icon icon="help" className={styles.linkIcon} />
+                Help
+              </a>
+              <a
+                href="https://github.com/OpenSpace/OpenSpace/issues/new"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <Icon icon="bug_report" className={styles.linkIcon} />
+                Report a problem
+              </a>
+              <a
+                href="http://openspaceproject.com/"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <Icon icon="public" className={styles.linkIcon} />
+                openspaceproject.com
+              </a>
+              <Link to="about">
+                <Icon icon="info" className={styles.linkIcon} />
+                About
+              </Link>
+            </nav>
+          </Popover>
+        )}
+
+        <Button className={styles.button} transparent onClick={this.toggleMenu}>
+          <Icon icon="more_vert" className={styles.icon} />
+        </Button>
+      </div>
+    );
+  }
+}
+
+export default SystemMenu;
diff --git a/modules/webgui/web/src/components/SystemMenu/SystemMenu.scss b/modules/webgui/web/src/components/SystemMenu/SystemMenu.scss
new file mode 100644
index 0000000000..c57f21c5fb
--- /dev/null
+++ b/modules/webgui/web/src/components/SystemMenu/SystemMenu.scss
@@ -0,0 +1,72 @@
+@import "../../styles/all";
+
+.SystemMenu {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+  position: relative;
+  width: 30px;
+}
+
+.button {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+}
+
+.icon {
+  font-size: 18px;
+}
+
+.popover {
+  bottom: unquote("calc(#{$bottom-bar-height} + #{$popover-arrow-size})");
+  font-size: 0.9 * $font-size;
+  left: 0;
+  position: absolute;
+  width: 180px;
+}
+
+.links {
+  > :first-child {
+    border-top-left-radius: $popover-corner-radius;
+    border-top-right-radius: $popover-corner-radius;
+  }
+
+  > :last-child {
+    border-bottom-left-radius: $popover-corner-radius;
+    border-bottom-right-radius: $popover-corner-radius;
+  }
+}
+
+.links {
+  .shortcut {
+    font-size: 0.8em;
+    color: $text-color-blur;
+  }
+
+  a, button {
+    padding: ($base-padding / 2) $base-padding;
+    color: $text-color-focus;
+    display: block;
+    text-decoration: none;
+
+    &:hover {
+      background: $blue;
+    }
+  }
+
+  button {
+    background: transparent;
+    border: none;
+    text-align: left;
+    width: 100%;
+  }
+}
+
+.linkIcon {
+  margin-right: 5px;
+  position: relative;
+  top: 2px;
+}
diff --git a/modules/webgui/web/src/components/common/Calendar/Calendar.jsx b/modules/webgui/web/src/components/common/Calendar/Calendar.jsx
new file mode 100644
index 0000000000..fcb3ac02f7
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Calendar/Calendar.jsx
@@ -0,0 +1,262 @@
+// @flow
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { rotate } from '../../../utils/helpers';
+import Icon from '../Icon/Icon';
+import Button from '../Input/Button/Button';
+
+import styles from './Calendar.scss';
+import InlineInput from '../Input/InlineInput/InlineInput';
+
+const Days = {
+  Sunday: 0,
+  Monday: 1,
+  Tuesday: 2,
+  Wednesday: 3,
+  Thursday: 4,
+  Friday: 5,
+  Saturday: 6,
+};
+Object.freeze(Days);
+
+const Months = 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' ');
+Object.freeze(Months);
+
+// how many days of previous month to get depending on weekday
+const DaysInWeekBefore = [7, 1, 2, 3, 4, 5, 6];
+// always display 6 weeks
+const expectedDaysInCalendar = 6 * 7;
+
+class Calendar extends Component {
+  static daysOfMonth(month: Date) {
+    const iterator = new Date(month.getTime());
+    const days = [];
+
+    while (iterator.getMonth() === month.getMonth()) {
+      days.push(Calendar.copy(iterator));
+      iterator.setDate(iterator.getDate() + 1);
+    }
+
+    return days;
+  }
+
+  static isSameDay(a: Date, b: Date): boolean {
+    return a.getFullYear() === b.getFullYear() &&
+      a.getMonth() === b.getMonth() &&
+      a.getDate() === b.getDate();
+  }
+
+  /**
+   * Expose the days object, so that it may be used as Calendar.Days.Sunday, for instance
+   */
+  static get Days(): Days {
+    return Days;
+  }
+
+  /**
+   * set the date component to 1
+   * @param day - remains unchanged
+   * @returns {Date}
+   */
+  static toStartOfMonth(day: Date): Date {
+    const newDay = Calendar.copy(day);
+    newDay.setDate(1);
+    return newDay;
+  }
+
+  /**
+   * copy date
+   * @param date
+   */
+  static copy(date: Date): Date {
+    return new Date(date.getTime());
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      activeMonth: Calendar.toStartOfMonth(props.activeMonth),
+    };
+
+    this.setCurrentMonth = this.setCurrentMonth.bind(this);
+    this.setYear = this.setYear.bind(this);
+  }
+
+  state: { activeMonth: Date };
+
+  componentWillReceiveProps({ activeMonth }) {
+    // update calendar focus (unless user has moved away from previously given active month)
+    if (Calendar.isSameDay(Calendar.toStartOfMonth(this.props.activeMonth),
+                           Calendar.toStartOfMonth(this.state.activeMonth))) {
+      this.setState({ activeMonth: Calendar.toStartOfMonth(activeMonth) });
+    }
+  }
+
+  onSelect(day: Date): Function {
+    return () => {
+      this.props.onChange(day);
+    };
+  }
+
+  get dayHeader(): Array<{ day: Date, index: number }> {
+    return this.props.dayHeaders.map((day, index) => ({ day, index }));
+  }
+
+  get days(): Array<Date> {
+    const prevMonth: Date = this.month(-1);
+    const thisMonth: Date = this.month();
+    const nextMonth: Date = this.month(1);
+
+    const days = Calendar.daysOfMonth(thisMonth);
+    const prev = Calendar.daysOfMonth(prevMonth);
+    const next = Calendar.daysOfMonth(nextMonth);
+
+    const daysFromPrevMonth: number = this.daysToGet(thisMonth.getDay());
+    days.unshift(...prev.slice(-1 * daysFromPrevMonth));
+    const daysFromNextMonth: number = expectedDaysInCalendar - days.length;
+    days.push(...next.slice(0, daysFromNextMonth));
+
+    return days;
+  }
+
+  daysToGet(day: number): number {
+    const rotatedDays = rotate(DaysInWeekBefore, 7 - this.props.weekStartsOn);
+    return rotatedDays[day];
+  }
+
+  month(add: number = 0): Date {
+    const { activeMonth } = this.state;
+    if (add === 0) {
+      return activeMonth;
+    }
+
+    const newDate = new Date(activeMonth.getTime());
+    newDate.setMonth(newDate.getMonth() + add);
+    return newDate;
+  }
+
+  monthString(add: number = 0) {
+    return this.props.months[this.month(add).getMonth()];
+  }
+
+  isThisMonth(day: Date): boolean {
+    return day.getMonth() === this.month().getMonth();
+  }
+
+  isSelected(day: Date): boolean {
+    if (!this.props.selected) {
+      return false;
+    }
+
+    return Calendar.isSameDay(day, this.props.selected);
+  }
+
+  changeMonth(dir: number): Function {
+    return () => this.setState({ activeMonth: this.month(dir) });
+  }
+
+  setCurrentMonth() {
+    this.setState({ activeMonth: Calendar.toStartOfMonth(new Date()) });
+  }
+
+  setYear(event) {
+    const { value } = event.currentTarget;
+    const { activeMonth } = this.state;
+    activeMonth.setFullYear(Number.parseInt(value, 10));
+    this.setState({ activeMonth });
+  }
+
+  extraClasses(day: Date): string {
+    let classes = '';
+
+    if (!this.isThisMonth(day)) {
+      classes += `${styles.faint} `;
+    }
+
+    if (this.isSelected(day)) {
+      classes += `${styles.selected} `;
+    }
+
+    if (Calendar.isSameDay(day, new Date())) {
+      classes += `${styles.today} `;
+    }
+
+    return classes;
+  }
+
+  render() {
+    return (
+      <section>
+        <header className={styles.header}>
+          <Button transparent small onClick={this.changeMonth(-1)}>
+            <Icon icon="chevron_left" />
+          </Button>
+          <div>
+            { this.props.todayButton && (
+              <Button onClick={this.setCurrentMonth} title="Today" small transparent>
+                <Icon icon="today" />
+              </Button>
+            )} {
+              this.monthString()
+            } <InlineInput
+              type="number"
+              value={this.month().getFullYear()}
+              onChange={this.setYear}
+              className={styles.year}
+            />
+          </div>
+          <Button transparent small onClick={this.changeMonth(1)}>
+            <Icon icon="chevron_right" />
+          </Button>
+        </header>
+
+        <section className={styles.calendar}>
+          <header className={styles.weekdays}>
+            { this.dayHeader.map(d => (
+              <div key={d.index} className={styles.weekday}>
+                { d.day }
+              </div>
+            ))}
+          </header>
+
+          <section className={styles.month}>
+            { this.days.map(day => (
+              <div
+                key={`${day.getMonth()}-${day.getDate()}`}
+                className={`${styles.day} ${this.extraClasses(day)}`}
+                onClick={this.onSelect(day)}
+                role="button"
+                tabIndex={0}
+              >
+                { day.getDate() }
+              </div>
+            ))}
+          </section>
+        </section>
+      </section>
+    );
+  }
+}
+
+Calendar.propTypes = {
+  activeMonth: PropTypes.instanceOf(Date),
+  dayHeaders: PropTypes.arrayOf(PropTypes.string),
+  months: PropTypes.arrayOf(PropTypes.string),
+  onChange: PropTypes.func,
+  selected: PropTypes.instanceOf(Date),
+  todayButton: PropTypes.bool,
+  weekStartsOn: PropTypes.number,
+};
+
+Calendar.defaultProps = {
+  activeMonth: new Date(),
+  dayHeaders: 'M T W T F S S'.split(' '),
+  months: Months,
+  onChange: () => {},
+  selected: null,
+  todayButton: false,
+  weekStartsOn: Calendar.Days.Monday,
+};
+
+export default Calendar;
diff --git a/modules/webgui/web/src/components/common/Calendar/Calendar.scss b/modules/webgui/web/src/components/common/Calendar/Calendar.scss
new file mode 100644
index 0000000000..9c298ef98e
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Calendar/Calendar.scss
@@ -0,0 +1,61 @@
+@import "../../../styles/all";
+
+$column-width: 100%/7;
+$selected-border-width: 2px;
+
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.weekdays {
+  display: flex;
+  font-size: 0.8rem;
+  border-bottom: 1px solid $ui-background-hover;
+}
+
+.month {
+  display: grid;
+  grid-template-columns: repeat(7, $column-width);
+}
+
+.day {
+  padding: $button-padding;
+  text-align: center;
+
+  &.faint {
+    color: $text-color-blur;
+  }
+
+  &.selected {
+    background: $ui-background-selected;
+    border-bottom: $selected-border-width solid $blue;
+    font-weight: bold;
+    padding-bottom: unquote("calc(#{$vertical-padding} - #{$selected-border-width})");
+  }
+
+  &.today {
+    background: $ui-background-selected;
+  }
+
+  &:focus,
+  &:hover {
+    background: $ui-background-hover;
+    outline: 0;
+  }
+
+  &:active {
+    background: $ui-background-active;
+  }
+}
+
+.weekday {
+  padding: $button-padding;
+  text-align: center;
+  width: $column-width;
+}
+
+.year {
+  padding: $base-padding / 3 !important;
+}
diff --git a/modules/webgui/web/src/components/common/Calendar/Calendar.story.jsx b/modules/webgui/web/src/components/common/Calendar/Calendar.story.jsx
new file mode 100644
index 0000000000..2715fefc49
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Calendar/Calendar.story.jsx
@@ -0,0 +1,25 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Calendar from './Calendar';
+
+/* globals module */
+
+const yesterday = new Date();
+yesterday.setDate(yesterday.getDate() - 1);
+
+const fourMonthsFromNow = new Date();
+fourMonthsFromNow.setMonth(fourMonthsFromNow.getMonth() + 4);
+
+storiesOf('Calendar', module)
+  .addDecorator(story => (
+    <div style={{ background: '#d8d8d8' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<Calendar />))
+  .add('with selected day', () => (<Calendar selected={yesterday} />))
+  .add('with activeMonth', () => (<Calendar activeMonth={fourMonthsFromNow} />))
+  .add('with today button', () => (<Calendar todayButton />))
+  .add('with callback', () => (<Calendar selected={yesterday} onChange={action('changed')} />));
diff --git a/modules/webgui/web/src/components/common/CenteredLabel/CenteredLabel.jsx b/modules/webgui/web/src/components/common/CenteredLabel/CenteredLabel.jsx
new file mode 100644
index 0000000000..45a562ed96
--- /dev/null
+++ b/modules/webgui/web/src/components/common/CenteredLabel/CenteredLabel.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { centeredLabel } from './CenteredLabel.scss';
+
+const CenteredLabel = props => (
+  <div {...props} className={`${props.className} ${centeredLabel}`}>
+    { props.children }
+  </div>
+);
+
+CenteredLabel.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+CenteredLabel.defaultProps = {
+  className: '',
+};
+
+export default CenteredLabel;
diff --git a/modules/webgui/web/src/components/common/CenteredLabel/CenteredLabel.scss b/modules/webgui/web/src/components/common/CenteredLabel/CenteredLabel.scss
new file mode 100644
index 0000000000..882e13d875
--- /dev/null
+++ b/modules/webgui/web/src/components/common/CenteredLabel/CenteredLabel.scss
@@ -0,0 +1,8 @@
+@import "../../../styles/all";
+
+.centeredLabel {
+  font-size: 0.9rem;
+  letter-spacing: 0.05em;
+  padding: $button-padding;
+  text-align: center;
+}
diff --git a/modules/webgui/web/src/components/common/Error/Error.jsx b/modules/webgui/web/src/components/common/Error/Error.jsx
new file mode 100644
index 0000000000..9bda41b5b1
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Error/Error.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './Error.scss';
+
+const Error = ({ children, className }) => (
+  <div className={`${className} ${styles.ErrorBox}`}>
+    { children }
+  </div>
+);
+
+Error.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+Error.defaultProps = {
+  className: styles.error,
+};
+
+export default Error;
diff --git a/modules/webgui/web/src/components/common/Error/Error.scss b/modules/webgui/web/src/components/common/Error/Error.scss
new file mode 100644
index 0000000000..26d250291e
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Error/Error.scss
@@ -0,0 +1,18 @@
+@import '../../../styles/all';
+
+.ErrorBox {
+  border-top: 3px solid transparent;
+  padding: $sidebar-padding;
+  width: 100%;
+}
+
+.severe,
+.error {
+  background: $ui-danger;
+  border-color: darken($ui-danger, 10%);
+}
+
+.warning {
+  background: $ui-warning;
+  border-color: darken($ui-warning, 10%)
+}
diff --git a/modules/webgui/web/src/components/common/FilterList/FilterList.jsx b/modules/webgui/web/src/components/common/FilterList/FilterList.jsx
new file mode 100644
index 0000000000..5419951d99
--- /dev/null
+++ b/modules/webgui/web/src/components/common/FilterList/FilterList.jsx
@@ -0,0 +1,120 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import Input from '../Input/Input/Input';
+import CenteredLabel from '../CenteredLabel/CenteredLabel';
+import ScrollOverlay from '../ScrollOverlay/ScrollOverlay';
+import { SimpleSubstring } from '../../../utils/StringMatchers';
+import styles from './FilterList.scss';
+
+class FilterList extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      search: '',
+    };
+
+    this.changeSearch = this.changeSearch.bind(this);
+  }
+
+  changeSearch({ currentTarget }) {
+    this.setState({ search: currentTarget.value });
+  }
+
+  get filtered() {
+    const { data, matcher } = this.props;
+    let { search } = this.state;
+    if (search === '') {
+      return data;
+    }
+
+    // most matcher functions are case sensitive
+    search = search.toLowerCase();
+
+    const matcherFunc = (testObj) => {
+      const valuesAsStrings = Object.values(testObj)
+        .filter(test => ['number', 'string'].includes(typeof test))
+        .map(test => test.toString())
+        .map(test => test.toLowerCase());
+      return valuesAsStrings.some(test => matcher(test, search));
+    };
+    return data.filter(matcherFunc);
+  }
+
+  render() {
+    const EntryComponent = this.props.viewComponent;
+    const { search } = this.state;
+    const entries = this.filtered;
+    return (
+      <section className={`${this.props.className} ${styles.filterList}`}>
+        <Input
+          value={search}
+          placeholder={this.props.searchText}
+          onChange={this.changeSearch}
+          clearable
+        />
+
+        <ScrollOverlay>
+          { entries.length === 0 && (
+            <CenteredLabel>
+              Nothing found. Try another search!
+            </CenteredLabel>
+          ) }
+          <ul>
+            { entries.map(entry => (
+              <EntryComponent
+                {...entry}
+                key={entry.identifier}
+                onClick={this.props.onSelect}
+                active={this.props.active}
+              />)) }
+          </ul>
+        </ScrollOverlay>
+      </section>
+    );
+  }
+}
+
+FilterList.propTypes = {
+  /**
+   * the currently active entry, if any. Should be compared strict in viewComponent
+   */
+  // eslint-disable-next-line react/forbid-prop-types
+  active: PropTypes.any,
+  /**
+   * Class name to apply to the list
+   */
+  className: PropTypes.string,
+  /**
+   * the data to display
+   */
+  // eslint-disable-next-line react/forbid-prop-types
+  data: PropTypes.array.isRequired,
+  /**
+   * the function used to filter the list
+   */
+  matcher: PropTypes.func,
+  /**
+   * callback method for selecting an option
+   */
+  onSelect: PropTypes.func,
+  /**
+   * Placeholder and label text for the search box
+   */
+  searchText: PropTypes.string,
+  /**
+   * the component used to display entries
+   */
+  viewComponent: PropTypes.func,
+};
+
+FilterList.defaultProps = {
+  active: null,
+  className: '',
+  matcher: SimpleSubstring,
+  onSelect: null,
+  searchText: 'Search...',
+  viewComponent: props => (<li>{ JSON.stringify(props) }</li>),
+};
+
+export default FilterList;
diff --git a/modules/webgui/web/src/components/common/FilterList/FilterList.scss b/modules/webgui/web/src/components/common/FilterList/FilterList.scss
new file mode 100644
index 0000000000..119e5f190e
--- /dev/null
+++ b/modules/webgui/web/src/components/common/FilterList/FilterList.scss
@@ -0,0 +1,10 @@
+@import "../../../styles/all";
+
+.filterList {
+  height: 100%;
+  width: 100%;
+
+  :global(.scroll-content) {
+    height: unquote("calc(100% - #{$input-total-height})");
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Graph/Graph.jsx b/modules/webgui/web/src/components/common/Graph/Graph.jsx
new file mode 100644
index 0000000000..85cdcf11d5
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Graph/Graph.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import GraphBody from './GraphBody';
+
+const Graph = ({
+  points,
+  color,
+}) =>
+  (
+    <div>
+      <svg width={800} height={600}>
+        <GraphBody
+          points={points}
+          color={color}
+          x={0}
+          y={600}
+          fill={'blue'}
+          fillOpacity={'.5'}
+          strokeWidth={1}
+        />
+      </svg>
+    </div>
+  );
+
+export default Graph;
diff --git a/modules/webgui/web/src/components/common/Graph/GraphBody.jsx b/modules/webgui/web/src/components/common/Graph/GraphBody.jsx
new file mode 100644
index 0000000000..bb1ae6d85c
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Graph/GraphBody.jsx
@@ -0,0 +1,76 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+class GraphBody extends Component {
+  constructor(props) {
+    super(props);
+  }
+
+  prepareData() {
+    const d = [`M ${this.props.points[0].x} ${this.props.y - this.props.points[0].y}`];
+    const collector = this.props.points.map((point, index) => {
+      if (index !== 0) {
+        const xNext = point.x;
+        const yNext = this.props.y - point.y;
+        return `L ${xNext} ${yNext}`;
+      }
+    });
+    return d.concat(collector).join(' ');
+  }
+
+  renderWithLinearGradient(data) {
+    return (
+      <g>
+        <linearGradient id="linear-gradient" gradientUnits="userSpaceOnUse" x1="0" y1={this.props.height} x2={this.props.width} y2={this.props.height} >
+          {this.props.points.map((point, index) =>
+            <stop key={index} offset={point.x / this.props.width} stopColor={point.color} stopOpacity="0%" />,
+          )}
+        </linearGradient>
+        <path
+          d={data}
+          style={{ stroke: 'url(#linear-gradient)' }}
+          strokeWidth={this.props.strokeWidth}
+          fill={this.props.fill}
+          fillOpacity={this.props.fillOpacity}
+        />
+      </g>
+    );
+  }
+
+  renderNormalGraph(data) {
+    return (
+      <path
+        d={data}
+        stroke={this.props.color}
+        strokeWidth={this.props.strokeWidth}
+        fill={this.props.fill}
+        fillOpacity={this.props.fillOpacity}
+      />
+    );
+  }
+
+  render() {
+    const d = this.prepareData();
+    if (this.props.UseLinearGradient) {
+      return this.renderWithLinearGradient(d);
+    }
+
+    return this.renderNormalGraph(d);
+  }
+}
+GraphBody.propTypes = {
+  UseLinearGradient: PropTypes.bool.isRequired,
+  color: PropTypes.string.isRequired,
+  fill: PropTypes.string.isRequired,
+  fillOpacity: PropTypes.string.isRequired,
+  strokeWidth: PropTypes.number.isRequired,
+  points: PropTypes.shape({
+    x: PropTypes.number.isRequired,
+    y: PropTypes.number.isRequired,
+  }).isRequired,
+  x: PropTypes.number.isRequired,
+  y: PropTypes.number.isRequired,
+  height: PropTypes.number.isRequired,
+  width: PropTypes.number.isRequired,
+};
+export default GraphBody;
diff --git a/modules/webgui/web/src/components/common/Graph/GraphBody.scss b/modules/webgui/web/src/components/common/Graph/GraphBody.scss
new file mode 100644
index 0000000000..a7085c3452
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Graph/GraphBody.scss
@@ -0,0 +1,3 @@
+.Graph {
+
+}
diff --git a/modules/webgui/web/src/components/common/Icon/Icon.jsx b/modules/webgui/web/src/components/common/Icon/Icon.jsx
new file mode 100644
index 0000000000..c0ade9bbe6
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Icon/Icon.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './Icon.scss';
+
+/**
+ * Create a Material Design icon. https://material.io/icons/
+ * @param props - the props
+ * @returns {XML}
+ * @constructor
+ */
+const Icon = (props) => {
+  const { icon, className } = props;
+  const classNames = className.split(' ')
+                            .map(s => styles[s] || s)
+                            .concat(styles.base)
+                            .join(' ');
+  return (
+    <i {...props} className={classNames}>{ icon }</i>
+  );
+};
+
+Icon.propTypes = {
+  icon: PropTypes.string.isRequired,
+  className: PropTypes.string,
+};
+
+Icon.defaultProps = {
+  className: '',
+};
+
+export default Icon;
diff --git a/modules/webgui/web/src/components/common/Icon/Icon.scss b/modules/webgui/web/src/components/common/Icon/Icon.scss
new file mode 100644
index 0000000000..25725c624c
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Icon/Icon.scss
@@ -0,0 +1,48 @@
+@font-face {
+  font-family: 'Material Icons';
+  src: url('./fonts/MaterialIcons-Regular.woff2') format('woff2'),
+       url('./fonts/MaterialIcons-Regular.woff') format('woff'),
+       url('./fonts/MaterialIcons-Regular.eot') format('embedded-opentype'),
+       url('./fonts/MaterialIcons-Regular.ttf') format('truetype');
+}
+
+.base {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  //font-size: 22px;  /* Preferred icon size */
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+
+  /* Rules for sizing the icon. */
+  &.md-18, &.small { font-size: 0.8em; }
+  &.md-22, &.normal { font-size: 1em; }
+  &.md-28, &.medium{ font-size: 1.2em; }
+  &.md-36, &.large { font-size: 1.5em; }
+  &.md-48, &.extralarge { font-size: 2em; }
+}
+
+
+/* Rules for using icons as black on a light background. */
+.base.md-dark { color: rgba(0, 0, 0, 0.54); }
+.base.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
+
+/* Rules for using icons as white on a dark background. */
+.base.md-light { color: rgba(255, 255, 255, 1); }
+.base.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
diff --git a/modules/webgui/web/src/components/common/Icon/Icon.story.jsx b/modules/webgui/web/src/components/common/Icon/Icon.story.jsx
new file mode 100644
index 0000000000..77a005805a
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Icon/Icon.story.jsx
@@ -0,0 +1,14 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import Icon from './Icon';
+
+/* globals module */
+
+storiesOf('Icon', module)
+  .add('no options', () => (<Icon icon="language" />))
+  .add('className=small', () => (<Icon icon="language" className="small" />))
+  .add('className=normal', () => (<Icon icon="language" className="normal" />))
+  .add('className=medium', () => (<Icon icon="language" className="medium" />))
+  .add('className=large', () => (<Icon icon="language" className="large" />))
+  .add('className=extralarge', () => (<Icon icon="language" className="extralarge" />));
diff --git a/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.eot b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.eot
new file mode 100644
index 0000000000..70508ebabc
Binary files /dev/null and b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.eot differ
diff --git a/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.ttf b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.ttf
new file mode 100644
index 0000000000..7015564ad1
Binary files /dev/null and b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.ttf differ
diff --git a/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.woff b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.woff
new file mode 100644
index 0000000000..b648a3eea2
Binary files /dev/null and b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.woff differ
diff --git a/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.woff2 b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.woff2
new file mode 100644
index 0000000000..9fa2112520
Binary files /dev/null and b/modules/webgui/web/src/components/common/Icon/fonts/MaterialIcons-Regular.woff2 differ
diff --git a/modules/webgui/web/src/components/common/InfoBox/InfoBox.jsx b/modules/webgui/web/src/components/common/InfoBox/InfoBox.jsx
new file mode 100644
index 0000000000..03567f7a84
--- /dev/null
+++ b/modules/webgui/web/src/components/common/InfoBox/InfoBox.jsx
@@ -0,0 +1,61 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import Icon from '../Icon/Icon';
+import Tooltip from '../Tooltip/Tooltip';
+
+class InfoBox extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = { showPopup: false };
+
+    this.setRef = this.setRef.bind(this);
+    this.togglePopup = this.togglePopup.bind(this);
+  }
+
+  setRef(what) {
+    return (element) => {
+      this[what] = element;
+    };
+  }
+
+  get position() {
+    if (!this.wrapper) return { top: '0px', left: '0px' };
+    const { top, right } = this.wrapper.getBoundingClientRect();
+    return { top: `${top}px`, left: `${right}px` };
+  }
+
+  togglePopup() {
+    this.setState({ showPopup: !this.state.showPopup });
+  }
+
+  render() {
+    const { icon, text } = this.props;
+    const { showPopup } = this.state;
+    return (
+      <span
+        ref={this.setRef('wrapper')}
+        onMouseEnter={this.togglePopup}
+        onMouseLeave={this.togglePopup}
+      >
+        <Icon icon={icon} />
+        { showPopup && (
+          <Tooltip fixed placement="right" style={this.position}>
+            { text }
+          </Tooltip>
+        )}
+      </span>
+    );
+  }
+}
+
+InfoBox.propTypes = {
+  icon: PropTypes.string,
+  text: PropTypes.string.isRequired,
+};
+
+InfoBox.defaultProps = {
+  icon: 'info',
+};
+
+export default InfoBox;
diff --git a/modules/webgui/web/src/components/common/InfoBox/InfoBox.story.jsx b/modules/webgui/web/src/components/common/InfoBox/InfoBox.story.jsx
new file mode 100644
index 0000000000..9d074479c0
--- /dev/null
+++ b/modules/webgui/web/src/components/common/InfoBox/InfoBox.story.jsx
@@ -0,0 +1,18 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import InfoBox from './InfoBox';
+
+/* globals module */
+
+storiesOf('InfoBox', module)
+  .addDecorator(story => (
+    <div style={{ padding: '20px' }}>
+      { story() }
+      Hover over it!
+    </div>
+  ))
+  .add('default', () => (<InfoBox text="text" />))
+  .add('with html content', () =>
+    (<InfoBox text={(<a href="http://gph.is/1PLFn5U" target="_blank">It is a link!</a>)} />))
+  .add('special icon', () => (<InfoBox text="look it's a globe!" icon="language" />));
diff --git a/modules/webgui/web/src/components/common/Input/Button/Button.jsx b/modules/webgui/web/src/components/common/Input/Button/Button.jsx
new file mode 100644
index 0000000000..1a8786421d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Button/Button.jsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { excludeKeys } from '../../../../utils/helpers';
+import styles from './Button.scss';
+
+/* eslint-disable react/no-unused-prop-types */
+
+const Button = (props) => {
+  const specialClasses = 'block small transparent uppercase smalltext nopadding';
+  const inheritProps = excludeKeys(props, specialClasses);
+
+  // let extraClass = '';
+  const extraClass = specialClasses.split(' ')
+    .filter(c => props[c])
+    .map(c => styles[c])
+    .join(' ');
+
+  return (
+    <button {...inheritProps} className={`${props.className} ${extraClass} ${styles.button}`}>
+      { props.children }
+    </button>
+  );
+};
+
+Button.propTypes = {
+  block: PropTypes.bool,
+  className: PropTypes.string,
+  children: PropTypes.node.isRequired,
+  nopadding: PropTypes.bool,
+  small: PropTypes.bool,
+  smalltext: PropTypes.bool,
+  transparent: PropTypes.bool,
+  uppercase: PropTypes.bool,
+};
+
+Button.defaultProps = {
+  block: false,
+  className: '',
+  nopadding: false,
+  small: false,
+  smalltext: false,
+  transparent: false,
+  uppercase: false,
+};
+
+export default Button;
diff --git a/modules/webgui/web/src/components/common/Input/Button/Button.scss b/modules/webgui/web/src/components/common/Input/Button/Button.scss
new file mode 100644
index 0000000000..48d44dbc31
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Button/Button.scss
@@ -0,0 +1,61 @@
+@import "../../../../styles/all";
+
+$small-padding: ($vertical-padding / 2) ($base-padding / 2);
+
+.button {
+  background: $ui-background-selected;
+  color: $text-color-focus;
+  letter-spacing: 0.08em;
+  padding: $button-padding;
+}
+
+.block {
+  width: 100%;
+}
+
+.uppercase {
+  font-size: 0.9rem;
+  letter-spacing: 0.2em;
+  text-transform: uppercase;
+}
+
+.transparent {
+  background: transparent;
+}
+
+.nopadding {
+  padding: 0;
+}
+
+.small {
+  padding: $small-padding;
+}
+
+.smalltext {
+  font-size: 0.8em;
+}
+
+// Why redeclaring some styles here?!
+// Well, some properties from the classes above (small, for instance)
+// needs to overwrite others. Due to the last rule applies nature of
+// CSS, this is probably one of the cleaner solutions.
+.button {
+  border: 0;
+
+  &:not(:disabled) {
+    &:focus,
+    &:hover {
+      background: $ui-background-hover;
+      outline: 0;
+    }
+  }
+
+  &:active {
+    background: $ui-background-active;
+  }
+
+  &:disabled {
+    color: $text-color-blur;
+    cursor: not-allowed;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/Button/Button.story.jsx b/modules/webgui/web/src/components/common/Input/Button/Button.story.jsx
new file mode 100644
index 0000000000..712bcb996d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Button/Button.story.jsx
@@ -0,0 +1,25 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Button from './Button';
+
+/* globals module */
+
+storiesOf('Input/Button', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<Button>button!</Button>))
+  .add('with callback', () => (<Button onClick={action('clickety!')}>clicky button!</Button>))
+  .add('block', () => (<Button block>blocky wide button!</Button>))
+  .add('transparent', () => (<Button transparent>transparent button!</Button>))
+  .add('small', () => (<Button small>small button!</Button>))
+  .add('smalltext', () => (<Button smalltext>smalltext button!</Button>))
+  .add('disabled', () => (<Button disabled>disabled button!</Button>))
+  .add('nopadding', () => (<Button nopadding>nopadding button!</Button>))
+  .add('uppercase', () => (<Button uppercase>uppercase button!</Button>))
+  .add('ALL the variations', () =>
+    (<Button small smalltext block uppercase transparent>crazy button!</Button>));
diff --git a/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.jsx b/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.jsx
new file mode 100644
index 0000000000..20ff8afc86
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.jsx
@@ -0,0 +1,67 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { excludeKeys } from '../../../../utils/helpers';
+import styles from './Checkbox.scss';
+import Input from '../Input/Input';
+
+class Checkbox extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      checked: props.checked || props.value,
+      id: `checkbox-${Input.nextId}`,
+    };
+
+    this.onChange = this.onChange.bind(this);
+  }
+
+  componentWillReceiveProps({ checked, value }) {
+    this.setState({ checked: checked || value });
+  }
+
+  onChange(event) {
+    const { checked } = event.currentTarget;
+    this.setState({ checked });
+
+    this.props.onChange(checked);
+  }
+
+  render() {
+    const inheritProps = excludeKeys(this.props, 'wide id label onChange type left');
+    const { label, wide, left } = this.props;
+    const { checked, id } = this.state;
+
+    return (
+      <div className={`${styles.wrapper} ${wide ? styles.wide : ''} ${left ? styles.left : ''}`}>
+        <input
+          {...inheritProps}
+          id={id}
+          type="checkbox"
+          checked={checked}
+          onChange={this.onChange}
+        />
+        <label htmlFor={id}>{ label }</label>
+      </div>
+    );
+  }
+}
+
+Checkbox.propTypes = {
+  checked: PropTypes.bool,
+  onChange: PropTypes.func,
+  label: PropTypes.node.isRequired,
+  left: PropTypes.bool,
+  value: PropTypes.bool,
+  wide: PropTypes.bool,
+};
+
+Checkbox.defaultProps = {
+  checked: false,
+  left: false,
+  onChange: () => {},
+  value: false,
+  wide: true,
+};
+
+export default Checkbox;
diff --git a/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.scss b/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.scss
new file mode 100644
index 0000000000..4aef138676
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.scss
@@ -0,0 +1,23 @@
+@import "../../../../styles/all";
+
+$height: $font-size + $base-padding * 1.5;
+
+.wrapper {
+
+  &:hover {
+    background: $ui-background-hover;
+  }
+
+  &.wide {
+    align-items: center;
+    display: flex;
+    flex-direction: row-reverse;
+    justify-content: space-between;
+    height: $height;
+    padding: 0 $input-padding-horizontal;
+  }
+
+  &.left {
+    flex-direction: row;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.story.jsx b/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.story.jsx
new file mode 100644
index 0000000000..c83fd213aa
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Checkbox/Checkbox.story.jsx
@@ -0,0 +1,14 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Checkbox from './Checkbox';
+
+/* globals module */
+
+storiesOf('Input/Checkbox', module)
+  .add('default', () => (<Checkbox label="Input" />))
+  .add('checked', () => (<Checkbox label="Input" checked />))
+  .add('left', () => (<Checkbox label="Input" left />))
+  .add('unwide', () => (<Checkbox label="Input" wide={false} />))
+  .add('with callback', () => (<Checkbox label="Input" onChange={action('changed')} />));
diff --git a/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.jsx b/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.jsx
new file mode 100644
index 0000000000..316dacad15
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import AutosizeInput from 'react-input-autosize';
+import Input from '../Input/Input';
+import styles from './InlineInput.scss';
+
+const InlineInput = props => (
+  <AutosizeInput
+    {...props}
+    id={props.id || `inlineinput-${Input.nextId}`}
+    value={props.value}
+    onChange={this.onChange}
+    className={`${styles.input} ${props.className}`}
+  />
+);
+
+InlineInput.propTypes = {
+  className: PropTypes.string,
+  id: PropTypes.string,
+  onChange: PropTypes.func,
+  type: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+};
+
+InlineInput.defaultProps = {
+  className: '',
+  id: null,
+  onChange: () => {},
+  type: 'text',
+  value: '',
+};
+
+export default InlineInput;
diff --git a/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.scss b/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.scss
new file mode 100644
index 0000000000..4de59ad95d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.scss
@@ -0,0 +1,30 @@
+@import "../../../../styles/all";
+
+.input {
+  background: $ui-background-selected;
+  border: 0;
+  box-sizing: content-box;
+  color: $text-color-focus;
+  display: inline;
+  line-height: 1;
+  margin: 0;
+  min-width: 10px;
+  padding: 0;
+
+  [type="number"]::-webkit-outer-spin-button,
+  [type="number"]::-webkit-inner-spin-button {
+    display: none;
+  }
+
+  input {
+    background: transparent;
+    color: $text-color-focus;
+    border: none;
+
+    &:focus,
+    &:hover {
+      outline: 0;
+      background: $ui-background-hover;
+    }
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.story.jsx b/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.story.jsx
new file mode 100644
index 0000000000..cc3808ae6e
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/InlineInput/InlineInput.story.jsx
@@ -0,0 +1,17 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import InlineInput from './InlineInput';
+
+/* globals module */
+
+storiesOf('Input/InlineInput', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<InlineInput placeholder="InlineInput" value="expands as you type!" />))
+  .add('with callback', () =>
+    (<InlineInput placeholder="InlineInput" value="change me" onChange={action('input')} />));
diff --git a/modules/webgui/web/src/components/common/Input/Input/Input.jsx b/modules/webgui/web/src/components/common/Input/Input/Input.jsx
new file mode 100644
index 0000000000..a2e0d215cb
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Input/Input.jsx
@@ -0,0 +1,134 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { excludeKeys } from '../../../../utils/helpers';
+import Icon from '../../Icon/Icon';
+import styles from './Input.scss';
+
+class Input extends Component {
+  static get nextId() {
+    return Input.idCounter++;
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      value: props.value,
+      id: `input-${Input.nextId}`,
+    };
+
+    this.onChange = this.onChange.bind(this);
+    this.clear = this.clear.bind(this);
+    this.setInputRef = this.setInputRef.bind(this);
+  }
+
+  componentWillReceiveProps({ value }) {
+    this.setState({ value });
+  }
+
+  /**
+   * callback for input
+   * @param event InputEvent
+   */
+  onChange(event) {
+    const { value } = event.currentTarget;
+
+    // update state so that input is re-rendered with new content
+    this.setState({ value });
+
+    // send to the onChange (if any)!
+    this.props.onChange(event);
+  }
+
+  /**
+   * callback to keep save a reference of the input field
+   * @param node
+   */
+  setInputRef(node) {
+    this.inputNode = node;
+  }
+
+  /**
+   * clear the input field
+   */
+  clear() {
+    this.setState({ value: '' });
+
+    // trigger onchange event on input
+    this.inputNode.value = '';
+    this.onChange({ currentTarget: this.inputNode });
+    this.inputNode.focus();
+  }
+
+  get hasInput() {
+    return this.state.value !== '';
+  }
+
+  /**
+   * filter out props that shouldn't be inherited by the input element
+   * @returns {*}
+   */
+  get inheritProps() {
+    const doNotInclude = 'wide onChange loading value clearable';
+    return excludeKeys(this.props, doNotInclude);
+  }
+
+  render() {
+    const { placeholder, className, wide, loading, clearable, label } = this.props;
+    const { value, id } = this.state;
+    return (
+      <div className={`${styles.group} ${wide ? styles.wide : ''}`}>
+        <input
+          {...this.inheritProps}
+          className={`${className} ${styles.input}
+                      ${this.hasInput ? styles.hasinput : ''}
+                      ${loading ? styles.loading : ''}
+                      ${wide ? styles.wide : ''}`}
+          id={id}
+          onChange={this.onChange}
+          value={value}
+          ref={this.setInputRef}
+        />
+        <label htmlFor={id} className={`${styles.label} ${this.hasInput && styles.hasinput}`}>
+          { label || placeholder }
+        </label>
+        { clearable && (
+          <Icon
+            icon="cancel"
+            className={`${styles.clearbutton} ${this.hasInput && styles.hasinput}`}
+            onClick={this.clear}
+            tabIndex="0"
+            role="button"
+            title="Clear input field"
+          />
+        )}
+      </div>
+    );
+  }
+}
+
+Input.idCounter = Input.idCounter || 1;
+
+Input.propTypes = {
+  onChange: PropTypes.func,
+  className: PropTypes.string,
+  clearable: PropTypes.bool,
+  label: PropTypes.node,
+  loading: PropTypes.bool,
+  placeholder: PropTypes.string.isRequired,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  wide: PropTypes.bool,
+};
+
+Input.defaultProps = {
+  onChange: () => {},
+  className: '',
+  clearable: false,
+  label: null,
+  loading: false,
+  value: '',
+  wide: true,
+};
+
+export default Input;
+
diff --git a/modules/webgui/web/src/components/common/Input/Input/Input.scss b/modules/webgui/web/src/components/common/Input/Input/Input.scss
new file mode 100644
index 0000000000..07a7d89a0f
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Input/Input.scss
@@ -0,0 +1,134 @@
+@import "../../../../styles/all";
+
+// rename some vars to make this less cluttered than it already is
+$label-size: $input-label-size;
+$label-margin: $input-label-margin;
+$loading-border-width: $input-loading-border-width;
+$padding-horizontal: $input-padding-horizontal;
+$padding-vertical: $input-padding-vertical;
+
+// calculate good padding for input field
+$padding-top: $label-size + (2 * $label-margin);
+$padding-bottom: $padding-vertical - $padding-top;
+$padding-bottom-loading: $padding-vertical - $padding-top - $loading-border-width;
+
+// different states
+$padding: $padding-top $padding-horizontal $padding-bottom;
+$padding-empty: ($padding-vertical / 2) $padding-horizontal;
+$padding-loading: $padding-top $padding-horizontal $padding-bottom-loading;
+
+.group {
+  position: relative;
+}
+
+.input {
+  background: transparent;
+  border: none;
+  box-sizing: border-box;
+  color: $text-color-focus;
+  font-size: $input-font-size;
+  height: $input-total-height;
+  line-height: $input-font-size;
+  padding: $padding-empty;
+
+  &:disabled {
+    color: lighten(black, 40%);
+    cursor: not-allowed;
+  }
+}
+
+.input:hover {
+  background: $ui-background-active;
+
+   ~ .label {
+     color: $text-color-focus;
+   }
+}
+
+.input:focus {
+  background: $ui-background-hover;
+  color: $text-color-focus;
+  outline: 0;
+
+  ~ .label {
+    color: $green;
+  }
+}
+
+.input.hasinput {
+  padding: $padding;
+}
+
+.input.loading {
+  animation: loading-input-animation $loading-animation-duration $loading-easing infinite;
+  padding: $padding-loading;
+}
+
+.wide {
+  width: 100%;
+}
+
+.label {
+  color: $text-color-blur;
+  display: none;
+  font-size: $label-size;
+  left: $padding-horizontal;
+  line-height: 1;
+  position: absolute;
+  top: $label-margin;
+  transition: color $animation-duration $animation-easing;
+  white-space: nowrap;
+  z-index: 10;
+}
+
+.label.hasinput {
+  animation: label-animation $animation-duration $animation-easing;
+  display: inline-block;
+  user-select: none;
+}
+
+.clearbutton {
+  color: $text-color-blur;
+  cursor: pointer;
+  display: none;
+  font-size: 18px;
+  opacity: 0;
+  position: absolute;
+  right: $padding-horizontal;
+  top: 50%;
+  transform: translateY(-50%);
+  transition: opacity $animation-duration $animation-easing;
+
+  &:focus,
+  &:hover {
+    color: $text-color-focus;
+  }
+}
+
+.clearbutton.hasinput {
+  opacity: 1;
+  display: inline-block;
+}
+
+
+@keyframes label-animation {
+  0% {
+    opacity: 0;
+    transform: translateY($label-size);
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes loading-input-animation {
+  0% {
+    border-bottom: $loading-border-width solid $blue;
+  }
+  50% {
+    border-bottom: $loading-border-width solid $green;
+  }
+  100% {
+    border-bottom: $loading-border-width solid $blue;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/Input/Input.story.jsx b/modules/webgui/web/src/components/common/Input/Input/Input.story.jsx
new file mode 100644
index 0000000000..b4766e1c22
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Input/Input.story.jsx
@@ -0,0 +1,24 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Input from './Input';
+
+/* globals module */
+
+storiesOf('Input/Input', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<Input placeholder="Input" value="PRE EFined value" />))
+  .add('no input', () => (<Input placeholder="Input" />))
+  .add('unwide', () => (<Input placeholder="Input" wide={false} />))
+  .add('disabled', () => (<Input placeholder="Input" value="value" disabled />))
+  .add('clearable', () => (<Input placeholder="Input" value="value" clearable />))
+  .add('loading', () => (<Input placeholder="Input" value="value" loading />))
+  .add('label + placeholder', () =>
+    (<Input label="Special label" placeholder="Input placeholder!" value="remove this to see" />))
+  .add('with callback', () =>
+    (<Input placeholder="Input" value="change me" onChange={action('input')} />));
diff --git a/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.jsx b/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.jsx
new file mode 100644
index 0000000000..4ad60708f5
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.jsx
@@ -0,0 +1,163 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { excludeKeys } from '../../../../utils/helpers';
+import styles from './NumericInput.scss';
+import Input from '../Input/Input';
+import Tooltip from '../../Tooltip/Tooltip';
+import { round10 } from '../../../../utils/rounding';
+import { clamp } from 'lodash/number';
+
+class NumericInput extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      value: props.value,
+      showTextInput: false,
+      id: `numericinput-${Input.nextId}`,
+      hoverHint: null,
+    };
+
+    this.onChange = this.onChange.bind(this);
+    this.onHover = this.onHover.bind(this);
+    this.onLeave = this.onLeave.bind(this);
+    this.toggleInput = this.toggleInput.bind(this);
+  }
+
+  componentWillReceiveProps({ value }) {
+    this.setState({ value });
+  }
+
+  /**
+   * callback for input
+   * @param event InputEvent
+   */
+  onChange(event) {
+    const { value } = event.currentTarget;
+    const { max, min } = this.props;
+
+    if (value > max || value < min) return;
+
+    // update state so that input is re-rendered with new content - optimistic ui change
+    this.setState({ value });
+
+    // send to the onChange (if any)!
+    this.props.onChange(event);
+  }
+
+  onHover(event) {
+    if (this.props.disabled) {
+      return;
+    }
+
+    // get bounds for input to calc hover percentage
+    const { left, right } = event.currentTarget.getBoundingClientRect();
+    const { clientX } = event;
+    const hoverHint = clamp((clientX - left) / (right - left), 0, 1);
+    this.setState({ hoverHint });
+  }
+
+  onLeave() {
+    this.setState({ hoverHint: null });
+  }
+
+  get showTextInput() {
+    return this.props.inputOnly || this.state.showTextInput;
+  }
+
+  toggleInput() {
+    if (this.props.disableInput) return;
+
+    this.setState({ showTextInput: !this.state.showTextInput, hoverHint: null });
+  }
+
+  render() {
+    const { value, id, hoverHint } = this.state;
+
+    if (this.showTextInput) {
+      return (
+        <Input
+          {...excludeKeys(this.props, 'disableInput inputOnly noHoverHint noTooltip')}
+          type="number"
+          value={value}
+          onChange={this.onChange}
+          onBlur={this.toggleInput}
+          autoFocus
+        />
+      );
+    }
+
+    const { placeholder, className, label, wide, min, max } = this.props;
+    const doNotInclude = 'wide onChange value className type ' +
+                         'disableInput inputOnly label noHoverHint noTooltip';
+    const inheritedProps = excludeKeys(this.props, doNotInclude);
+
+    return (
+      <div
+        className={`${styles.inputGroup} ${wide ? styles.wide : ''}`}
+        onDoubleClick={this.toggleInput}
+        onMouseMove={this.onHover}
+        onMouseLeave={this.onLeave}
+      >
+        { !this.props.noHoverHint && hoverHint !== null && (
+          <div className={styles.hoverHint} style={{ width: `${100 * hoverHint}%` }} />
+        )}
+        { !this.props.noTooltip && hoverHint !== null && (
+          <Tooltip style={{ left: `${100 * hoverHint}%` }}>
+            { round10(min + hoverHint * (max - min), Math.log10(this.props.step)) }
+          </Tooltip>
+        )}
+        <input
+          {...inheritedProps}
+          id={id}
+          type="range"
+          value={value}
+          className={`${className} ${styles.range}`}
+          style={{ '--min': min, '--max': max, '--value': value }}
+          onChange={this.onChange}
+        />
+        <label htmlFor={id} className={`${styles.rangeLabel}`}>
+          { label || placeholder }
+        </label>
+        <span className={styles.value} onClick={this.toggleInput} role="button" tabIndex={0}>
+          {value}
+        </span>
+      </div>
+    );
+  }
+}
+
+NumericInput.propTypes = {
+  className: PropTypes.string,
+  disabled: PropTypes.bool,
+  disableInput: PropTypes.bool,
+  inputOnly: PropTypes.bool,
+  label: PropTypes.node,
+  max: PropTypes.number,
+  min: PropTypes.number,
+  noHoverHint: PropTypes.bool,
+  noTooltip: PropTypes.bool,
+  onChange: PropTypes.func,
+  placeholder: PropTypes.string.isRequired,
+  step: PropTypes.number,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  wide: PropTypes.bool,
+};
+
+NumericInput.defaultProps = {
+  className: '',
+  disabled: false,
+  disableInput: false,
+  inputOnly: false,
+  label: null,
+  max: 100,
+  min: 0,
+  noHoverHint: false,
+  noTooltip: false,
+  onChange: () => {},
+  step: 1,
+  value: 0,
+  wide: true,
+};
+
+export default NumericInput;
diff --git a/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.scss b/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.scss
new file mode 100644
index 0000000000..b450236815
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.scss
@@ -0,0 +1,91 @@
+@import "../../../../styles/all";
+@import "../Input/Input";
+
+// wrapper element
+.inputGroup {
+  position: relative;
+  box-sizing: border-box;
+  height: $input-total-height;
+}
+
+// the descriptive label
+.rangeLabel {
+  @extend .label;
+  display: block;
+}
+
+// display value
+.value {
+  position: absolute;
+  bottom: $padding-bottom;
+  left: $padding-horizontal;
+}
+
+.wide,
+.wide .range {
+  width: 100%;
+}
+
+// mouse-tracking hover event
+.hoverHint {
+  background: rgba($blue, 0.3);
+  height: 100%;
+  left: 0;
+  pointer-events: none;
+  position: absolute;
+  top: 0;
+}
+
+// state changes
+.inputGroup {
+  .range:focus + .rangeLabel {
+    color: $green;
+  }
+
+  &:hover {
+    background: $ui-background-active;
+
+    .rangeLabel {
+      color: $text-color-focus;
+    }
+  }
+}
+
+// TODO: consider using something like https://github.com/darlanrod/input-range-scss for cross-browser support
+.range {
+  // calculate the width of the background bar using variables set in the component
+  --normalized-value: calc(var(--value) - var(--min));
+  --normalized-max: calc(var(--max) - var(--min));
+  --bg-width: calc(100% * var(--normalized-value) / var(--normalized-max));
+
+  height: $input-total-height;
+  margin: 0;
+
+  // reset styles
+  background: $ui-background-hover;
+  -webkit-appearance: none;
+
+  &:hover {
+    background: transparent;
+  }
+
+  &:focus {
+    outline: 0;
+    background: $ui-background-hover;
+  }
+
+  // this cannot be completely removed, as that breaks the input.
+  &::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    height: 100%;
+    width: 1px;
+    background: transparent;
+  }
+
+  &::-webkit-slider-runnable-track {
+    transition: $background-transition;
+    background: linear-gradient(to right, $ui-background-hover var(--bg-width), transparent var(--bg-width));
+    height: 100%;
+    min-width: 2px;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.story.jsx b/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.story.jsx
new file mode 100644
index 0000000000..223b8a41ce
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/NumericInput/NumericInput.story.jsx
@@ -0,0 +1,24 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import NumericInput from './NumericInput';
+
+/* globals module */
+
+storiesOf('Input/NumericInput', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<NumericInput placeholder="Number!" value={52} />))
+  .add('no input', () => (<NumericInput placeholder="Number!" />))
+  .add('unwide', () => (<NumericInput placeholder="Number!" value={12} wide={false} />))
+  .add('disabled', () => (<NumericInput placeholder="Number!" value={33.3} disabled />))
+  .add('inputOnly ', () => (<NumericInput placeholder="Number!" value={33.3} inputOnly />))
+  .add('noHoverHint ', () => (<NumericInput placeholder="Number!" value={33.3} noHoverHint />))
+  .add('noTooltip ', () => (<NumericInput placeholder="Number!" value={33.3} noTooltip />))
+  .add('disableInput ', () => (<NumericInput placeholder="Number!" value={33.3} disableInput />))
+  .add('with callback', () =>
+    (<NumericInput placeholder="Input" value="change me" onChange={action('input')} />));
diff --git a/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.jsx b/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.jsx
new file mode 100644
index 0000000000..8289bd5ca5
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.jsx
@@ -0,0 +1,113 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { excludeKeys } from '../../../../utils/helpers';
+
+import styles from './ScaleInput.scss';
+import Input from '../Input/Input';
+
+class ScaleInput extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      value: props.defaultValue,
+      id: `scale-${Input.nextId}`,
+    };
+
+    this.onChange = this.onChange.bind(this);
+    this.reset = this.reset.bind(this);
+  }
+
+  onChange(event) {
+    const { value } = event.currentTarget;
+    this.setState({ value });
+    this.props.onChange(value);
+  }
+
+  get markers() {
+    const { leftTicks, rightTicks, centerMarker, defaultValue, min, max } = this.props;
+    const showMarkers = centerMarker || (leftTicks > 0 && rightTicks > 0);
+
+    // eslint-disable-next-line no-mixed-operators
+    const width = 100 * (defaultValue - min) / (max - min);
+    return showMarkers && (
+      <div className={styles.markers}>
+        <div className={styles.ticks} style={{ width: `calc(${width}% - 2px)` }}>
+          { Array.from(new Array(leftTicks), (_, i) =>
+            (<div key={i} className={styles.tick} />))}
+        </div>
+        { centerMarker && (<div className={styles.centerMarker} />) }
+        <div className={styles.ticks} style={{ width: `calc(${100 - width}% - 2px)` }}>
+          { Array.from(new Array(rightTicks), (_, i) =>
+            (<div key={i} className={styles.tick} />))}
+        </div>
+      </div>
+    );
+  }
+
+  reset() {
+    this.setState({ value: this.props.defaultValue });
+    this.props.onChange(this.props.defaultValue);
+  }
+
+  render() {
+    const { leftLabel, rightLabel, label, wide } = this.props;
+    const { id } = this.state;
+    const inheritedProps = excludeKeys(this.props,
+      'rightLabel leftLabel label onChange wide centerMarker defaultValue leftTicks rightTicks');
+
+    return (
+      <div className={`${styles.group} ${wide ? styles.wide : ''}`}>
+        { this.markers}
+
+        <input
+          {...inheritedProps}
+          id={id}
+          value={this.state.value}
+          onChange={this.onChange}
+          onMouseUp={this.reset}
+          onBlur={this.reset}
+          type="range"
+          className={`${styles.input} ${wide ? styles.wide : ''}`}
+        />
+        <div className={styles.labels}>
+          <span className={styles.leftLabel}>{ leftLabel }</span>
+          <label htmlFor={id}>{ label }</label>
+          <span className={styles.rightLabel}>{ rightLabel }</span>
+        </div>
+      </div>
+    );
+  }
+}
+
+ScaleInput.propTypes = {
+  centerMarker: PropTypes.bool,
+  defaultValue: PropTypes.number,
+  label: PropTypes.string,
+  leftLabel: PropTypes.string,
+  leftTicks: PropTypes.number,
+  min: PropTypes.number,
+  max: PropTypes.number,
+  onChange: PropTypes.func,
+  rightLabel: PropTypes.string,
+  rightTicks: PropTypes.number,
+  step: PropTypes.number,
+  wide: PropTypes.bool,
+};
+
+ScaleInput.defaultProps = {
+  centerMarker: true,
+  defaultValue: 0,
+  label: '',
+  leftLabel: '-',
+  leftTicks: 5,
+  min: -1,
+  max: 1,
+  onChange: () => {},
+  rightLabel: '+',
+  rightTicks: 5,
+  step: 0.01,
+  wide: true,
+};
+
+export default ScaleInput;
diff --git a/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.scss b/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.scss
new file mode 100644
index 0000000000..53c05284e0
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.scss
@@ -0,0 +1,80 @@
+@import "../../../../styles/all";
+
+$marker-height: 10px;
+$tick-height: 60%;
+$tick-width: 1px;
+$dot-size: $marker-height;
+
+.group {
+  position: relative;
+}
+
+.markers {
+  display: flex;
+  justify-content: space-between;
+  height: 10px;
+}
+
+.ticks {
+  display: flex;
+  justify-content: space-around;
+  height: 100%;
+}
+
+.tick {
+  align-items: center;
+  background: #9a9a9a;
+  content: ' ';
+  height: $tick-height;
+  width: $tick-width;
+}
+
+.centerMarker {
+  background: #9a9a9a;
+  content: ' ';
+  height: 100%;
+  width: $tick-width * 2;
+}
+
+.wide {
+  width: 100%;
+}
+
+.labels {
+  color: $text-color-blur;
+  display: flex;
+  justify-content: space-between;
+  line-height: $font-size;
+  width: 100%;
+
+  label {
+    font-size: 0.8em;
+  }
+}
+
+.input {
+  background: transparent;
+  height: $marker-height;
+  margin: 0;
+  padding: 0;
+  position: absolute;
+  top: 0;
+  -webkit-appearance: none;
+
+  &:focus {
+    outline: none;
+  }
+
+  &::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    background: white;
+    border-radius: $dot-size;
+    height: $dot-size;
+    width: $dot-size;
+  }
+
+  &::-webkit-slider-runnable-track {
+    background: transparent;
+    border: none;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.story.jsx b/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.story.jsx
new file mode 100644
index 0000000000..f7e0d26c87
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/ScaleInput/ScaleInput.story.jsx
@@ -0,0 +1,12 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import ScaleInput from './ScaleInput';
+
+/* globals module */
+
+storiesOf('Input/ScaleInput', module)
+  .add('default', () => (<ScaleInput />))
+  .add('with label', () => (<ScaleInput label="hello" />))
+  .add('with callback', () => (<ScaleInput onChange={action('changed!')} />));
diff --git a/modules/webgui/web/src/components/common/Input/Select/Select.jsx b/modules/webgui/web/src/components/common/Input/Select/Select.jsx
new file mode 100644
index 0000000000..66d64afbad
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Select/Select.jsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ReactSelect from 'react-select';
+import 'react-select/dist/react-select.css';
+import Input from '../Input/Input';
+import styles from './Select.scss';
+import { excludeKeys } from '../../../../utils/helpers';
+
+const Select = (props) => {
+  const { label, direction } = props;
+  const inheritedProps = excludeKeys(props, 'label direction');
+  const id = props.id || `select-${Input.nextId}`;
+  return (
+    <div className={styles.selectgroup}>
+      <ReactSelect
+        {...inheritedProps}
+        id={id}
+        className={`${styles.select} ${styles[direction]}`}
+      />
+      <label htmlFor={id} className={styles.selectlabel}>{ label }</label>
+    </div>
+  );
+};
+
+Select.propTypes = {
+  clearable: PropTypes.bool,
+  direction: PropTypes.oneOf(['up', 'down']),
+  id: PropTypes.string,
+  label: PropTypes.node.isRequired,
+  options: PropTypes.arrayOf(
+    PropTypes.shape({
+      value: PropTypes.string,
+      label: PropTypes.string,
+    })).isRequired,
+  searchable: PropTypes.bool,
+};
+
+Select.defaultProps = {
+  direction: 'down',
+  id: null,
+  searchable: false,
+  clearable: false,
+};
+
+export default Select;
diff --git a/modules/webgui/web/src/components/common/Input/Select/Select.scss b/modules/webgui/web/src/components/common/Input/Select/Select.scss
new file mode 100644
index 0000000000..eb096c079f
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Select/Select.scss
@@ -0,0 +1,106 @@
+@import "../../../../styles/all";
+@import "../Input/Input";
+
+.selectgroup {
+  height: $input-total-height;
+  position: relative;
+  width: 100%;
+}
+
+.select {
+  font-family: $font-family;
+  font-size: $input-font-size;
+  height: 100%;
+  width: 100%;
+
+  // if input isn't disabled, apply background and highlight interaction
+  &:not(:global(.is-disabled)) {
+    background: $ui-background-hover;
+
+    &:focus,
+    &:active,
+    &:global(.is-open),
+    &:global(.is-focused) {
+      background: $ui-background-solid;
+
+      + .selectlabel {
+        color: $green;
+      }
+    }
+  }
+
+  &:hover {
+    background: $ui-background-selected;
+  }
+
+  &:global(.is-disabled) {
+    :global(.Select-value-label) {
+      color: $text-color-blur !important;
+    }
+
+    > :global(.Select-control) {
+      background-color: transparent;
+    }
+  }
+}
+
+.selectlabel {
+  font-size: $input-label-size;
+  left: $input-padding-horizontal;
+  position: absolute;
+  top: $input-label-margin;
+}
+
+// override react-select's styles
+.select :global {
+  .Select-control {
+    background: transparent;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .Select-value {
+    line-height: 1 !important;
+    padding: $padding-top $input-padding-horizontal 0 !important;
+  }
+
+  .Select-value-label {
+    color: $text-color-focus !important;
+  }
+
+  .Select-menu-outer {
+    background: $ui-background-solid;
+    border: 1px solid black;
+    border-radius: 0;
+    box-shadow: $box-shadow;
+
+    .Select-option {
+      background: transparent;
+      color: $text-color-focus;
+    }
+
+    .Select-option.is-selected {
+      background: $ui-background-hover;
+      font-width: bold;
+    }
+
+    .Select-option:hover {
+      background: $blue;
+    }
+  }
+}
+
+.select.up :global(.Select-menu-outer) {
+  top: auto;
+  bottom: 100% !important;
+}
+
+:global {
+  .is-focused:not(.is-open) > .Select-control {
+    border: 0;
+    box-shadow: none;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/Select/Select.story.jsx b/modules/webgui/web/src/components/common/Input/Select/Select.story.jsx
new file mode 100644
index 0000000000..a17a5a2a88
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Select/Select.story.jsx
@@ -0,0 +1,20 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Select from './Select';
+import ReactSelect from 'react-select';
+
+/* globals module */
+
+const options = 'a b c d e f g h'.split(' ').map(v => ({ value: v, label: v }));
+
+storiesOf('Input/Select', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px', color: 'white' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<Select label="Select!" options={options} />))
+  .add('searchable', () => (<Select label="Select!" options={options} searchable />))
+  .add('clearable', () => (<Select label="Select!" options={options} clearable />));
diff --git a/modules/webgui/web/src/components/common/Input/Time/Time.jsx b/modules/webgui/web/src/components/common/Input/Time/Time.jsx
new file mode 100644
index 0000000000..59a69deff9
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Time/Time.jsx
@@ -0,0 +1,162 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import Button from '../Button/Button';
+import InlineInput from '../InlineInput/InlineInput';
+import styles from './Time.scss';
+import Icon from '../../Icon/Icon';
+
+const Elements = {
+  Hours: 'hours',
+  Minutes: 'minutes',
+  Seconds: 'seconds',
+  Milliseconds: 'milliseconds',
+};
+Elements.Normal = [Elements.Hours, Elements.Minutes, Elements.Seconds];
+Elements.All = [Elements.Hours, Elements.Minutes, Elements.Seconds, Elements.Milliseconds];
+Object.freeze(Elements);
+
+class Time extends Component {
+  static zeroPad(number) {
+    return number < 10 ? `0${number}` : number;
+  }
+
+  constructor(props) {
+    super(props);
+    this.state = { time: props.time };
+
+    this.onClick = this.onClick.bind(this);
+    this.onInput = this.onInput.bind(this);
+  }
+
+  componentWillReceiveProps({ time }) {
+    this.setState({ time });
+  }
+
+  onClick(what, change) {
+    const getterFunc = `get${what}`;
+    const setterFunc = `set${what}`;
+
+    return () => {
+      const { time } = this.state;
+      time[setterFunc](time[getterFunc]() + change);
+
+      this.setState({ time });
+      if (this.hasCallback) {
+        this.props.onChange(time);
+      }
+    };
+  }
+
+  onInput(what) {
+    const setterFunc = `set${what}`;
+
+    return (event) => {
+      const { time } = this.state;
+      const { value } = event.currentTarget;
+      time[setterFunc](Number.parseFloat(value));
+      this.setState({ time });
+      if (this.hasCallback) {
+        this.props.onChange(time);
+      }
+    };
+  }
+
+  get hours() {
+    const { time } = this.state;
+    const minutes = this.shouldInclude(Elements.Minutes);
+    return this.wrap(`${Time.zeroPad(time.getHours())}`, 'Hours', minutes && ':');
+  }
+
+  get minutes() {
+    const { time } = this.state;
+    const seconds = this.shouldInclude(Elements.Seconds);
+    return this.wrap(`${Time.zeroPad(time.getMinutes())}`, 'Minutes', seconds && ':');
+  }
+
+  get seconds() {
+    const { time } = this.state;
+    const milliseconds = this.shouldInclude(Elements.Milliseconds);
+    return this.wrap(`${Time.zeroPad(time.getSeconds())}`, 'Seconds', milliseconds && '.');
+  }
+
+  get milliseconds() {
+    const { time } = this.state;
+    return this.wrap(time.getMilliseconds(), 'Milliseconds');
+  }
+
+  get hasCallback() {
+    return this.props.onChange !== null;
+  }
+
+  shouldInclude(what) {
+    return this.props.elements.includes(what);
+  }
+
+  /**
+   * wrap the time component with the needed elements
+   * @param inner - the time itself
+   * @param what - what element is this? hours? seconds?
+   * @param after
+   * @returns {XML}
+   */
+  wrap(inner, what, after = '') {
+    // make it editable with input and such?
+    if (this.hasCallback) {
+      const width = what === 'Milliseconds' ? 3 : 2;
+      return (
+        <div className={styles.element}>
+          <Button nopadding transparent onClick={this.onClick(what, 1)}>
+            <Icon icon="expand_less" />
+          </Button>
+          <span>
+            <InlineInput
+              value={inner}
+              size={width}
+              className={styles.textInput}
+              onChange={this.onInput(what)}
+              type="number"
+            />
+          </span>
+          <Button nopadding transparent onClick={this.onClick(what, -1)}>
+            <Icon icon="expand_more" />
+          </Button>
+        </div>
+      );
+    }
+
+    return (
+      <div className={styles.element}>
+        { inner }{after}
+      </div>
+    );
+  }
+
+  render() {
+    return (
+      <div className={styles.clock}>
+        { this.shouldInclude(Elements.Hours) && this.hours }
+        { this.shouldInclude(Elements.Minutes) && this.minutes }
+        { this.shouldInclude(Elements.Seconds) && this.seconds }
+        { this.shouldInclude(Elements.Milliseconds) && this.milliseconds }
+      </div>
+    );
+  }
+}
+
+Time.Elements = Elements;
+
+Time.propTypes = {
+  /**
+   * decide which element should be shown - should be an array of the elements in Elements
+   */
+  elements: PropTypes.arrayOf(PropTypes.string),
+  onChange: PropTypes.func,
+  time: PropTypes.instanceOf(Date).isRequired,
+};
+
+Time.defaultProps = {
+  elements: Elements.Normal,
+  onChange: null,
+};
+
+export default Time;
diff --git a/modules/webgui/web/src/components/common/Input/Time/Time.scss b/modules/webgui/web/src/components/common/Input/Time/Time.scss
new file mode 100644
index 0000000000..62549662fc
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Time/Time.scss
@@ -0,0 +1,18 @@
+@import "../../../../styles/all";
+
+.clock {
+  display: flex;
+}
+
+.textInput {
+  padding: $base-padding / 2 !important;
+}
+
+.element {
+  display: flex;
+  flex-direction: column;
+
+  + .element {
+    padding-left: $base-padding / 2;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Input/Time/Time.story.jsx b/modules/webgui/web/src/components/common/Input/Time/Time.story.jsx
new file mode 100644
index 0000000000..0369bb2f40
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Input/Time/Time.story.jsx
@@ -0,0 +1,18 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Time from './Time';
+
+/* globals module */
+
+storiesOf('Input/Time', module)
+  .addDecorator(story => (
+    <div style={{ background: '#d8d8d8' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<Time time={new Date()} />))
+  .add('only hours', () => (<Time time={new Date()} elements={[Time.Elements.Hours]} />))
+  .add('all', () => (<Time time={new Date()} elements={Time.Elements.All} />))
+  .add('with callback', () => (<Time time={new Date()} onChange={action('changed')} />));
diff --git a/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.jsx b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.jsx
new file mode 100644
index 0000000000..b15c73cba4
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from './LoadingBlock.scss';
+import { excludeKeys } from '../../../utils/helpers';
+
+const LoadingBlock = (props) => {
+  const inherit = excludeKeys(props, 'loading');
+  return (<div className={styles.block} {...inherit} />);
+};
+
+LoadingBlock.propTypes = {
+  loading: PropTypes.bool,
+};
+
+LoadingBlock.defaultProps = {
+  loading: false,
+};
+
+export default LoadingBlock;
diff --git a/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.scss b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.scss
new file mode 100644
index 0000000000..f6c7366dc1
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.scss
@@ -0,0 +1,13 @@
+@import "../../../styles/all";
+@import "../LoadingString/LoadingString";
+
+.block {
+  @extend .loadingBackground;
+  content: ' ';
+  height: $font-size * 1.6;
+  width: 100%;
+}
+
+.block + .block {
+  margin-top: $base-padding / 2;
+}
diff --git a/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.story.jsx b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.story.jsx
new file mode 100644
index 0000000000..b11fd2ce9c
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlock.story.jsx
@@ -0,0 +1,15 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import LoadingBlock from './LoadingBlock';
+
+/* globals module */
+
+storiesOf('LoadingBlock', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px', color: 'white' }}>
+      { story() }
+    </div>
+  ))
+  .add('default', () => (<LoadingBlock />))
+  .add('several', () => (<div><LoadingBlock /><LoadingBlock /><LoadingBlock /></div>));
diff --git a/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlocks.jsx b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlocks.jsx
new file mode 100644
index 0000000000..b78c459f90
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingBlock/LoadingBlocks.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import LoadingBlock from './LoadingBlock';
+import { excludeKeys } from '../../../utils/helpers';
+
+// eslint-disable-next-line no-mixed-operators
+const rand = (min, max) => Math.random() * (max - min) + min;
+
+const LoadingBlocks = (props) => {
+  const { min, max, fixed } = props;
+  const count = fixed || Math.round(rand(min, max));
+  const inherit = excludeKeys(props, 'fixed max min loading');
+  return (
+    <div {...inherit}>
+      { Array.from(new Array(count), (_, key) => (
+        <LoadingBlock key={`loading-${key}`} style={{ width: `${rand(50, 100)}%` }} />
+      )) }
+    </div>
+  );
+};
+
+LoadingBlocks.propTypes = {
+  fixed: PropTypes.number,
+  max: PropTypes.number,
+  min: PropTypes.number,
+};
+
+LoadingBlocks.defaultProps = {
+  fixed: null,
+  max: 5,
+  min: 2,
+};
+
+export default LoadingBlocks;
diff --git a/modules/webgui/web/src/components/common/LoadingString/LoadingString.jsx b/modules/webgui/web/src/components/common/LoadingString/LoadingString.jsx
new file mode 100644
index 0000000000..1532ee7130
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingString/LoadingString.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './LoadingString.scss';
+
+const LoadingString = ({ children, loading }) => (
+  <span className={loading ? styles.loading : styles.loaded}>
+    { children }
+  </span>
+);
+
+LoadingString.propTypes = {
+  children: PropTypes.node,
+  loading: PropTypes.bool,
+};
+
+LoadingString.defaultProps = {
+  children: 'Loading...',
+  loading: false,
+};
+
+export default LoadingString;
diff --git a/modules/webgui/web/src/components/common/LoadingString/LoadingString.scss b/modules/webgui/web/src/components/common/LoadingString/LoadingString.scss
new file mode 100644
index 0000000000..3e4b90830d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingString/LoadingString.scss
@@ -0,0 +1,20 @@
+@import "../../../styles/all";
+
+.loadingBackground {
+  animation: $loading-animation;
+  background: linear-gradient(to right, rgba(255, 255, 255, 0.1) 0%,
+                                        rgba(255, 255, 255, 0.2) 40%,
+                                        rgba(255, 255, 255, 0.1) 45%);
+  background-size: 400px;
+}
+
+.loading {
+  @extend .loadingBackground;
+  color: transparent;
+  min-width: 5em;
+  text-shadow: none;
+}
+
+.loaded {
+  animation: $fade-in-animation;
+}
diff --git a/modules/webgui/web/src/components/common/LoadingString/LoadingString.story.jsx b/modules/webgui/web/src/components/common/LoadingString/LoadingString.story.jsx
new file mode 100644
index 0000000000..d611420970
--- /dev/null
+++ b/modules/webgui/web/src/components/common/LoadingString/LoadingString.story.jsx
@@ -0,0 +1,16 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import LoadingString from './LoadingString';
+
+/* globals module */
+
+storiesOf('LoadingString', module)
+  .addDecorator(story => (
+    <div style={{ background: '#252525', padding: '20px', color: 'white' }}>
+      { story() }
+    </div>
+  ))
+  .add('Loading', () => (<LoadingString loading>With text</LoadingString>))
+  .add('Loading with default text content', () => (<LoadingString loading />))
+  .add('loaded', () => (<LoadingString>Animates in!</LoadingString>));
diff --git a/modules/webgui/web/src/components/common/Overlay/Overlay.jsx b/modules/webgui/web/src/components/common/Overlay/Overlay.jsx
new file mode 100644
index 0000000000..2c6a445f8f
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Overlay/Overlay.jsx
@@ -0,0 +1,12 @@
+// @flow
+import React, { Element } from 'react';
+
+import styles from './Overlay.scss';
+
+const Overlay = (props: { children: Element<any> }): Element<any> => (
+  <div className={styles.messageOverlay}>
+    { props.children }
+  </div>
+);
+
+export default Overlay;
diff --git a/modules/webgui/web/src/components/common/Overlay/Overlay.scss b/modules/webgui/web/src/components/common/Overlay/Overlay.scss
new file mode 100644
index 0000000000..ce73781b5d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Overlay/Overlay.scss
@@ -0,0 +1,21 @@
+@import "../../../styles/all";
+
+.messageOverlay {
+  align-items: center;
+  animation: $fade-in-animation;
+  justify-content: center;
+  background: rgba(black, 0.8);
+  display: flex;
+  height: 100vh;
+  left: 0;
+  position: fixed;
+  top: 0;
+  width: 100vw;
+  z-index: 100;
+}
+
+.messageOverlay > * {
+  max-height: 100%;
+  max-width: 300px;
+  width: 100%;
+}
diff --git a/modules/webgui/web/src/components/common/Popover/Popover.jsx b/modules/webgui/web/src/components/common/Popover/Popover.jsx
new file mode 100644
index 0000000000..bee63d0e8a
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Popover/Popover.jsx
@@ -0,0 +1,94 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+
+import { excludeKeys } from '../../../utils/helpers';
+import Icon from '../Icon/Icon';
+import styles from './Popover.scss';
+import Button from '../Input/Button/Button';
+import Window from '../Window/Window';
+
+const findStyles = arr => arr.split(' ')
+  .map(style => styles[style] || style)
+  .join(' ');
+
+class Popover extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { isDetached: false };
+    this.toggleDetach = this.toggleDetach.bind(this);
+  }
+
+  get arrowStyle() {
+    return findStyles(this.props.arrow);
+  }
+
+  get styles() {
+    return findStyles(this.props.className);
+  }
+
+  get inheritedProps() {
+    const doNotInclude = 'title arrow closeCallback';
+    return excludeKeys(this.props, doNotInclude);
+  }
+
+  get asPopup() {
+    return (
+      <section {...this.inheritedProps} className={`${styles.popover} ${this.arrowStyle} ${this.styles}`}>
+        { this.props.title && (
+          <header>
+            <div className={styles.title}>
+              { this.props.title }
+            </div>
+
+            <div>
+              { this.props.detachable && (
+                <Button onClick={this.toggleDetach} transparent small>
+                  <Icon icon="filter_none" />
+                </Button>
+              )}
+              { this.props.closeCallback && (
+                <Button onClick={this.props.closeCallback} transparent small>
+                  <Icon icon="close" className="small" />
+                </Button>
+              )}
+            </div>
+          </header>
+        )}
+        { this.props.children }
+      </section>
+    );
+  }
+
+  get asWindow() {
+    return (<Window {...this.props}>{ this.props.children }</Window>);
+  }
+
+  toggleDetach() {
+    this.setState({ isDetached: !this.state.isDetached });
+  }
+
+  render() {
+    return this.state.isDetached ? this.asWindow : this.asPopup;
+  }
+}
+
+Popover.propTypes = {
+  arrow: PropTypes.string,
+  children: PropTypes.node.isRequired,
+  closeCallback: PropTypes.func,
+  className: PropTypes.string,
+  detachable: PropTypes.bool,
+  title: PropTypes.string,
+};
+
+Popover.defaultProps = {
+  arrow: 'arrow bottom center',
+  closeCallback: null,
+  className: '',
+  detachable: false,
+  title: null,
+};
+
+Popover.styles = styles;
+
+export default Popover;
diff --git a/modules/webgui/web/src/components/common/Popover/Popover.scss b/modules/webgui/web/src/components/common/Popover/Popover.scss
new file mode 100644
index 0000000000..9d85bc0a53
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Popover/Popover.scss
@@ -0,0 +1,84 @@
+@import '../../../styles/all';
+
+$background: $ui-background-solid;
+$arrow-size: $popover-arrow-size;
+$popover-corner-radius: $arrow-size / 2;
+
+$padding-horizontal: 0.3rem;
+$padding-vertical: 0.5rem;
+$padding: $padding-horizontal $padding-vertical;
+
+.popover {
+  background: $background;
+  border-radius: $popover-corner-radius;
+  box-shadow: $box-shadow;
+  color: $text-color-focus;
+  max-width: 300px;
+
+  &.small {
+    max-width: 150px;
+  }
+
+  > :last-child {
+    padding-bottom: $popover-corner-radius;
+  }
+}
+
+.popover header {
+  display: flex;
+  justify-content: space-between;
+}
+
+.title {
+  font-weight: 600;
+  font-size: 0.8rem;
+  letter-spacing: 0.1em;
+  padding: $padding;
+  text-transform: uppercase;
+}
+
+.popover p, .content {
+  padding: 0 $padding-horizontal;
+}
+
+.delimiter {
+  margin: ($base-padding / 3) 0;
+  border: 1px solid $ui-background-hover;
+}
+
+.row {
+  display: flex;
+
+  * + * {
+    margin-left: $popover-corner-radius;
+  }
+}
+
+.popover.arrow {
+  &:after {
+    border-color: transparent;
+    border-style: solid;
+    border-width: $arrow-size;
+    content: " ";
+    height: 0;
+    margin-left: -$arrow-size;
+    pointer-events: none;
+    position: absolute;
+    width: 0;
+  }
+
+  &.bottom:after {
+    top: 100%;
+    left: 50%;
+    border-top-color: $background;
+  }
+
+  &.bottom.leftside:after {
+    left: $arrow-size * 2;
+  }
+
+  &.bottom.rightside:after {
+    left: auto;
+    right: $arrow-size * 2;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Popover/Popover.story.jsx b/modules/webgui/web/src/components/common/Popover/Popover.story.jsx
new file mode 100644
index 0000000000..fa7d4defd6
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Popover/Popover.story.jsx
@@ -0,0 +1,15 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Popover from './Popover';
+
+/* globals module */
+
+storiesOf('Popover', module)
+  .add('default (arrow bottom center)', () => (<Popover>Hello!</Popover>))
+  .add('arrow bottom left', () => (<Popover arrow="arrow bottom leftside">Hello!</Popover>))
+  .add('arrow bottom right', () => (<Popover arrow="arrow bottom rightside">Hello!</Popover>))
+  .add('small', () => (<Popover arrow="arrow bottom rightside" className="small">Hello!</Popover>))
+  .add('with title', () => (<Popover title="title" closeCallback={action('close')}>Hello!</Popover>))
+  .add('no arrow', () => (<Popover arrow="">Hello!</Popover>));
diff --git a/modules/webgui/web/src/components/common/PropertyString/PropertyString.jsx b/modules/webgui/web/src/components/common/PropertyString/PropertyString.jsx
new file mode 100644
index 0000000000..9aa42aaf75
--- /dev/null
+++ b/modules/webgui/web/src/components/common/PropertyString/PropertyString.jsx
@@ -0,0 +1,53 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import LoadingString from '../LoadingString/LoadingString';
+import DataManager from '../../../api/DataManager';
+
+/**
+ * display the value of a property in an effortless way
+ */
+class PropertyString extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = { value: props.defaultValue, hasValue: false };
+
+    this.callback = this.callback.bind(this);
+  }
+
+  componentDidMount() {
+    const { method, propertyKey } = this.props;
+    // get or subscribe to property
+    DataManager[method](propertyKey, this.callback);
+  }
+
+  componentWillUnmount() {
+    DataManager.unsubscribe(this.props.propertyKey, this.callback);
+  }
+
+  callback({ Value: value }) {
+    // console.log(value);
+    this.setState({ value, hasValue: true });
+  }
+
+  render() {
+    return (
+      <LoadingString loading={!this.state.hasValue}>
+        { this.state.value }
+      </LoadingString>
+    );
+  }
+}
+
+PropertyString.propTypes = {
+  defaultValue: PropTypes.string,
+  propertyKey: PropTypes.string.isRequired,
+  method: PropTypes.oneOf(['getValue', 'subscribe']),
+};
+
+PropertyString.defaultProps = {
+  defaultValue: 'loading',
+  method: 'getValue',
+};
+
+export default PropertyString;
diff --git a/modules/webgui/web/src/components/common/Row/Row.jsx b/modules/webgui/web/src/components/common/Row/Row.jsx
new file mode 100644
index 0000000000..02b103543f
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Row/Row.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from './Row.scss';
+
+const Row = props => (
+  <div {...props} className={`${styles.row} ${props.className}`}>
+    { props.children }
+  </div>
+);
+
+Row.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+Row.defaultProps = {
+  className: '',
+};
+
+export default Row;
diff --git a/modules/webgui/web/src/components/common/Row/Row.scss b/modules/webgui/web/src/components/common/Row/Row.scss
new file mode 100644
index 0000000000..54a74f0628
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Row/Row.scss
@@ -0,0 +1,9 @@
+.row {
+  display: flex;
+  flex-wrap: nowrap;
+  width: 100%;
+
+  > * + * {
+    margin-left: 3px;
+  }
+}
diff --git a/modules/webgui/web/src/components/common/Row/Row.story.jsx b/modules/webgui/web/src/components/common/Row/Row.story.jsx
new file mode 100644
index 0000000000..a3018cf1fe
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Row/Row.story.jsx
@@ -0,0 +1,17 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+/* eslint react/prop-types: 0 */
+/* globals module */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import Row from './Row';
+
+const Block = ({ children }) => (<div style={{ background: 'lightgray' }}>{ children }</div>);
+
+storiesOf('Row', module)
+  .add('default', () => (
+    <Row>
+      <Block>block in a row</Block>
+      <Block>another block in a row</Block>
+      <Block>the third block in a row.</Block>
+      <Block>nr 4. margin to the left of things!</Block>
+    </Row>));
diff --git a/modules/webgui/web/src/components/common/ScrollOverlay/ScrollOverlay.jsx b/modules/webgui/web/src/components/common/ScrollOverlay/ScrollOverlay.jsx
new file mode 100644
index 0000000000..8f2324b264
--- /dev/null
+++ b/modules/webgui/web/src/components/common/ScrollOverlay/ScrollOverlay.jsx
@@ -0,0 +1,103 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { defer } from '../../../utils/helpers';
+import styles from './ScrollOverlay.scss';
+
+/**
+ * Limit the vertical space an element, or a set of element, may take.
+ * Adds a scroll bar and indicators for more content.
+ *
+ * Exposes the global CSS class `scroll-content`, so that it may be styled.
+ */
+class ScrollOverlay extends Component {
+  static get elementId() {
+    // eslint-disable-next-line no-plusplus
+    return `scroll-overlay-${ScrollOverlay.elementCount++}`;
+  }
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      id: ScrollOverlay.elementId,
+      atTop: true,
+      atBottom: false,
+    };
+    this.setDomNode = this.setDomNode.bind(this);
+    this.updateScrollIndicators = this.updateScrollIndicators.bind(this);
+  }
+
+  componentWillReceiveProps() {
+    // defer this call so that the dom actually renders and the
+    // properties in `this.node` used in `updateScrollIndicators` are
+    // updated with the new props.
+    defer(this.updateScrollIndicators, this.node);
+  }
+
+  setDomNode(node) {
+    if (node) {
+      this.node = node;
+      this.node.addEventListener('scroll', ({ target }) => this.updateScrollIndicators(target));
+      defer(this.updateScrollIndicators, this.node);
+    }
+  }
+
+  /**
+   * decide if the scroll indicators should be shown or not
+   * @param target - the `.scroll-content` node
+   */
+  updateScrollIndicators(target) {
+    // compare using `< 1` instead of `=== 0` because floating point precision
+    const bottomHeight = target.scrollTop + target.clientHeight;
+    const atBottom = Math.abs(bottomHeight - target.scrollHeight) < 1;
+    const atTop = target.scrollTop === 0;
+    this.setState({ atTop, atBottom });
+  }
+
+  get hasScrollBar() {
+    if (!this.node || !this.node.scrollHeight) {
+      return false;
+    }
+
+    return this.node.clientHeight < this.node.scrollHeight;
+  }
+
+  get stateClasses() {
+    if (!this.hasScrollBar) return false;
+
+    let classes = '';
+    if (!this.state.atBottom) {
+      classes += `${styles.notAtBottom} `;
+    }
+    if (!this.state.atTop) {
+      classes += styles.notAtTop;
+    }
+
+    return classes;
+  }
+
+  render() {
+    return (
+      <div
+        className={`scroll-content ${this.props.className} ${styles.ScrollOverlay} ${this.stateClasses}`}
+        id={this.state.id}
+        ref={this.setDomNode}
+      >
+        { this.props.children }
+      </div>
+    );
+  }
+}
+
+ScrollOverlay.elementCount = 0;
+
+ScrollOverlay.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+ScrollOverlay.defaultProps = {
+  className: '',
+};
+
+export default ScrollOverlay;
diff --git a/modules/webgui/web/src/components/common/ScrollOverlay/ScrollOverlay.scss b/modules/webgui/web/src/components/common/ScrollOverlay/ScrollOverlay.scss
new file mode 100644
index 0000000000..afe7dbb40d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/ScrollOverlay/ScrollOverlay.scss
@@ -0,0 +1,31 @@
+@import '../../../styles/all';
+
+.ScrollOverlay {
+  overflow-y: auto;
+  overflow-x: hidden;
+  position: relative;
+
+  &::before,
+  &::after {
+    content: " ";
+    pointer-events: none;
+    z-index: 22;
+  }
+}
+
+.notAtTop::before {
+  animation: $fade-in-animation;
+  background: linear-gradient(to top, transparent, $ui-background-solid);
+  height: 2 * $base-padding;
+  position: fixed;
+  width: unquote("calc(100% - #{$scrollbar-width})");
+}
+
+.notAtBottom::after {
+  animation: $fade-in-animation;
+  background: linear-gradient(to top, $ui-background-solid, transparent);
+  height: 2 * $base-padding;
+  position: fixed;
+  bottom: 0;
+  width: unquote("calc(100% - #{$scrollbar-width})");
+}
diff --git a/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.jsx b/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.jsx
new file mode 100644
index 0000000000..349255e645
--- /dev/null
+++ b/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import styles from './SmallLabel.scss';
+
+const SmallLabel = (props) => {
+  const { children } = props;
+  return (
+    <span {...props} className={styles.SmallLabel}>
+      { children }
+    </span>
+  );
+};
+
+SmallLabel.propTypes = {
+  children: PropTypes.node,
+};
+
+SmallLabel.defaultProps = {
+  children: [],
+};
+
+export default SmallLabel;
diff --git a/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.scss b/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.scss
new file mode 100644
index 0000000000..45a6525ff5
--- /dev/null
+++ b/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.scss
@@ -0,0 +1,7 @@
+.SmallLabel {
+  font-size: 0.7rem;
+  letter-spacing: 0.15em;
+  line-height: 1;
+  padding-top: 0.3em;
+  text-transform: uppercase;
+}
diff --git a/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.story.jsx b/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.story.jsx
new file mode 100644
index 0000000000..d6c07ff593
--- /dev/null
+++ b/modules/webgui/web/src/components/common/SmallLabel/SmallLabel.story.jsx
@@ -0,0 +1,11 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import SmallLabel from './SmallLabel';
+/* globals module */
+
+storiesOf('SmallLabel', module)
+  .add('no options', () => (<SmallLabel>Hello</SmallLabel>))
+  .add('with some props', () => (
+    <SmallLabel style={{ color: 'red' }} onClick={action('clicked')}>Click me!</SmallLabel>));
diff --git a/modules/webgui/web/src/components/common/Stack/Stack.jsx b/modules/webgui/web/src/components/common/Stack/Stack.jsx
new file mode 100644
index 0000000000..36eb27336b
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Stack/Stack.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from './Stack.scss';
+
+const Stack = props => (
+  <div {...props} className={`${styles.stack} ${props.className}`}>
+    { props.children }
+  </div>
+);
+
+Stack.propTypes = {
+  children: PropTypes.node.isRequired,
+  className: PropTypes.string,
+};
+
+Stack.defaultProps = {
+  className: '',
+};
+
+export default Stack;
diff --git a/modules/webgui/web/src/components/common/Stack/Stack.scss b/modules/webgui/web/src/components/common/Stack/Stack.scss
new file mode 100644
index 0000000000..784fd3b1ab
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Stack/Stack.scss
@@ -0,0 +1,4 @@
+.stack {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/modules/webgui/web/src/components/common/ToggleContent/ToggleContent.jsx b/modules/webgui/web/src/components/common/ToggleContent/ToggleContent.jsx
new file mode 100644
index 0000000000..b3b293c1bc
--- /dev/null
+++ b/modules/webgui/web/src/components/common/ToggleContent/ToggleContent.jsx
@@ -0,0 +1,48 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import ToggleHeader from './ToggleHeader';
+
+import styles from './ToggleContent.scss';
+
+class ToggleContent extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      toggled: props.show,
+    };
+
+    this.toggleExpanded = this.toggleExpanded.bind(this);
+  }
+
+  toggleExpanded() {
+    this.setState({ toggled: !this.state.toggled });
+  }
+
+  render() {
+    const { children, title } = this.props;
+    const { toggled } = this.state;
+
+    return children.length !== 0 ? (
+      <div className={styles.toggleContent}>
+        <ToggleHeader title={title} onClick={this.toggleExpanded} toggled={toggled} />
+        <div className={styles.content}>
+          { toggled && children }
+        </div>
+      </div>
+    ) : null;
+  }
+}
+
+ToggleContent.propTypes = {
+  children: PropTypes.node,
+  show: PropTypes.bool,
+  title: PropTypes.string.isRequired,
+};
+
+ToggleContent.defaultProps = {
+  children: '',
+  show: false,
+};
+
+export default ToggleContent;
diff --git a/modules/webgui/web/src/components/common/ToggleContent/ToggleContent.scss b/modules/webgui/web/src/components/common/ToggleContent/ToggleContent.scss
new file mode 100644
index 0000000000..09f9a20b91
--- /dev/null
+++ b/modules/webgui/web/src/components/common/ToggleContent/ToggleContent.scss
@@ -0,0 +1,11 @@
+@import "../../../styles/all";
+
+$border-width: 2px;
+
+.toggleContent:hover > header {
+  background: $ui-background-active;
+}
+
+.content {
+  padding-left: $sidebar-padding;
+}
diff --git a/modules/webgui/web/src/components/common/ToggleContent/ToggleHeader.jsx b/modules/webgui/web/src/components/common/ToggleContent/ToggleHeader.jsx
new file mode 100644
index 0000000000..b2d6950a9d
--- /dev/null
+++ b/modules/webgui/web/src/components/common/ToggleContent/ToggleHeader.jsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Icon from '../Icon/Icon';
+
+import styles from './ToggleHeader.scss';
+
+const ToggleHeader = ({ title, toggled, onClick, onIcon, offIcon }) => (
+  <header className={styles.toggle} onClick={onClick} role="button" tabIndex={0}>
+    <span className="title">
+      { title }
+    </span>
+    <Icon
+      icon={toggled ? onIcon : offIcon}
+      className={styles.icon}
+    />
+  </header>
+);
+
+ToggleHeader.propTypes = {
+  offIcon: PropTypes.string,
+  onClick: PropTypes.func.isRequired,
+  onIcon: PropTypes.string,
+  title: PropTypes.string.isRequired,
+  toggled: PropTypes.bool.isRequired,
+};
+
+ToggleHeader.defaultProps = {
+  offIcon: 'chevron_left',
+  onIcon: 'expand_more',
+};
+
+export default ToggleHeader;
diff --git a/modules/webgui/web/src/components/common/ToggleContent/ToggleHeader.scss b/modules/webgui/web/src/components/common/ToggleContent/ToggleHeader.scss
new file mode 100644
index 0000000000..fcf89250c8
--- /dev/null
+++ b/modules/webgui/web/src/components/common/ToggleContent/ToggleHeader.scss
@@ -0,0 +1,22 @@
+@import "../../../styles/all";
+
+.toggle {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  padding: $sidebar-padding;
+
+  &:hover {
+    background: $ui-background-hover;
+  }
+
+  &:focus {
+    outline: 0;
+  }
+}
+
+.icon {
+  color: $text-color-blur;
+  font-size: 18px;
+}
+
diff --git a/modules/webgui/web/src/components/common/Tooltip/Tooltip.jsx b/modules/webgui/web/src/components/common/Tooltip/Tooltip.jsx
new file mode 100644
index 0000000000..e2d394b572
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Tooltip/Tooltip.jsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import styles from './Tooltip.scss';
+import { excludeKeys } from '../../../utils/helpers';
+
+const Tooltip = (props) => {
+  const { children, placement, fixed } = props;
+  return (
+    <div
+      {...excludeKeys(props, 'placement fixed')}
+      className={`${styles.tooltip} ${styles[placement]} ${fixed && styles.fixed}`}
+    >
+      { children }
+    </div>
+  );
+};
+
+Tooltip.propTypes = {
+  children: PropTypes.node.isRequired,
+  placement: PropTypes.oneOf('top right bottom left'.split(' ')),
+  fixed: PropTypes.bool,
+};
+
+Tooltip.defaultProps = {
+  placement: 'top',
+  fixed: false,
+};
+
+export default Tooltip;
diff --git a/modules/webgui/web/src/components/common/Tooltip/Tooltip.scss b/modules/webgui/web/src/components/common/Tooltip/Tooltip.scss
new file mode 100644
index 0000000000..0e916c8b42
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Tooltip/Tooltip.scss
@@ -0,0 +1,80 @@
+@import "../../../styles/all";
+
+$arrow-size: 4px;
+$background: $ui-background-solid;
+
+.tooltip {
+  background: $background;
+  border-radius: $arrow-size;
+  color: $text-color-focus;
+  font-size: 0.8 * $font-size;
+  line-height: 1.4;
+  max-width: 150px;
+  padding: $arrow-size (2 * $arrow-size) (1.5 * $arrow-size);
+  position: absolute;
+  white-space: normal;
+  z-index: 10;
+}
+
+// placement
+.top {
+  bottom: unquote("calc(100% + #{$arrow-size})");
+  transform: translateX(-50%);
+}
+
+.bottom {
+  top: unquote("calc(100% + #{$arrow-size})");
+  transform: translateX(-50%);
+}
+
+.right {
+  left: unquote("calc(100% + #{$arrow-size})");
+  transform: translateY(-50%);
+}
+
+.left {
+  right: unquote("calc(100% + #{$arrow-size})");
+  transform: translateY(-50%);
+}
+
+.fixed {
+  position: fixed !important;
+}
+
+// arrow style
+.tooltip::after {
+  border-color: transparent;
+  border-style: solid;
+  border-width: $arrow-size;
+  content: " ";
+  height: 0;
+  margin-left: -$arrow-size;
+  pointer-events: none;
+  position: absolute;
+  width: 0;
+}
+
+// arrow placement style
+.top::after {
+  top: 100%;
+  left: 50%;
+  border-top-color: $background;
+}
+
+.right::after {
+  top: 50%;
+  right: 100%;
+  border-right-color: $background;
+}
+
+.left::after {
+  top: 50%;
+  left: 100%;
+  border-left-color: $background;
+}
+
+.bottom::after {
+  bottom: 100%;
+  left: 50%;
+  border-bottom-color: $background;
+}
diff --git a/modules/webgui/web/src/components/common/Window/Window.jsx b/modules/webgui/web/src/components/common/Window/Window.jsx
new file mode 100644
index 0000000000..6a5f37b5a3
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Window/Window.jsx
@@ -0,0 +1,63 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Draggable from 'react-draggable';
+import styles from './Window.scss';
+import Icon from '../Icon/Icon';
+import Button from '../Input/Button/Button';
+import { excludeKeys } from '../../../utils/helpers';
+
+const Window = (props) => {
+  const { children, title, closeCallback, className, size, position } = props;
+  return (
+    <Draggable defaultPosition={position} handle=".header">
+      <section
+        className={`${styles.window} ${className}`}
+        style={{
+          width: size.width,
+          height: size.height,
+        }}
+        {...excludeKeys(props, 'children title callback className')}
+      >
+        <header className="header">
+          <div className={styles.title}>
+            { title }
+          </div>
+          { closeCallback && (
+            <Button onClick={closeCallback} transparent small>
+              <Icon icon="close" className="small" />
+            </Button>
+          )}
+        </header>
+        <section className={styles.filler}>
+          { children }
+        </section>
+      </section>
+    </Draggable>
+  );
+}
+
+Window.propTypes = {
+  children: PropTypes.node,
+  closeCallback: PropTypes.func,
+  className: PropTypes.string,
+  position: PropTypes.shape({
+    x: PropTypes.number,
+    y: PropTypes.number,
+  }),
+  size: PropTypes.shape({
+    height: PropTypes.number,
+    width: PropTypes.number,
+  }),
+  title: PropTypes.string,
+};
+
+Window.defaultProps = {
+  children: '',
+  closeCallback: null,
+  className: '',
+  position: { x: 10, y: 10 },
+  size: { height: 'auto', width: '300px' },
+  title: 'Window',
+};
+
+export default Window;
diff --git a/modules/webgui/web/src/components/common/Window/Window.scss b/modules/webgui/web/src/components/common/Window/Window.scss
new file mode 100644
index 0000000000..977ce5d8e7
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Window/Window.scss
@@ -0,0 +1,28 @@
+@import "../../../styles/all";
+@import "../Popover/Popover";
+
+.window {
+  background: $background;
+  border-radius: $popover-corner-radius;
+  box-shadow: $box-shadow;
+  color: $text-color-focus;
+  max-width: 300px;
+
+  &.small {
+    max-width: 150px;
+  }
+
+  > :last-child {
+    padding-bottom: $popover-corner-radius;
+  }
+}
+
+.window > header {
+  display: flex;
+  justify-content: space-between;
+}
+
+.filler {
+  width: 100%;
+  height: 100%;
+}
diff --git a/modules/webgui/web/src/components/common/Window/Window.story.jsx b/modules/webgui/web/src/components/common/Window/Window.story.jsx
new file mode 100644
index 0000000000..6337f728fa
--- /dev/null
+++ b/modules/webgui/web/src/components/common/Window/Window.story.jsx
@@ -0,0 +1,16 @@
+/* eslint import/no-extraneous-dependencies: 0 */
+/* eslint react/prop-types: 0 */
+/* globals module */
+import React from 'react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import Window from './Window';
+
+storiesOf('Window', module)
+  .add('default', () => (<Window>hello</Window>))
+  .add('with closecallback', () =>
+    (<Window closeCallback={action('close')}>hello</Window>))
+  .add('with initial position', () =>
+    (<Window position={{ x: 100, y: 150 }}>hello</Window>))
+  .add('with size', () =>
+    (<Window size={{ width: 100, height: 150 }}>hello</Window>));
diff --git a/modules/webgui/web/src/index.jsx b/modules/webgui/web/src/index.jsx
new file mode 100644
index 0000000000..4a9c8822bc
--- /dev/null
+++ b/modules/webgui/web/src/index.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Provider } from 'react-redux';
+import { createStore } from 'redux';
+// AppContainer is a necessary wrapper component for hot module reloading
+import { AppContainer } from 'react-hot-loader';
+import openspaceApp from './api/Reducers';
+import middleware from './api/Middleware';
+import App from './App';
+
+/* global document */
+
+const store = createStore(
+  openspaceApp,
+  middleware,
+);
+
+const render = (Component) => {
+  ReactDOM.render(
+    <Provider store={store} >
+      <AppContainer>
+        <Component />
+      </AppContainer>
+    </Provider>,
+    document.getElementById('root'),
+  );
+};
+
+render(App);
+
+// Hot Module Replacement API
+if (module.hot) {
+  module.hot.accept('./App', () => render(App));
+}
diff --git a/modules/webgui/web/src/styles/all.scss b/modules/webgui/web/src/styles/all.scss
new file mode 100644
index 0000000000..0166dd16f4
--- /dev/null
+++ b/modules/webgui/web/src/styles/all.scss
@@ -0,0 +1,5 @@
+@import "animations";
+@import "colors";
+@import "shadows";
+@import "metrics";
+@import "fonts";
diff --git a/modules/webgui/web/src/styles/animations.scss b/modules/webgui/web/src/styles/animations.scss
new file mode 100644
index 0000000000..b46b636a16
--- /dev/null
+++ b/modules/webgui/web/src/styles/animations.scss
@@ -0,0 +1,50 @@
+$animation-duration: 100ms;
+$loading-animation-duration: 2s;
+$animation-easing: cubic-bezier(0.4, 0.0, 0.2, 1);
+$loading-easing: linear;
+
+$background-transition: background $animation-duration $animation-easing;
+$loading-animation: loading-pulse $loading-animation-duration $loading-easing infinite;
+$fade-in-animation: fade-in $animation-duration $animation-easing;
+$appear-animation: appear $animation-duration $animation-easing;
+$slide-up-animation: slide-up 1000ms $animation-easing;
+
+@keyframes loading-pulse {
+  0% {
+    background-position: -400px 0;
+  }
+  100% {
+    background-position: 400px 0;
+  }
+}
+
+@keyframes fade-in {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes appear {
+  0% {
+    opacity: 0;
+    transform: translateY(5%) scale(0.9);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
+@keyframes slide-up {
+  0% {
+    opacity: 0;
+    transform: translateY(20%);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
diff --git a/modules/webgui/web/src/styles/base.scss b/modules/webgui/web/src/styles/base.scss
new file mode 100644
index 0000000000..a7e586da54
--- /dev/null
+++ b/modules/webgui/web/src/styles/base.scss
@@ -0,0 +1,49 @@
+@import "all";
+
+:global {
+  * {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+  }
+
+  *,
+  :not(input) {
+    user-select: none;
+  }
+
+  html {
+    font-size: $font-size;
+  }
+
+  html, body, #root {
+    height: 100vh;
+    width: 100vw;
+    overflow: hidden;
+  }
+
+  ::-webkit-scrollbar {
+    width: $scrollbar-width;
+    background-color: rgba(0,0,0,0);
+    -webkit-border-radius: 100px;
+  }
+
+  ::-webkit-scrollbar:hover {
+    background-color: rgba(145, 145, 145, 0.6);;
+  }
+
+  ::-webkit-scrollbar-thumb:vertical {
+    background: rgba(0,0,0,0.5);
+    -webkit-border-radius: 100px;
+    background-clip: padding-box;
+    border: 2px solid rgba(0, 0, 0, 0);
+    min-height: 20px;
+  }
+
+  ::-webkit-scrollbar-thumb:vertical:active {
+    background: rgba(0,0,0,0.61); /* Some darker color when you click it */
+    -webkit-border-radius: 100px;
+  }
+}
diff --git a/modules/webgui/web/src/styles/colors.scss b/modules/webgui/web/src/styles/colors.scss
new file mode 100644
index 0000000000..5d9f312ae7
--- /dev/null
+++ b/modules/webgui/web/src/styles/colors.scss
@@ -0,0 +1,27 @@
+// color definitions
+$dark-grey: #252525;
+$green: #D9DA6D;
+$blue: #3DBDEE;
+$red: #FF4136;
+$orange: #FF851B;
+
+// color usage
+$ui-background-solid: $dark-grey;
+$ui-background: rgba($ui-background-solid, 0.9);
+$ui-background-hover: rgba(white, 0.1);
+$ui-background-selected: rgba(white, 0.05);
+$ui-background-active: rgba(black, 0.1);
+
+$ui-danger: $red;
+$ui-warning: $orange;
+
+$ui-divider: darken($ui-background, 1%);
+
+$ui-highlight-primary: $green;
+$ui-highlight-secondary: $blue;
+
+$text-color-focus: white;
+$text-color-blur: darken($text-color-focus, 40%);
+
+$input-text-color-focus: $text-color-focus;
+$input-text-color-blur: $text-color-blur;
diff --git a/modules/webgui/web/src/styles/fonts.scss b/modules/webgui/web/src/styles/fonts.scss
new file mode 100644
index 0000000000..3bb1bf03e2
--- /dev/null
+++ b/modules/webgui/web/src/styles/fonts.scss
@@ -0,0 +1,3 @@
+$font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+              "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans",
+              "Helvetica Neue", sans-serif;
diff --git a/modules/webgui/web/src/styles/metrics.scss b/modules/webgui/web/src/styles/metrics.scss
new file mode 100644
index 0000000000..dda725ec23
--- /dev/null
+++ b/modules/webgui/web/src/styles/metrics.scss
@@ -0,0 +1,33 @@
+// metrics
+$bottom-bar-height: 60px;
+$sidebar-tab-height: 60px;
+
+$font-size: 14px;
+
+// padding
+$base-padding: 14px;
+$vertical-padding: $base-padding / 2;
+$button-padding: $vertical-padding $base-padding;
+$sidebar-padding: ($base-padding / 2);
+
+// popover
+$popover-horizontal-padding: $base-padding / 2;
+$popover-arrow-size: 0.5rem;
+$popover-corner-radius: $popover-arrow-size / 2;
+
+// element-specific config
+$scrollbar-width: 10px;
+
+// Input
+$input-font-size: 13px;
+// the font size of the label
+$input-label-size: 10px;
+// total margin above and below input label
+$input-label-margin: 6px;
+// thickness of the loading indicating border
+$input-loading-border-width: 2px;
+// padding
+$input-padding-horizontal: 7px;
+$input-padding-vertical: $base-padding * 2;
+
+$input-total-height: $input-padding-vertical + $input-font-size;
diff --git a/modules/webgui/web/src/styles/shadows.scss b/modules/webgui/web/src/styles/shadows.scss
new file mode 100644
index 0000000000..8d42fd9884
--- /dev/null
+++ b/modules/webgui/web/src/styles/shadows.scss
@@ -0,0 +1 @@
+$box-shadow: 0 2px 10px rgba(black,  25%);
diff --git a/modules/webgui/web/src/utils/StringMatchers.js b/modules/webgui/web/src/utils/StringMatchers.js
new file mode 100644
index 0000000000..9d8b8241ec
--- /dev/null
+++ b/modules/webgui/web/src/utils/StringMatchers.js
@@ -0,0 +1,9 @@
+// @flow
+
+/**
+ * Check if search is a substring of test
+ * @param test - string to match against
+ * @param search - string to match with
+ * @constructor
+ */
+export const SimpleSubstring = (test: string, search: string): bool => test.includes(search);
diff --git a/modules/webgui/web/src/utils/helpers.js b/modules/webgui/web/src/utils/helpers.js
new file mode 100644
index 0000000000..6ef898731e
--- /dev/null
+++ b/modules/webgui/web/src/utils/helpers.js
@@ -0,0 +1,37 @@
+// @flow
+
+export function excludeKeys(value: Object, keys: string): Object {
+  const doNotInclude = keys.split(' ');
+  return Object.keys(value)
+    // actually filter out the keywords
+    .filter(key => !doNotInclude.includes(key))
+    // create new object to return
+    .reduce((newObj, key) => {
+      // eslint-disable-next-line no-param-reassign
+      newObj[key] = value[key];
+      return newObj;
+    }, {});
+}
+
+/**
+ * Run a function `func` after current call stack has been finished
+ *
+ * @param func - the function to call
+ * @param args - the arguments to call with
+ */
+export const defer = (func: Function, ...args: Array<mixed>): number =>
+  setTimeout(() => func(...args), 0);
+
+/**
+ * rotate the positions in array arr
+ * @param arr
+ * @param steps - number of steps
+ * @returns {Array.<any>}
+ */
+export const rotate = (arr: Array<any>, steps: number): Array<any> => {
+  // make a shallow copy of the array
+  const copy = arr.slice();
+  const size = copy.length;
+  copy.unshift(...copy.splice(steps % size, size));
+  return copy;
+};
diff --git a/modules/webgui/web/src/utils/propertyTreeHelpers.js b/modules/webgui/web/src/utils/propertyTreeHelpers.js
new file mode 100644
index 0000000000..1091ec5f8b
--- /dev/null
+++ b/modules/webgui/web/src/utils/propertyTreeHelpers.js
@@ -0,0 +1,98 @@
+export const splitURI = (URI) => {
+  const indexForIdentifier = URI.indexOf('.');
+  const identifier = URI.substring(0, indexForIdentifier !== -1 ?
+    indexForIdentifier : URI.length);
+  const newURI = URI.substring(indexForIdentifier + 1, URI.length);
+
+  return { identifier, URI: newURI, isLastOwner: newURI.indexOf('.') === -1, isLastNode: URI.indexOf('.') === -1 };
+};
+
+export const getIdOfProperty = (URI) => {
+  const indexForIdentifier = URI.lastIndexOf('.');
+  return URI.substring(indexForIdentifier !== -1 ?
+    indexForIdentifier + 1 : 0, URI.length);
+};
+
+// Function to return a deep copy of an object
+export const keepCloning = (objectpassed) => {
+  if (objectpassed === null || typeof objectpassed !== 'object') {
+    return objectpassed;
+  }
+  // give temporary-storage the original obj's constructor
+  const temporaryStorage = objectpassed.constructor();
+  for (const key in objectpassed) {
+    temporaryStorage[key] = keepCloning(objectpassed[key]);
+  }
+  return temporaryStorage;
+};
+
+export const traverseTreeWithURI = (node, URI) => {
+  const splittedURI = splitURI(URI);
+  let tmpValue;
+  if (splittedURI.isLastNode) {
+    node.properties.forEach((element) => {
+      if (element.id === splittedURI.URI) {
+        tmpValue = element;
+      }
+    });
+    return tmpValue;
+  }
+  node.subowners.forEach((element) => {
+    if (element.identifier === splittedURI.identifier) {
+      if (splittedURI.isLastNode) { tmpValue = element; } else {
+        tmpValue = traverseTreeWithURI(element, splittedURI.URI);
+      }
+      return tmpValue;
+    }
+  });
+  return tmpValue;
+};
+
+// Conversion from json type array to lua
+export const jsonToLuaTable = json => json.replace('[', '').replace(']', '');
+
+export const jsonToLuaString = json => `"${json}"`;
+
+
+export const traverseTreeForTag = (node, tag) => {
+  let data;
+  node.subowners.map(element => {
+    data = traverseTreeForTag(element, tag);
+      if( element.tag.includes(tag)) {
+        data = element;
+      }
+    });
+  return data;
+};
+
+export const findAllNodesWithTag = (state, tag) => {
+  let nodes = [];
+  state.map(element => {
+      const data = traverseTreeForTag(element, tag);
+      if(data !== undefined) {
+        const returnValue = {
+          data,
+          identifier: element.identifier
+        }
+        nodes.push(returnValue);
+      }
+  })
+  return nodes;
+};
+
+// Convert envelopes in transfer function property to back end compatible format
+export const convertEnvelopes = (envelopes) => {
+  let convertedEnvelopes = keepCloning(envelopes);
+  convertedEnvelopes = convertedEnvelopes.map(envelope =>
+    Object.assign({},
+      { points: envelope.points.map(point =>
+        Object.assign({},
+          { color: point.color,
+            position: point.position,
+          }),
+      ),
+      },
+    ),
+  );
+  return JSON.stringify(convertedEnvelopes);
+};
diff --git a/modules/webgui/web/src/utils/rounding.js b/modules/webgui/web/src/utils/rounding.js
new file mode 100644
index 0000000000..90e7966aa9
--- /dev/null
+++ b/modules/webgui/web/src/utils/rounding.js
@@ -0,0 +1,35 @@
+/**
+ * Decimal adjustment of a number.
+ * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round
+ *
+ * @param type     The type of adjustment.
+ * @param value    The number.
+ * @param exponent The exponent (the 10 logarithm of the adjustment base). (Optional, default 0)
+ * @returns        The adjusted value.
+ */
+const decimalAdjust = (type: string, value: number, exponent: ?number = 0): number => {
+  // If the exp is undefined or zero...
+  if (+exponent === 0) {
+    return Math[type](value);
+  }
+  let returnValue = value;
+  returnValue = +returnValue;
+  const exp = +exponent;
+  // If the value is not a number or the exponent is not an integer...
+  if (isNaN(returnValue) || !(typeof exp === 'number' && exp % 1 === 0)) {
+    return NaN;
+  }
+  // If the value is negative...
+  if (returnValue < 0) {
+    return -decimalAdjust(type, -returnValue, exp);
+  }
+  // Shift
+  returnValue = returnValue.toString().split('e');
+  returnValue = Math[type](+`${returnValue[0]}e${returnValue[1] ? +returnValue[1] - exp : -exp}`);
+  // Shift back
+  returnValue = returnValue.toString().split('e');
+  return +(`${returnValue[0]}e${returnValue[1] ? (+returnValue[1] + exp) : exp}`);
+};
+export const round10 = (value, exponent) => decimalAdjust('round', value, exponent);
+export const floor10 = (value, exponent) => decimalAdjust('floor', value, exponent);
+export const ciel10 = (value, exponent) => decimalAdjust('ciel', value, exponent);
diff --git a/modules/webgui/web/src/views/About/About.jsx b/modules/webgui/web/src/views/About/About.jsx
new file mode 100644
index 0000000000..b5c81956b9
--- /dev/null
+++ b/modules/webgui/web/src/views/About/About.jsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import Row from '../../components/common/Row/Row';
+import styles from './About.scss';
+import logo from './logo.png';
+import { SCMInfoKey, VersionInfoKey } from '../../api/keys';
+import PropertyString from '../../components/common/PropertyString/PropertyString';
+
+console.log(VersionInfoKey, 'version')
+
+const About = () => (
+  <Row className={styles.about}>
+    <section>
+      <img src={logo} alt="OpenSpace Logo" className={styles.img} />
+    </section>
+    <section>
+      <h1>OpenSpace</h1>
+      <p>
+        <a href="http://openspaceproject.com" target="_blank" rel="noopener noreferrer">
+          openspaceproject.com
+        </a>
+      </p>
+      <p>
+        OpenSpace is open source interactive data
+        visualization software designed to visualize
+        the entire known universe and portray our
+        ongoing efforts to investigate the cosmos.
+      </p>
+      <p>
+        <PropertyString propertyKey={VersionInfoKey} /><br />
+        <PropertyString propertyKey={SCMInfoKey} />
+      </p>
+      <p>
+        &copy; 2014 - { (new Date()).getUTCFullYear() }
+        &nbsp;
+        <a href="http://openspaceproject.com/?page_id=24" target="_blank" rel="noopener noreferrer">
+          OpenSpace Development Team
+        </a>
+      </p>
+    </section>
+  </Row>
+);
+
+export default About;
diff --git a/modules/webgui/web/src/views/About/About.scss b/modules/webgui/web/src/views/About/About.scss
new file mode 100644
index 0000000000..d0d5f62f22
--- /dev/null
+++ b/modules/webgui/web/src/views/About/About.scss
@@ -0,0 +1,36 @@
+@import "../../styles/all";
+
+.about {
+  animation: $slide-up-animation;
+  max-width: 500px;
+  width: 100%;
+}
+
+.about section + section {
+  margin-left: 20px;
+}
+
+.about img {
+  width: 150px;
+}
+
+.about h1 {
+  font-size: 40px;
+  line-height: 1;
+  margin: 24px 0;
+}
+
+.about a {
+  box-shadow: inset 0 -3.3px 0 $blue;
+  color: inherit;
+  text-decoration: none;
+  transition: $background-transition;
+
+  &:hover {
+    background: $blue;
+  }
+}
+
+.about p + p {
+  margin-top: $font-size;
+}
diff --git a/modules/webgui/web/src/views/About/logo.png b/modules/webgui/web/src/views/About/logo.png
new file mode 100644
index 0000000000..bfff94e2ff
Binary files /dev/null and b/modules/webgui/web/src/views/About/logo.png differ
diff --git a/modules/webgui/web/src/views/NotFound.jsx b/modules/webgui/web/src/views/NotFound.jsx
new file mode 100644
index 0000000000..3fa41ca411
--- /dev/null
+++ b/modules/webgui/web/src/views/NotFound.jsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import Overlay from '../components/common/Overlay/Overlay';
+import Error from '../components/common/Error/Error';
+
+const NotFound = () => (
+  <Overlay>
+    <Error>
+      <h1>404</h1>
+      <p>
+        Snap! Something went wrong here.
+      </p>
+    </Error>
+  </Overlay>
+);
+
+export default NotFound;
diff --git a/modules/webgui/web/src/views/OnScreenGui.jsx b/modules/webgui/web/src/views/OnScreenGui.jsx
new file mode 100644
index 0000000000..1ee46f4fde
--- /dev/null
+++ b/modules/webgui/web/src/views/OnScreenGui.jsx
@@ -0,0 +1,75 @@
+import React, { Component } from 'react';
+import { withRouter, HashRouter as Router, Route, Link } from 'react-router-dom';
+import { connect } from 'react-redux';
+import '../styles/base.scss';
+import styles from './OnScreenGui.scss';
+import Sidebar from '../components/Sidebar/Sidebar';
+import BottomBar from '../components/BottomBar/BottomBar';
+import Error from '../components/common/Error/Error';
+import Overlay from '../components/common/Overlay/Overlay';
+import About from './About/About';
+import Stack from '../components/common/Stack/Stack';
+import { startConnection } from '../api/Actions';
+
+class OnScreenGui extends Component {
+  constructor(props) {
+    super(props);
+  }
+
+  componentDidMount() {
+    this.props.StartConnection();
+  }
+
+  render() {
+    return (
+      <div className={styles.app}>
+        <Router basename="/onscreen/">
+          <Route
+            path="/about"
+            render={() => (
+              <Overlay>
+                <Stack style={{ maxWidth: '500px' }}>
+                  <Link style={{ 'align-self': 'flex-end', color: 'white' }} to="/">
+                    Close
+                  </Link>
+                  <About />
+                </Stack>
+              </Overlay>
+            )}
+          />
+        </Router>
+
+        { this.props.connectionLost && (
+          <Overlay>
+            <Error>
+              Connection lost. Trying to reconnect again soon.
+            </Error>
+          </Overlay>
+        )}
+        <section className={styles.Grid__Left}>
+          <Sidebar />
+        </section>
+        <section className={styles.Grid__Right}>
+          <BottomBar />
+        </section>
+      </div>
+    );
+  }
+}
+
+const mapStateToProps = state => ({
+  connectionLost: state.connection.connectionLost,
+});
+
+const mapDispatchToProps = dispatch => ({
+  StartConnection: () => {
+    dispatch(startConnection());
+  },
+});
+
+OnScreenGui = withRouter(connect(
+  mapStateToProps,
+  mapDispatchToProps,
+)(OnScreenGui));
+
+export default OnScreenGui;
diff --git a/modules/webgui/web/src/views/OnScreenGui.scss b/modules/webgui/web/src/views/OnScreenGui.scss
new file mode 100644
index 0000000000..c8c0661d48
--- /dev/null
+++ b/modules/webgui/web/src/views/OnScreenGui.scss
@@ -0,0 +1,23 @@
+@import "../styles/all";
+
+.app {
+  color: white;
+  display: flex;
+  font-family: $font-family;
+  height: 100vh;
+  margin: 0;
+  padding: 0;
+  width: 100vw;
+}
+
+.Grid__Left {
+  width: 300px;
+}
+
+.Grid__Left,
+.Grid__Right {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  height: 100%;
+}
diff --git a/modules/webgui/web/transparent_test.html b/modules/webgui/web/transparent_test.html
new file mode 100644
index 0000000000..0b74583625
--- /dev/null
+++ b/modules/webgui/web/transparent_test.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <style>
+            html, body {
+                background-color: transparent;
+                height: 100%;
+                width: 100%;
+            }
+            #untransparent {
+                background-color: rgba(255, 255, 255, 0.5);
+                height: 100%;
+                width: 50%;
+            }
+        </style>
+    </head>
+    <body>
+        <div id="untransparent"></div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/modules/webgui/web/webpack.config.js b/modules/webgui/web/webpack.config.js
new file mode 100644
index 0000000000..6b2a3e8479
--- /dev/null
+++ b/modules/webgui/web/webpack.config.js
@@ -0,0 +1,87 @@
+const { resolve } = require('path');
+const webpack = require('webpack');
+
+const PublicPath = '/';
+
+module.exports = {
+  context: resolve(__dirname, 'src'),
+  entry: [
+    'react-hot-loader/patch',
+    'webpack-dev-server/client?http://localhost:8080',
+    'webpack/hot/only-dev-server',
+    './index.jsx',
+  ],
+  output: {
+    filename: 'static/bundle.js',
+    path: resolve(__dirname, 'dist'),
+    publicPath: PublicPath,
+  },
+  devtool: 'inline-source-map',
+  devServer: {
+    historyApiFallback: true,
+    hot: true,
+    contentBase: resolve(__dirname, 'dist'),
+    publicPath: PublicPath,
+  },
+  module: {
+    rules: [
+      // Load JS!
+      {
+        test: /\.jsx?$/,
+        use: ['babel-loader'],
+        exclude: /node_modules/,
+      },
+      // Load SASS!
+      {
+        test: /\.scss$/,
+        exclude: /node_modules/,
+        use: [
+          {
+            loader: 'style-loader',
+          }, {
+            loader: 'css-loader?modules',
+            options: {
+              sourceMap: true,
+              importLoaders: 2,
+              modules: true,
+              localIdentName: '[path][name]-[local]',
+              minimize: false,
+            },
+          }, {
+            loader: 'sass-loader',
+            options: {
+              sourceMap: true,
+            },
+          },
+        ],
+      },
+      {
+        test: /\.css$/,
+        use: ['style-loader', 'css-loader'],
+      },
+      {
+        test: /\.(woff|woff2|ttf|eot)$/,
+        loader: 'file-loader',
+        options: {
+          name: 'fonts/[name].[ext]',
+        },
+      },
+      {
+        test: /\.(png)$/,
+        loader: 'file-loader',
+        options: {
+          name: 'img/[name].[ext]',
+        },
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['.js', '.jsx'],
+  },
+  plugins: [
+    // enable HMR globally
+    new webpack.HotModuleReplacementPlugin(),
+    // prints more readable module names in the browser console on HMR updates
+    new webpack.NamedModulesPlugin(),
+  ],
+};
diff --git a/modules/webgui/web/webpack.config.production.js b/modules/webgui/web/webpack.config.production.js
new file mode 100644
index 0000000000..7e113d05cc
--- /dev/null
+++ b/modules/webgui/web/webpack.config.production.js
@@ -0,0 +1,39 @@
+const { resolve } = require('path');
+const webpack = require('webpack');
+
+module.exports = {
+    entry: './src/index.jsx',
+
+    output: {
+        filename: 'static/bundle.js',
+        // the output bundle
+
+        path: resolve(__dirname, 'dist'),
+
+        publicPath: '/'
+        // necessary for HMR to know where to load the hot update chunks
+    },
+
+    devtool: 'source-map',
+
+    module: {
+        rules: [
+            {
+                test: /\.jsx?$/,
+                use: [ 'babel-loader', ],
+                exclude: /node_modules/
+            },
+            {
+                test: /\.css$/,
+                use: [ 'style-loader', 'css-loader?modules', ],
+            },
+        ],
+    },
+
+    plugins: [
+        new webpack.optimize.UglifyJsPlugin({
+            sourceMap: true,
+            comments: false
+        })
+    ]
+};
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
new file mode 100644
index 0000000000..768944cc63
--- /dev/null
+++ b/modules/webgui/webguimodule.cpp
@@ -0,0 +1,36 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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 "webguimodule.h"
+
+namespace {
+const std::string _loggerCat = "WebGui";
+}
+
+namespace openspace {
+
+WebGuiModule::WebGuiModule() : OpenSpaceModule(WebGuiModule::Name) {}
+
+}
+
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
new file mode 100644
index 0000000000..f5f3f06dcc
--- /dev/null
+++ b/modules/webgui/webguimodule.h
@@ -0,0 +1,41 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * 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_WEBGUIMODULE_H
+#define OPENSPACE_WEBGUIMODULE_H
+
+#include <openspace/util/openspacemodule.h>
+#include <include/openspace/engine/configurationmanager.h>
+
+namespace openspace {
+
+class WebGuiModule : public OpenSpaceModule {
+public:
+    static constexpr const char* Name = "WebGui";
+    WebGuiModule();
+};
+
+}
+
+#endif //OPENSPACE_WEBGUIMODULE_H
diff --git a/openspace.cfg b/openspace.cfg
index f71fa86c58..160919cb3a 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -7,13 +7,13 @@ return {
     -- occurs in a single window, a fisheye projection, or a dome cluster system
 
     -- A regular 1280x720 window
-    SGCTConfig = sgct.config.single{},
+    SGCTConfig = sgct.config.single{tracked=true},
 
     -- A regular 1920x1080 window
-    -- SGCTConfig = sgct.config.single{1920, 1080},
-    
+    -- SGCTConfig = sgct.config.single{1920, 1080, tracked=true},
+
     -- A windowed 1920x1080 fullscreen
-    -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1"},
+    -- SGCTConfig = sgct.config.single{1920, 1080, border=false, windowPos={0,0}, shared=true, name="WV_OBS_SPOUT1", tracked=true},
 
     -- A 1k fisheye rendering
     -- SGCTConfig = sgct.config.fisheye{1024, 1024},
@@ -22,7 +22,7 @@ return {
     -- SGCTConfig = sgct.config.fisheye{1024, 1024, res={4096, 4096}, quality="2k", tilt=27},
 
     -- Streaming OpenSpace via Spout to OBS
-    -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"},
+    -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1", tracked=true},
 
     -- SGCTConfig = "${CONFIG}/spout_output.xml",
 
@@ -84,13 +84,13 @@ return {
     Launcher = {
         LogLevel = "None"
     },
-
     LuaDocumentation = "${DOCUMENTATION}/LuaScripting.html",
     PropertyDocumentation = "${DOCUMENTATION}/Properties.html",
     ScenePropertyDocumentation = "${DOCUMENTATION}/SceneProperties.html",
     KeyboardShortcuts = "${DOCUMENTATION}/KeyboardMapping.html",
     Documentation = "${DOCUMENTATION}/Documentation.html",
     FactoryDocumentation = "${DOCUMENTATION}/FactoryDocumentation.html",
+
     LicenseDocumentation = "${DOCUMENTATION}/License.html",
 
     UseMultithreadedInitialization = true,
@@ -125,7 +125,12 @@ return {
            { Type = "Deprecated", Source = "API", Identifier = 7} -- API_ID_LINE_WIDTH deprecated behavior warning has been generated
        },
 --      FilterSeverity = { }
+    },
+    --RenderingMethod = "ABuffer" -- alternative: "Framebuffer",
 
-    }
-    -- RenderingMethod = "ABuffer" -- alternative: "Framebuffer"
+    ServerPasskey = "secret!",
+    ClientAddressWhitelist = "127.0.0.1 localhost",
+    WebHelperLocation = "${BASE}/bin/Release/openspace_web_helper",
+    -- CefWebGuiUrl = "file://${BASE_PATH}/gui/index.html#/onscreen/"
+    CefWebGuiUrl = "http://localhost:8080/#/onscreen/"
 }
diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua
index 5268e0d35a..28e47e634e 100644
--- a/scripts/configuration_helper.lua
+++ b/scripts/configuration_helper.lua
@@ -94,10 +94,10 @@ function sgct.config.cube(arg) end
 ########################################################################################## 
 ]]--
 
-function generateSingleViewportFOV(down, up, left, right)
+function generateSingleViewportFOV(down, up, left, right, tracked)
     return
 [[
-<Viewport>
+<Viewport ]]..tracked..[[>
     <Pos x="0.0" y="0.0" />
     <Size x="1.0" y="1.0" />
     <PlanarProjection>
@@ -110,10 +110,10 @@ end
 
 
 
-function generateSingleViewport(lowerLeft, upperLeft, upperRight)
+function generateSingleViewport(lowerLeft, upperLeft, upperRight, tracked)
     return
 [[
-<Viewport>
+<Viewport ]]..tracked..[[>
     <Pos x="0.0" y="0.0" />
     <Size x="1.0" y="1.0" />
     <Projectionplane>
@@ -127,7 +127,7 @@ end
 
 
 
-function generateFisheyeViewport(fov, quality, tilt, background, crop, offset)
+function generateFisheyeViewport(fov, quality, tilt, background, crop, offset, trackedSpecifier)
     local b = [[
             <Background 
                 r="]]..background["r"]..[["
@@ -161,7 +161,7 @@ function generateFisheyeViewport(fov, quality, tilt, background, crop, offset)
     end
 
     return [[
-    <Viewport name="fisheye">
+    <Viewport name="fisheye" ]]..trackedSpecifier..[[>
         <Pos x="0.0" y="0.0" />
         <Size x="1.0" y="1.0" />
         <FisheyeProjection fov="]]..fov..[[" quality="]]..quality..[[" tilt="]]..tilt..[[">
@@ -679,14 +679,20 @@ function sgct.config.single(arg)
             arg["fov"] = { down = 16.875, up = 16.875, left = 30.0, right = 30.0 }
         end
     end
-    
+
+    if (arg["tracked"] ~= nil and arg["tracked"] == true) then
+        trackedSpecifier = "tracked=\"true\""
+    else
+        trackedSpecifier = "tracked=\"false\""
+    end
+
     arg["viewport"] = generateSingleViewportFOV(
         arg["fov"]["down"],
         arg["fov"]["up"], 
         arg["fov"]["left"],
-        arg["fov"]["right"]
+        arg["fov"]["right"],
+        trackedSpecifier
     )
-
     return sgct.makeConfig(generateSingleWindowConfig(arg))
 end
 
@@ -766,13 +772,20 @@ function sgct.config.fisheye(arg)
         arg["background"] = { r = 0.1, g = 0.1, b = 0.1, a = 1.0 }
     end
 
+    if (arg["tracked"] ~= nil and arg["tracked"] == true) then
+        trackedSpecifier = "tracked=\"true\""
+    else
+        trackedSpecifier = "tracked=\"false\""
+    end
+
     arg["viewport"] = generateFisheyeViewport(
         arg["fov"],
         arg["quality"],
         arg["tilt"],
         arg["background"],
         arg["crop"],
-        arg["offset"]
+        arg["offset"],
+        trackedSpecifier
     )
 
     return sgct.makeConfig(generateSingleWindowConfig(arg))
@@ -781,7 +794,7 @@ end
 
 
 function sgct.config.cube(arg)
-    function getCubeWindow(location, res, size)
+    function getCubeWindow(location, res, size, trackedSpecifier)
         local pos
         local lowerLeft
         local upperLeft
@@ -826,14 +839,14 @@ function sgct.config.cube(arg)
         arg["windowSize"] = size
         arg["windowPos"] = pos
         arg["res"] = { res, res }
-        arg["viewport"] = generateSingleViewport(lowerLeft, upperLeft, upperRight)
+        arg["viewport"] = generateSingleViewport(lowerLeft, upperLeft, upperRight, trackedSpecifier)
 
         return generateWindow(arg)
     end
 
-    function getControlWindow(down, up, left, right)
+    function getControlWindow(down, up, left, right, trackedSpecifier)
         arg = {}
-        arg["viewport"] = generateSingleViewportFOV(down, up, left, right)
+        arg["viewport"] = generateSingleViewportFOV(down, up, left, right, trackedSpecifier)
         return generateWindow(arg)
     end
 
@@ -843,9 +856,19 @@ function sgct.config.cube(arg)
     
     arg["scene"] = generateScene(arg)
     arg["settings"] = generateSettings(arg)
-    arg["window"] = getControlWindow(16.875, 16.875, 30.0, 30.0) .. getCubeWindow('front', res, size) .. getCubeWindow('back', res, size) .. 
-        getCubeWindow('left', res, size) .. getCubeWindow('right', res, size) .. 
-        getCubeWindow('up', res, size) .. getCubeWindow('down', res, size)
+    if (arg["tracked"] ~= nil and arg["tracked"] == true) then
+        trackedSpecifier = "tracked=\"true\""
+    else
+        trackedSpecifier = "tracked=\"false\""
+    end
+
+    arg["window"] = getControlWindow(16.875, 16.875, 30.0, 30.0, trackedSpecifier) ..
+        getCubeWindow('front', res, size, trackedSpecifier) ..
+        getCubeWindow('back', res, size, trackedSpecifier) ..
+        getCubeWindow('left', res, size, trackedSpecifier) ..
+        getCubeWindow('right', res, size, trackedSpecifier) ..
+        getCubeWindow('up', res, size, trackedSpecifier) ..
+        getCubeWindow('down', res, size, trackedSpecifier)
 
     arg["user"] = generateUser(arg)
     arg["capture"] = generateCapture(arg)
diff --git a/scripts/core_scripts.lua b/scripts/core_scripts.lua
index 8c9ee568ae..8016df5cd6 100644
--- a/scripts/core_scripts.lua
+++ b/scripts/core_scripts.lua
@@ -76,7 +76,7 @@ end
 
 openspace.setDefaultGuiSorting = function()
     openspace.setPropertyValueSingle(
-        'Modules.ImGUI.Main.Scene Properties.Ordering',
+        'Modules.ImGUI.Main.SceneProperties.Ordering',
         {
             "Solar System", "Milky Way", "Universe", "Other"
         }
diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl
index 50fc9ca5dc..97755f6734 100644
--- a/shaders/fragment.glsl
+++ b/shaders/fragment.glsl
@@ -37,4 +37,4 @@ struct Fragment {
     bool forceFboRendering;
 };
 
-#endif    
+#endif
diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag
index e0e9e4b4b3..458f7da1b8 100644
--- a/shaders/framebuffer/raycastframebuffer.frag
+++ b/shaders/framebuffer/raycastframebuffer.frag
@@ -66,7 +66,7 @@ void main() {
 
     float jitterFactor = 0.5 + 0.5 * rand(gl_FragCoord.xy); // should be between 0.5 and 1.0
 
-    vec3 entryPos; 
+    vec3 entryPos;
     float entryDepth;
     getEntry(entryPos, entryDepth);
 
@@ -110,11 +110,11 @@ void main() {
 
     vec3 accumulatedColor = vec3(0.0);
     vec3 accumulatedAlpha = vec3(0.0);
-        
-    
+
+
     for (steps = 0; (accumulatedAlpha.r < ALPHA_LIMIT || accumulatedAlpha.g < ALPHA_LIMIT || accumulatedAlpha.b < ALPHA_LIMIT) && steps < RAYCAST_MAX_STEPS; ++steps) {
 
-        
+
         while (sampleIndex < nAaSamples && currentDepth + nextStepSize * jitterFactor > raycastDepths[sampleIndex]) {
             sampleIndex++;
             aaOpacity -= opacityDecay;
@@ -132,16 +132,16 @@ void main() {
         vec3 jitteredPosition = position + direction*jitteredStepSize;
         position += direction * currentStepSize;
 
-        
+
         sample#{id}(jitteredPosition, direction, accumulatedColor, accumulatedAlpha, nextStepSize);
 
         float sampleDistance = aaOpacity * (jitteredStepSize + previousJitterDistance);
 
         //blendStep(finalColor, raycasterContribution, sampleDistance);
-        //finalColor 
+        //finalColor
 
         previousJitterDistance = currentStepSize - jitteredStepSize;
-        
+
         float maxStepSize = raycastDepths[nAaSamples - 1] - currentDepth;
 
         nextStepSize = min(nextStepSize, maxStepSize);
@@ -149,7 +149,7 @@ void main() {
     }
 
     finalColor = vec4(accumulatedColor, (accumulatedAlpha.r + accumulatedAlpha.g + accumulatedAlpha.b) / 3);
-    
-    finalColor.rgb /= finalColor.a;
+
+    finalColor.rgb /= finalColor.a ;
     gl_FragDepth = normalizeFloat(entryDepth);
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db11c83533..e592f4d3e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,10 +57,13 @@ set(OPENSPACE_SOURCE
     ${OPENSPACE_BASE_DIR}/src/mission/missionmanager_lua.inl
     ${OPENSPACE_BASE_DIR}/src/network/networkengine.cpp
     ${OPENSPACE_BASE_DIR}/src/network/parallelconnection.cpp
-    ${OPENSPACE_BASE_DIR}/src/network/parallelconnection_lua.inl
+    ${OPENSPACE_BASE_DIR}/src/network/parallelpeer.cpp
+    ${OPENSPACE_BASE_DIR}/src/network/parallelpeer_lua.inl
+    ${OPENSPACE_BASE_DIR}/src/network/parallelserver.cpp
     ${OPENSPACE_BASE_DIR}/src/performance/performancemeasurement.cpp
     ${OPENSPACE_BASE_DIR}/src/performance/performancelayout.cpp
     ${OPENSPACE_BASE_DIR}/src/performance/performancemanager.cpp
+    ${OPENSPACE_BASE_DIR}/src/properties/binaryproperty.cpp
     ${OPENSPACE_BASE_DIR}/src/properties/optionproperty.cpp
     ${OPENSPACE_BASE_DIR}/src/properties/property.cpp
     ${OPENSPACE_BASE_DIR}/src/properties/propertyowner.cpp
@@ -222,10 +225,13 @@ set(OPENSPACE_HEADER
     ${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h
     ${OPENSPACE_BASE_DIR}/include/openspace/network/networkengine.h
     ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelconnection.h
+    ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelpeer.h
+    ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelserver.h
     ${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructures.h
     ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancemeasurement.h
     ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancelayout.h
     ${OPENSPACE_BASE_DIR}/include/openspace/performance/performancemanager.h
+    ${OPENSPACE_BASE_DIR}/include/openspace/properties/binaryproperty.h
     ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrixproperty.h
     ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.h
     ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.inl
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index 21a7660a55..0c1db348bc 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -69,7 +69,7 @@ void registerCoreClasses(scripting::ScriptEngine& engine) {
     engine.addLibrary(MissionManager::luaLibrary());
     engine.addLibrary(ModuleEngine::luaLibrary());
     engine.addLibrary(OpenSpaceEngine::luaLibrary());
-    engine.addLibrary(ParallelConnection::luaLibrary());
+    engine.addLibrary(ParallelPeer::luaLibrary());
     engine.addLibrary(RenderEngine::luaLibrary());
     engine.addLibrary(SpiceManager::luaLibrary());
     engine.addLibrary(Scene::luaLibrary());
diff --git a/src/engine/configurationmanager_doc.inl b/src/engine/configurationmanager_doc.inl
index 72e02dd8f5..3650da9157 100644
--- a/src/engine/configurationmanager_doc.inl
+++ b/src/engine/configurationmanager_doc.inl
@@ -201,6 +201,26 @@ documentation::Documentation ConfigurationManager::Documentation() {
             "created in the current application configuration. Any previous file in this "
             "location will be silently overritten."
         },
+        {
+            ConfigurationManager::KeyRequireSocketAuthentication,
+            new BoolVerifier,
+            Optional::Yes,
+            "If socket connections should be authenticated or not before they are allowed to "
+            "get or set information. Defaults to `true`."
+        },
+        {
+            ConfigurationManager::KeyServerPasskey,
+                new StringVerifier,
+                Optional::Yes,
+                "Passkey to limit server access. Used to authorize incoming connections."
+        },
+        {
+            ConfigurationManager::KeyServerClientAddressWhitelist,
+                new StringVerifier,
+                Optional::Yes,
+                "String containing white listed client IP addresses that won't need to be"
+                "authorized with the server. Space separated"
+        },
         {
             ConfigurationManager::KeySceneLicenseDocumentation,
             new StringVerifier,
@@ -348,7 +368,7 @@ documentation::Documentation ConfigurationManager::Documentation() {
                     new BoolVerifier,
                     Optional::Yes,
                     "Determines whether the OpenGL debug callbacks are performed "
-                    "synchronously. If set to <True> the callbacks are in the same thead "
+                    "synchronously. If set to <True> the callbacks are in the same thread "
                     "as the context and in the scope of the OpenGL function that "
                     "triggered the message. The default value is <True>."
                 },
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index f0f7f0223e..6b45cbd2cc 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -48,10 +48,10 @@ ModuleEngine::ModuleEngine()
 
 void ModuleEngine::initialize(const ghoul::Dictionary& moduleConfigurations) {
     for (OpenSpaceModule* m : AllModules()) {
-        const std::string name = m->name();
+        const std::string identifier = m->identifier();
         ghoul::Dictionary configuration;
-        if (moduleConfigurations.hasKey(name)) {
-            moduleConfigurations.getValue(name, configuration);
+        if (moduleConfigurations.hasKey(identifier)) {
+            moduleConfigurations.getValue(identifier, configuration);
         }
         registerModule(std::unique_ptr<OpenSpaceModule>(m), configuration);
     }
@@ -59,8 +59,8 @@ void ModuleEngine::initialize(const ghoul::Dictionary& moduleConfigurations) {
 
 void ModuleEngine::deinitialize() {
     LDEBUG("Deinitializing modules");
-    for (auto& m : _modules) {
-        LDEBUG(fmt::format("Deinitializing module '{}'", m->name()));
+    for (std::unique_ptr<OpenSpaceModule>& m : _modules) {
+        LDEBUG(fmt::format("Deinitializing module '{}'", m->identifier()));
         m->deinitialize();
     }
     _modules.clear();
@@ -76,20 +76,20 @@ void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> m,
         _modules.begin(),
         _modules.end(),
         [&m](std::unique_ptr<OpenSpaceModule>& rhs) {
-            return rhs->name() == m->name();
+            return rhs->identifier() == m->identifier();
         }
     );
     if (it != _modules.end()) {
         throw ghoul::RuntimeError(
-            "Module name '" + m->name() + "' was registered before",
+            "Module name '" + m->identifier() + "' was registered before",
             "ModuleEngine"
         );
     }
 
-    LDEBUG(fmt::format("Registering module '{}'", m->name()));
+    LDEBUG(fmt::format("Registering module '{}'", m->identifier()));
     m->initialize(this, configuration);
     addPropertySubOwner(m.get());
-    LDEBUG(fmt::format("Registered module '{}'", m->name()));
+    LDEBUG(fmt::format("Registered module '{}'", m->identifier()));
     _modules.push_back(std::move(m));
 }
 
diff --git a/src/engine/moduleengine_lua.inl b/src/engine/moduleengine_lua.inl
index e2db06bcc0..fc276b6bdc 100644
--- a/src/engine/moduleengine_lua.inl
+++ b/src/engine/moduleengine_lua.inl
@@ -47,7 +47,7 @@ int isLoaded(lua_State* L) {
         modules.begin(),
         modules.end(),
         [moduleName](OpenSpaceModule* module) {
-            return module->name() == moduleName;
+            return module->identifier() == moduleName;
         }
     );
 
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 639ff3fe16..3a885b8fdd 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -39,7 +39,7 @@
 #include <openspace/interaction/keybindingmanager.h>
 #include <openspace/interaction/luaconsole.h>
 #include <openspace/network/networkengine.h>
-#include <openspace/network/parallelconnection.h>
+#include <openspace/network/parallelpeer.h>
 
 #include <openspace/performance/performancemeasurement.h>
 
@@ -157,7 +157,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
     , _console(new LuaConsole)
     , _moduleEngine(new ModuleEngine)
     , _networkEngine(new NetworkEngine)
-    , _parallelConnection(new ParallelConnection)
+    , _parallelPeer(new ParallelPeer)
     , _renderEngine(new RenderEngine)
     , _syncEngine(std::make_unique<SyncEngine>(4096))
     , _timeManager(new TimeManager)
@@ -188,10 +188,12 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
     _rootPropertyOwner->addPropertySubOwner(_navigationHandler.get());
 
     _rootPropertyOwner->addPropertySubOwner(_renderEngine.get());
+    _rootPropertyOwner->addPropertySubOwner(_renderEngine->screenSpaceOwner());
+
     if (_windowWrapper) {
         _rootPropertyOwner->addPropertySubOwner(_windowWrapper.get());
     }
-    _rootPropertyOwner->addPropertySubOwner(_parallelConnection.get());
+    _rootPropertyOwner->addPropertySubOwner(_parallelPeer.get());
     _rootPropertyOwner->addPropertySubOwner(_console.get());
     _rootPropertyOwner->addPropertySubOwner(_dashboard.get());
 
@@ -451,10 +453,10 @@ void OpenSpaceEngine::create(int argc, char** argv,
 }
 
 void OpenSpaceEngine::destroy() {
-    if (_engine->parallelConnection().status() !=
+    if (_engine->parallelPeer().status() !=
         ParallelConnection::Status::Disconnected)
     {
-        _engine->parallelConnection().signalDisconnect();
+        _engine->parallelPeer().disconnect();
     }
 
     _engine->_syncEngine->removeSyncables(_engine->timeManager().getSyncables());
@@ -702,6 +704,7 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
             if (s->state() == ResourceSynchronization::State::Syncing) {
                 resourceSyncs.insert(s);
                 _loadingScreen->updateItem(
+                    s->name(),
                     s->name(),
                     LoadingScreen::ItemStatus::Started,
                     s->progress()
@@ -722,6 +725,7 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
             if ((*it)->state() == ResourceSynchronization::State::Syncing) {
                 loading = true;
                 _loadingScreen->updateItem(
+                    (*it)->name(),
                     (*it)->name(),
                     LoadingScreen::ItemStatus::Started,
                     (*it)->progress()
@@ -730,6 +734,7 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
             } else {
                 _loadingScreen->tickItem();
                 _loadingScreen->updateItem(
+                    (*it)->name(),
                     (*it)->name(),
                     LoadingScreen::ItemStatus::Finished,
                     1.0f
@@ -1281,7 +1286,7 @@ void OpenSpaceEngine::preSynchronization() {
             _navigationHandler->updateCamera(dt);
             _renderEngine->camera()->invalidateCache();
         }
-        _parallelConnection->preSynchronization();
+        _parallelPeer->preSynchronization();
     }
 
     for (const auto& func : _moduleCallbacks.preSync) {
@@ -1691,9 +1696,9 @@ ModuleEngine& OpenSpaceEngine::moduleEngine() {
     return *_moduleEngine;
 }
 
-ParallelConnection& OpenSpaceEngine::parallelConnection() {
-    ghoul_assert(_parallelConnection, "ParallelConnection must not be nullptr");
-    return *_parallelConnection;
+ParallelPeer& OpenSpaceEngine::parallelPeer() {
+    ghoul_assert(_parallelPeer, "ParallelPeer must not be nullptr");
+    return *_parallelPeer;
 }
 
 RenderEngine& OpenSpaceEngine::renderEngine() {
diff --git a/src/engine/virtualpropertymanager.cpp b/src/engine/virtualpropertymanager.cpp
index f0b0322e0a..124f5bc96c 100644
--- a/src/engine/virtualpropertymanager.cpp
+++ b/src/engine/virtualpropertymanager.cpp
@@ -28,7 +28,7 @@
 
 namespace openspace {
 
-VirtualPropertyManager::VirtualPropertyManager() : properties::PropertyOwner({ "" }) {}
+VirtualPropertyManager::VirtualPropertyManager() : properties::PropertyOwner({ "VirtualPropertyManager" }) {}
 
 void VirtualPropertyManager::addProperty(std::unique_ptr<properties::Property> prop) {
     // PropertyOwner does not take the ownership of the pointer
diff --git a/src/interaction/luaconsole.cpp b/src/interaction/luaconsole.cpp
index 50c232c23d..57cf60be1f 100644
--- a/src/interaction/luaconsole.cpp
+++ b/src/interaction/luaconsole.cpp
@@ -26,7 +26,7 @@
 
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/wrapper/windowwrapper.h>
-#include <openspace/network/parallelconnection.h>
+#include <openspace/network/parallelpeer.h>
 
 #include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -272,11 +272,11 @@ void LuaConsole::initialize() {
         ghoul::fontrendering::Font::Outline::No
     );
 
-    OsEng.parallelConnection().connectionEvent()->subscribe(
+    OsEng.parallelPeer().connectionEvent()->subscribe(
         "luaConsole",
         "statusChanged",
         [this]() {
-            ParallelConnection::Status status = OsEng.parallelConnection().status();
+            ParallelConnection::Status status = OsEng.parallelPeer().status();
             parallelConnectionChanged(status);
         }
     );
@@ -316,7 +316,7 @@ void LuaConsole::deinitialize() {
 
     _program = nullptr;
 
-    OsEng.parallelConnection().connectionEvent()->unsubscribe("luaConsole");
+    OsEng.parallelPeer().connectionEvent()->unsubscribe("luaConsole");
 }
 
 bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction action) {
@@ -339,7 +339,7 @@ bool LuaConsole::keyboardCallback(Key key, KeyModifier modifier, KeyAction actio
         }
         else {
             _isVisible = true;
-            if (OsEng.parallelConnection().status() == ParallelConnection::Status::Host) {
+            if (OsEng.parallelPeer().status() == ParallelConnection::Status::Host) {
                 _remoteScripting = true;
             }
         }
@@ -857,10 +857,10 @@ void LuaConsole::render() {
     if (_remoteScripting) {
         const glm::vec4 red(1, 0, 0, 1);
 
-        ParallelConnection::Status status = OsEng.parallelConnection().status();
+        ParallelConnection::Status status = OsEng.parallelPeer().status();
         const int nClients =
             status != ParallelConnection::Status::Disconnected ?
-            OsEng.parallelConnection().nConnections() - 1 :
+            OsEng.parallelPeer().nConnections() - 1 :
             0;
 
         const std::string nClientsText =
@@ -870,7 +870,7 @@ void LuaConsole::render() {
 
         const glm::vec2 loc = locationForRightJustifiedText(nClientsText);
         RenderFont(*_font, loc, red, nClientsText.c_str());
-    } else if (OsEng.parallelConnection().isHost()) {
+    } else if (OsEng.parallelPeer().isHost()) {
         const glm::vec4 lightBlue(0.4, 0.4, 1, 1);
 
         const std::string localExecutionText = "Local script execution";
diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp
index 59e5298af6..fb9631345a 100644
--- a/src/interaction/navigationhandler.cpp
+++ b/src/interaction/navigationhandler.cpp
@@ -103,21 +103,18 @@ NavigationHandler::NavigationHandler()
 NavigationHandler::~NavigationHandler() {}
 
 void NavigationHandler::initialize() {
-    OsEng.parallelConnection().connectionEvent()->subscribe(
+    OsEng.parallelPeer().connectionEvent()->subscribe(
         "NavigationHandler",
         "statusChanged",
         [this]() {
-            if (OsEng.parallelConnection().status() ==
-                ParallelConnection::Status::ClientWithHost)
-            {
-                _useKeyFrameInteraction = true;
-            }
+            _useKeyFrameInteraction = (OsEng.parallelPeer().status() ==
+                ParallelConnection::Status::ClientWithHost);
         }
     );
 }
 
 void NavigationHandler::deinitialize() {
-    OsEng.parallelConnection().connectionEvent()->unsubscribe("NavigationHandler");
+    OsEng.parallelPeer().connectionEvent()->unsubscribe("NavigationHandler");
 }
 
 void NavigationHandler::setFocusNode(SceneGraphNode* node) {
@@ -241,7 +238,7 @@ ghoul::Dictionary NavigationHandler::getCameraStateDictionary() {
     ghoul::Dictionary cameraDict;
     cameraDict.setValue(KeyPosition, cameraPosition);
     cameraDict.setValue(KeyRotation, cameraRotation);
-    cameraDict.setValue(KeyFocus, focusNode()->name());
+    cameraDict.setValue(KeyFocus, focusNode()->identifier());
 
     return cameraDict;
 }
@@ -262,7 +259,7 @@ void NavigationHandler::saveCameraStateToFile(const std::string& filepath) {
         glm::dquat q = _camera->rotationQuaternion();
 
         ofs << "return {" << std::endl;
-        ofs << "    " << KeyFocus << " = " << "\"" << focusNode()->name() << "\""
+        ofs << "    " << KeyFocus << " = " << "\"" << focusNode()->identifier() << "\""
             << "," << std::endl;
         ofs << "    " << KeyPosition << " = {"
             << std::to_string(p.x) << ", "
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 13603d2247..a1461a879b 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -264,7 +264,7 @@ void showTouchbar() {
         nodes.begin(),
         nodes.end(),
         [](SceneGraphNode* lhs, SceneGraphNode* rhs) {
-            return lhs->name() < rhs->name();
+            return lhs->guiName() < rhs->guiName();
         }
     );
 
@@ -273,7 +273,7 @@ void showTouchbar() {
         const std::vector<std::string>& tags = n->tags();
         auto it = std::find(tags.begin(), tags.end(), "GUI.Interesting");
         if (it != tags.end()) {
-            [ids addObject: [NSString stringWithCString:n->name().c_str()
+            [ids addObject: [NSString stringWithCString:n->identifier().c_str()
                                       encoding:[NSString defaultCStringEncoding]]];
         }
     }
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 153aeb781f..fb5694f308 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -22,684 +22,30 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifdef WIN32
-#ifndef _ERRNO
-#define _ERRNO WSAGetLastError()
-#endif
-#else //Use BSD sockets
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <errno.h>
-
-#ifndef SOCKET_ERROR
-#define SOCKET_ERROR (-1)
-#endif
-
-#ifndef INVALID_SOCKET
-#define INVALID_SOCKET static_cast<_SOCKET>(~0)
-#endif
-
-// #ifndef NO_ERROR
-// #define NO_ERROR 0L
-// #endif
-
-#ifndef _ERRNO
-#define _ERRNO errno
-#endif
-#endif
-
-#ifdef WIN32
-using SocketResultType = int;
-#else
-using SocketResultType = size_t;
-#endif // WIN32
-
-#ifdef WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#pragma warning (push)
-#pragma warning (disable: 4574) // 'INCL_WINSOCK_API_TYPEDEFS' is defined to be '0'
-
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-
-#pragma warning (pop)
-#endif
-
 #include <openspace/network/parallelconnection.h>
 
-#include <openspace/openspace.h>
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/engine/wrapper/windowwrapper.h>
-#include <openspace/interaction/navigationhandler.h>
-#include <openspace/interaction/keyframenavigator.h>
-#include <openspace/scene/scenegraphnode.h>
-#include <openspace/util/time.h>
-#include <openspace/util/timemanager.h>
-
-#include <ghoul/logging/logmanager.h>
-
-#include "parallelconnection_lua.inl"
+#include <cstdint>
 
 namespace {
-    constexpr const uint32_t ProtocolVersion = 2;
-    constexpr const size_t MaxLatencyDiffs = 64;
-    constexpr const char* _loggerCat = "ParallelConnection";
-
-    static const openspace::properties::Property::PropertyInfo PasswordInfo = {
-        "Password",
-        "Password",
-        "The general password that allows this OpenSpace instance access to the Wormhole "
-        "server."
-    };
-
-    static const openspace::properties::Property::PropertyInfo HostPasswordInfo = {
-        "HostPassword",
-        "Host Password",
-        "The password that is required to take control of the joint session and thus "
-        "send all commands to connected clients."
-    };
-
-    static const openspace::properties::Property::PropertyInfo PortInfo = {
-        "Port",
-        "Port",
-        "The port on which the Wormhole server is listening to connections from "
-        "OpenSpace."
-    };
-
-    static const openspace::properties::Property::PropertyInfo AddressInfo = {
-        "Address",
-        "Address",
-        "The address of the Wormhole server either as a DNS name or an IP address."
-    };
-
-    static const openspace::properties::Property::PropertyInfo NameInfo = {
-        "Name",
-        "Connection Name",
-        "The name of this OpenSpace instance that will be potentially broadcast to other "
-        "connected instances."
-    };
-
-    static const openspace::properties::Property::PropertyInfo BufferTimeInfo = {
-        "BufferTime",
-        "Buffer Time",
-        "" // @TODO Missing documentation
-    };
-
-    static const openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = {
-        "TimeKeyframeInterval",
-        "Time keyframe interval",
-        "" // @TODO Missing documentation
-    };
-
-    static const openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = {
-        "CameraKeyframeInterval",
-        "Camera Keyframe interval",
-        "" // @TODO Missing documentation
-    };
-
-    static const openspace::properties::Property::PropertyInfo TimeToleranceInfo = {
-        "TimeTolerance",
-        "Time tolerance",
-        "" // @TODO Missing documentation
-    };
+const uint32_t ProtocolVersion = 3;
+const char* _loggerCat = "ParallelConnection";
 } // namespace
 
 namespace openspace {
 
-ParallelConnection::ParallelConnection()
-    : properties::PropertyOwner({ "ParallelConnection" })
-    , _password(PasswordInfo)
-    , _hostPassword(HostPasswordInfo)
-    , _port(PortInfo, "20501")
-    , _address(AddressInfo, "localhost")
-    , _name(NameInfo, "Anonymous")
-    , _bufferTime(BufferTimeInfo, 1, 0.5, 10)
-    , _timeKeyframeInterval(TimeKeyFrameInfo, 0.1f, 0.f, 1.f)
-    , _cameraKeyframeInterval(CameraKeyFrameInfo, 0.1f, 0.f, 1.f)
-    , _timeTolerance(TimeToleranceInfo, 1.f, 0.5f, 5.f)
-    , _lastTimeKeyframeTimestamp(0)
-    , _lastCameraKeyframeTimestamp(0)
-    , _clientSocket(INVALID_SOCKET)
-    , _isConnected(false)
-    , _isRunning(true)
-    , _tryConnect(false)
-    , _disconnect(false)
-    , _initializationTimejumpRequired(false)
-    , _nConnections(0)
-    , _status(Status::Disconnected)
-    , _hostName("")
-    , _connectionThread(nullptr)
-    , _sendThread(nullptr)
-    , _listenThread(nullptr)
-    , _handlerThread(nullptr)
-{
-    addProperty(_name);
+ParallelConnection::ConnectionLostError::ConnectionLostError()
+    : ghoul::RuntimeError("Parallel connection lost", "ParallelConnection")
+{}
 
-    addProperty(_port);
-    addProperty(_address);
-    addProperty(_bufferTime);
+ParallelConnection::ParallelConnection(std::unique_ptr<ghoul::io::TcpSocket> socket)
+    : _socket(std::move(socket))
+{}
 
-    addProperty(_password);
-    addProperty(_hostPassword);
-
-    addProperty(_timeKeyframeInterval);
-    addProperty(_cameraKeyframeInterval);
-    addProperty(_timeTolerance);
-
-    _connectionEvent = std::make_shared<ghoul::Event<>>();
-    _handlerThread = std::make_unique<std::thread>(
-        &ParallelConnection::threadManagement,
-        this
-    );
+bool ParallelConnection::isConnectedOrConnecting() {
+    return _socket->isConnected() || _socket->isConnecting();
 }
 
-ParallelConnection::~ParallelConnection() {
-    // signal that a disconnect should occur
-    signalDisconnect();
-
-    // signal that execution has stopped
-    _isRunning.store(false);
-
-    // join handler
-    _handlerThread->join();
-}
-
-void ParallelConnection::threadManagement() {
-    // The _disconnectCondition.wait(unqlock) stalls
-    // How about moving this out of the thread and into the destructor? ---abock
-
-    // while we're still running
-    while(_isRunning){
-        // lock disconnect mutex mutex
-        // not really needed since no data is modified but conditions need a mutex
-        std::unique_lock<std::mutex> disconnectLock(_disconnectMutex);
-        // wait for a signal to disconnect
-        _disconnectCondition.wait(
-            disconnectLock,
-            [this]() { return _disconnect.load(); }
-        );
-
-        // perform actual disconnect
-        disconnect();
-    }
-}
-
-void ParallelConnection::signalDisconnect() {
-    //signal handler thread to disconnect
-    _disconnect = true;
-    _sendCondition.notify_all(); // Allow send function to terminate.
-    _disconnectCondition.notify_all(); // Unblock thread management thread.
-}
-
-void ParallelConnection::closeSocket() {
-    /*
-        Windows shutdown options
-        * SD_RECIEVE
-        * SD_SEND
-        * SD_BOTH
-
-        Linux & Mac shutdown options
-        * SHUT_RD (Disables further receive operations)
-        * SHUT_WR (Disables further send operations)
-        * SHUT_RDWR (Disables further send and receive operations)
-        */
-
-#ifdef WIN32
-    shutdown(_clientSocket, SD_BOTH);
-    closesocket(_clientSocket);
-#else
-    shutdown(_clientSocket, SHUT_RDWR);
-    close(_clientSocket);
-#endif
-
-    _clientSocket = INVALID_SOCKET;
-}
-
-void ParallelConnection::disconnect() {
-    // We're disconnecting
-    if (_clientSocket != INVALID_SOCKET) {
-        // Must be run before trying to join communication threads, else the threads are
-        // stuck trying to receive data
-        closeSocket();
-
-        // Ttell connection thread to stop trying to connect
-        _tryConnect = false;
-
-        // Tell send thread to stop sending and listen thread to stop listenin
-        _isConnected = false;
-
-        setStatus(Status::Disconnected);
-
-        // join connection thread and delete it
-        if (_connectionThread != nullptr) {
-            _connectionThread->join();
-            _connectionThread = nullptr;
-        }
-
-        // join send thread and delete it
-        if (_sendThread != nullptr) {
-            _sendThread->join();
-            _sendThread = nullptr;
-        }
-
-        // join listen thread and delete it
-        if (_listenThread != nullptr) {
-            _listenThread->join();
-            _listenThread = nullptr;
-        }
-
-        // disconnect and cleanup completed
-        _disconnect = false;
-    }
-}
-
-void ParallelConnection::clientConnect() {
-    // We're already connected (or already trying to connect), do nothing (dummy check)
-    if (_isConnected.load() || _tryConnect.load()) {
-        return;
-    }
-
-    if (!initNetworkAPI()) {
-        LERROR("Failed to initialize network API for Parallel Connection");
-        return;
-    }
-
-    struct addrinfo* addresult = NULL;
-    struct addrinfo hints;
-
-    memset(&hints, 0, sizeof(hints));
-
-    hints.ai_family = AF_INET;
-    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = IPPROTO_TCP;
-    hints.ai_flags = AI_PASSIVE;
-
-    // Resolve the local address and port to be used by the server
-    int result = getaddrinfo(
-        _address.value().c_str(),
-        _port.value().c_str(),
-        &hints,
-        &addresult
-    );
-    if (result != 0) {
-        LERROR("Failed to parse hints for Parallel Connection");
-        return;
-    }
-
-    // We're not connected
-    _isConnected = false;
-
-    // We want to try and establish a connection
-    _tryConnect = true;
-
-    // Start connection thread
-    _connectionThread = std::make_unique<std::thread>(
-        &ParallelConnection::establishConnection,
-        this,
-        addresult
-    );
-}
-
-void ParallelConnection::establishConnection(addrinfo *info) {
-    _clientSocket = socket(info->ai_family, info->ai_socktype, info->ai_protocol);
-
-    if (_clientSocket == INVALID_SOCKET) {
-        freeaddrinfo(info);
-        LERROR("Failed to create client socket, disconnecting.");
-
-        // Signal a disconnect
-        signalDisconnect();
-    }
-
-    int trueFlag = 1;
-    int falseFlag = 0;
-    int result;
-
-    // Set no delay
-    result = setsockopt(
-        _clientSocket,                      // socket affected
-        IPPROTO_TCP,                        // set option at TCP level
-        TCP_NODELAY,                        // name of option
-        reinterpret_cast<char*>(&trueFlag), // the cast is historical cruft
-        sizeof(int)                         // length of option value
-    );
-
-    // Set send timeout
-    int timeout = 0;
-    result = setsockopt(
-        _clientSocket,
-        SOL_SOCKET,
-        SO_SNDTIMEO,
-        reinterpret_cast<char*>(&timeout),
-        sizeof(timeout)
-    );
-
-    // Set receive timeout
-    result = setsockopt(
-        _clientSocket,
-        SOL_SOCKET,
-        SO_RCVTIMEO,
-        reinterpret_cast<char*>(&timeout),
-        sizeof(timeout)
-    );
-
-    result = setsockopt(
-        _clientSocket,
-        SOL_SOCKET,
-        SO_REUSEADDR,
-        reinterpret_cast<char*>(&falseFlag),
-        sizeof(int)
-    );
-    if (result == SOCKET_ERROR) {
-        LERROR(fmt::format(
-            "Failed to set socket option 'reuse address'. Error code: {}",
-            _ERRNO
-        ));
-    }
-
-    result = setsockopt(
-        _clientSocket,
-        SOL_SOCKET,
-        SO_KEEPALIVE,
-        reinterpret_cast<char*>(&trueFlag),
-        sizeof(int)
-    );
-    if (result == SOCKET_ERROR) {
-        LERROR(fmt::format(
-            "Failed to set socket option 'keep alive'. Error code: {}",
-            _ERRNO
-        ));
-    }
-
-    LINFO(fmt::format(
-        "Attempting to connect to server {} on port {}",
-        _address.value(),
-        _port.value()
-    ));
-
-    // Try to connect
-    result = connect(_clientSocket, info->ai_addr, static_cast<int>(info->ai_addrlen));
-
-    // If the connection was successfull
-    if (result != SOCKET_ERROR) {
-        LINFO(fmt::format(
-            "Connection established with server at ip: {}",
-            _address.value()
-        ));
-
-        // We're connected
-        _isConnected = true;
-
-        // Start sending messages
-        _sendThread = std::make_unique<std::thread>(&ParallelConnection::sendFunc, this);
-
-        // Start listening for communication
-        _listenThread = std::make_unique<std::thread>(
-            &ParallelConnection::listenCommunication,
-            this
-        );
-
-        // We no longer need to try to establish connection
-        _tryConnect = false;
-
-        _sendBufferMutex.lock();
-        _sendBuffer.clear();
-        _sendBufferMutex.unlock();
-
-        // Send authentication
-        sendAuthentication();
-    } else {
-        LINFO("Connection attempt failed.");
-        signalDisconnect();
-    }
-
-    // Cleanup
-    freeaddrinfo(info);
-}
-
-void ParallelConnection::sendAuthentication() {
-    std::string name = _name.value();
-    // Length of this nodes name
-    uint32_t nameLength = static_cast<uint32_t>(name.length());
-
-    // Total size of the buffer: (passcode + namelength + name)
-    size_t size = 2 * sizeof(uint32_t) + nameLength;
-
-    // Create and reserve buffer
-    std::vector<char> buffer;
-    buffer.reserve(size);
-
-    uint32_t passCode = hash(_password.value());
-
-    // Write passcode to buffer
-    buffer.insert(
-        buffer.end(),
-        reinterpret_cast<char*>(&passCode),
-        reinterpret_cast<char*>(&passCode) + sizeof(uint32_t)
-    );
-
-    // Write the length of the nodes name to buffer
-    buffer.insert(
-        buffer.end(),
-        reinterpret_cast<char*>(&nameLength),
-        reinterpret_cast<char*>(&nameLength) + sizeof(uint32_t)
-    );
-
-    // Write this node's name to buffer
-    buffer.insert(buffer.end(), name.begin(), name.end());
-
-    // Send buffer
-    queueOutMessage(Message(MessageType::Authentication, buffer));
-}
-
-void ParallelConnection::queueInMessage(const Message& message) {
-    std::unique_lock<std::mutex> unqlock(_receiveBufferMutex);
-    _receiveBuffer.push_back(message);
-}
-
-void ParallelConnection::handleMessage(const Message& message) {
-    switch (message.type){
-        case MessageType::Data:
-            dataMessageReceived(message.content);
-            break;
-        case MessageType::ConnectionStatus:
-            connectionStatusMessageReceived(message.content);
-            break;
-        case MessageType::NConnections:
-            nConnectionsMessageReceived(message.content);
-            break;
-        default:
-            //unknown message type
-            break;
-    }
-}
-
-/*
-void ParallelConnection::initializationMessageReceived(){
-
-    int result;
-
-    uint32_t id, datasize;
-    uint16_t numscripts;
-
-    std::vector<char> buffer;
-    buffer.resize(sizeof(id));
-
-    //read id
-    result = receiveData(_clientSocket, buffer, sizeof(id), 0);
-    if (result < 0){
-        //error
-    }
-    id = *(reinterpret_cast<uint32_t*>(buffer.data()));
-
-    //read datalength
-    result = receiveData(_clientSocket, buffer, sizeof(datasize), 0);
-    if (result < 0){
-        //error
-    }
-    datasize = *(reinterpret_cast<uint32_t*>(buffer.data()));
-
-    buffer.clear();
-    buffer.resize(sizeof(uint16_t));
-    //read number of scripts
-    result = receiveData(_clientSocket, buffer, sizeof(numscripts), 0);
-    if(result < 0){
-        //error
-    }
-    numscripts = *(reinterpret_cast<uint16_t*>(buffer.data()));
-
-    //length of current script
-    uint16_t scriptlen;
-
-    buffer.clear();
-    buffer.resize(sizeof(scriptlen));
-
-    //holder for current script
-    std::string script;
-
-    for(int n = 0; n < numscripts; ++n){
-        //read length of script
-        result = receiveData(_clientSocket, buffer, sizeof(numscripts), 0);
-        if(result < 0){
-            //error
-        }
-        scriptlen = *(reinterpret_cast<uint16_t*>(buffer.data()));
-
-        //resize buffer
-        buffer.clear();
-        buffer.resize(scriptlen);
-
-        //read script
-        result = receiveData(_clientSocket, buffer, scriptlen, 0);
-
-        //assign current script
-        script.clear();
-        script.assign(buffer.begin(), buffer.end());
-
-        //queue received script
-        OsEng.scriptEngine().queueScript(script);
-    }
-
-    //we've gone through all scripts, initialization is done
-    buffer.clear();
-    writeHeader(buffer, MessageTypes::InitializationCompleted);
-
-    //let the server know
-    std::cout << "initialization message recieved queue" << std::endl;
-    queueMessage(InitializationCompleted, buffer);
-
-    // we also need to force a time jump just to ensure that the server and client are
-    // synced
-    _initializationTimejumpRequired.store(true);
-
-}
-*/
-
-double ParallelConnection::calculateBufferedKeyframeTime(double originalTime) {
-    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
-
-    double timeDiff = OsEng.windowWrapper().applicationTime() - originalTime;
-    if (_latencyDiffs.size() == 0) {
-        _initialTimeDiff = timeDiff;
-    }
-    double latencyDiff = timeDiff - _initialTimeDiff;
-    if (_latencyDiffs.size() >= MaxLatencyDiffs) {
-        _latencyDiffs.pop_front();
-    }
-    _latencyDiffs.push_back(latencyDiff);
-
-    return originalTime + timeDiff + latencyDiff + _bufferTime;
-}
-
-double ParallelConnection::latencyStandardDeviation() const {
-    double accumulatedLatencyDiffSquared = 0;
-    double accumulatedLatencyDiff = 0;
-    for (double diff : _latencyDiffs) {
-        accumulatedLatencyDiff += diff;
-        accumulatedLatencyDiffSquared += diff*diff;
-    }
-    double expectedLatencyDiffSquared = accumulatedLatencyDiffSquared /
-                                        _latencyDiffs.size();
-    double expectedLatencyDiff = accumulatedLatencyDiff / _latencyDiffs.size();
-
-    // V(X) = E(x^2) - E(x)^2
-    double latencyVariance = expectedLatencyDiffSquared -
-                             expectedLatencyDiff*expectedLatencyDiff;
-    return std::sqrt(latencyVariance);
-}
-
-double ParallelConnection::timeTolerance() const {
-    return _timeTolerance;
-}
-
-void ParallelConnection::dataMessageReceived(const std::vector<char>& messageContent) {
-    // The type of data message received
-    uint32_t type = *(reinterpret_cast<const uint32_t*>(messageContent.data()));
-    std::vector<char> buffer(
-        messageContent.begin() + sizeof(uint32_t),
-        messageContent.end()
-    );
-
-    switch (static_cast<datamessagestructures::Type>(type)) {
-        case datamessagestructures::Type::CameraData: {
-            datamessagestructures::CameraKeyframe kf(buffer);
-            kf._timestamp = calculateBufferedKeyframeTime(kf._timestamp);
-
-            OsEng.navigationHandler().keyframeNavigator().removeKeyframesAfter(
-                kf._timestamp);
-            interaction::KeyframeNavigator::CameraPose pose;
-            pose.focusNode = kf._focusNode;
-            pose.position = kf._position;
-            pose.rotation = kf._rotation;
-            pose.followFocusNodeRotation = kf._followNodeRotation;
-
-            OsEng.navigationHandler().keyframeNavigator().addKeyframe(
-                kf._timestamp, pose);
-            break;
-        }
-        case datamessagestructures::Type::TimeData: {
-            datamessagestructures::TimeKeyframe kf(buffer);
-            kf._timestamp = calculateBufferedKeyframeTime(kf._timestamp);
-
-            OsEng.timeManager().removeKeyframesAfter(kf._timestamp);
-            Time time(kf._time);
-            time.setDeltaTime(kf._dt);
-            time.setPause(kf._paused);
-            time.setTimeJumped(kf._requiresTimeJump);
-
-            OsEng.timeManager().addKeyframe(kf._timestamp, time);
-            break;
-        }
-        case datamessagestructures::Type::ScriptData: {
-            datamessagestructures::ScriptMessage sm;
-            sm.deserialize(buffer);
-
-            OsEng.scriptEngine().queueScript(
-                sm._script,
-                scripting::ScriptEngine::RemoteScripting::No
-            );
-            break;
-        }
-        default: {
-            LERROR(fmt::format(
-                "Unidentified message with identifier {} received in parallel connection",
-                type
-            ));
-            break;
-        }
-    }
-}
-
-void ParallelConnection::queueOutDataMessage(const DataMessage& dataMessage) {
+void ParallelConnection::sendDataMessage(const ParallelConnection::DataMessage& dataMessage) {
     uint32_t dataMessageTypeOut = static_cast<uint32_t>(dataMessage.type);
 
     std::vector<char> messageContent;
@@ -711,586 +57,100 @@ void ParallelConnection::queueOutDataMessage(const DataMessage& dataMessage) {
         dataMessage.content.begin(),
         dataMessage.content.end());
 
-    queueOutMessage(Message(MessageType::Data, messageContent));
+    sendMessage(ParallelConnection::Message(ParallelConnection::MessageType::Data, messageContent));
 }
 
-void ParallelConnection::queueOutMessage(const Message& message) {
-    std::unique_lock<std::mutex> unqlock(_sendBufferMutex);
-    _sendBuffer.push_back(message);
-    _sendCondition.notify_all();
-}
+bool ParallelConnection::sendMessage(const  ParallelConnection::Message& message) {
+    uint32_t messageTypeOut = static_cast<uint32_t>(message.type);
+    uint32_t messageSizeOut = static_cast<uint32_t>(message.content.size());
 
-void ParallelConnection::sendFunc() {
-    // While we're connected
-    while (_isConnected && !_disconnect) {
-        // Wait for signal then lock mutex and send first queued message
-        std::unique_lock<std::mutex> unqlock(_sendBufferMutex);
-        _sendCondition.wait(unqlock);
+    std::vector<char> header;
 
-        if (_disconnect) {
-            break;
-        }
+    //insert header into buffer
+    header.push_back('O');
+    header.push_back('S');
 
-        while (!_sendBuffer.empty()) {
-            Message message = _sendBuffer.front();
-            unqlock.unlock();
-            std::vector<char> header;
-
-            //insert header into buffer
-            header.push_back('O');
-            header.push_back('S');
-
-            uint32_t messageTypeOut = static_cast<uint32_t>(message.type);
-            uint32_t messageSizeOut = static_cast<uint32_t>(message.content.size());
-
-
-            header.insert(header.end(),
-                reinterpret_cast<const char*>(&ProtocolVersion),
-                reinterpret_cast<const char*>(&ProtocolVersion) + sizeof(uint32_t)
-            );
-
-            header.insert(header.end(),
-                reinterpret_cast<const char*>(&messageTypeOut),
-                reinterpret_cast<const char*>(&messageTypeOut) + sizeof(uint32_t)
-            );
-
-            header.insert(header.end(),
-                reinterpret_cast<const char*>(&messageSizeOut),
-                reinterpret_cast<const char*>(&messageSizeOut) + sizeof(uint32_t)
-            );
-
-            // result is most likely size_t, but send might return a different type on
-            // different platforms
-            auto result = send(
-                _clientSocket,
-                header.data(),
-                static_cast<int>(header.size()),
-                0
-            );
-            result = send(
-                _clientSocket,
-                message.content.data(),
-                static_cast<int>(message.content.size()),
-                0
-            );
-
-            if (result == SOCKET_ERROR) {
-                LERROR(fmt::format(
-                    "Failed to send message. Error {} detected in connection"
-                    "; disconnecting",
-                    _ERRNO
-                ));
-                signalDisconnect();
-            }
-
-            unqlock.lock();
-            _sendBuffer.erase(_sendBuffer.begin());
-        }
-    }
-    std::lock_guard<std::mutex> sendLock(_sendBufferMutex);
-    _sendBuffer.clear();
-
-}
-
-void ParallelConnection::connectionStatusMessageReceived(const std::vector<char>& message)
-{
-    if (message.size() < 2 * sizeof(uint32_t)) {
-        LERROR("Malformed connection status message.");
-        return;
-    }
-    size_t pointer = 0;
-    uint32_t statusIn = *(reinterpret_cast<const uint32_t*>(&message[pointer]));
-    ParallelConnection::Status status = static_cast<ParallelConnection::Status>(statusIn);
-    pointer += sizeof(uint32_t);
-
-    size_t hostNameSize = *(reinterpret_cast<const uint32_t*>(&message[pointer]));
-    pointer += sizeof(uint32_t);
-
-    if (hostNameSize > message.size() - pointer) {
-        LERROR("Malformed connection status message.");
-        return;
-    }
-
-    std::string hostName = "";
-    if (hostNameSize > 0) {
-        hostName = std::string(&message[pointer], hostNameSize);
-    }
-    pointer += hostNameSize;
-
-    if (status > Status::Host) {
-        LERROR("Invalid status.");
-        return;
-    }
-
-    _latencyMutex.lock();
-    _latencyDiffs.clear();
-    _latencyMutex.unlock();
-    setHostName(hostName);
-
-    if (status == _status) {
-        // Status remains unchanged.
-        return;
-    }
-
-    setStatus(status);
-
-    OsEng.navigationHandler().keyframeNavigator().clearKeyframes();
-    OsEng.timeManager().clearKeyframes();
-
-}
-
-void ParallelConnection::nConnectionsMessageReceived(const std::vector<char>& message) {
-    if (message.size() < sizeof(uint32_t)) {
-        LERROR("Malformed host info message.");
-        return;
-    }
-    uint32_t nConnections = *(reinterpret_cast<const uint32_t*>(&message[0]));
-    setNConnections(nConnections);
-}
-
-
-
-
-//void ParallelConnection::initializationRequestMessageReceived(
-                                                       // const std::vector<char>& message
-// {
-/*
-    //get current state as scripts
-    std::vector<std::string> scripts;
-    std::map<std::string, std::string>::iterator state_it;
-    {
-        //mutex protect
-        std::lock_guard<std::mutex> lock(_currentStateMutex);
-
-        for(state_it = _currentState.begin();
-            state_it != _currentState.end();
-            ++state_it){
-            scripts.push_back(
-                scriptFromPropertyAndValue(state_it->first, state_it->second)
-            );
-        }
-    }
-
-    //get requester ID
-    std::vector<char> buffer;
-    buffer.resize(sizeof(uint32_t));
-    receiveData(_clientSocket, buffer, sizeof(uint32_t), 0);
-    uint32_t requesterID = *reinterpret_cast<uint32_t*>(buffer.data());
-
-    //total number of scripts sent
-    uint16_t numscripts = 0;
-
-    //temporary buffers
-    std::vector<char> scriptbuffer;
-    std::vector<char> tmpbuffer;
-
-    //serialize and encode all scripts into scriptbuffer
-    std::vector<std::string>::iterator script_it;
-    datamessagestructures::ScriptMessage sm;
-    for(script_it = scripts.begin();
-        script_it != scripts.end();
-        ++script_it){
-        sm._script = *script_it;
-        sm._scriptlen = script_it->length();
-
-        //serialize current script
-        tmpbuffer.clear();
-        sm.serialize(tmpbuffer);
-
-        //and insert into full buffer
-        scriptbuffer.insert(scriptbuffer.end(), tmpbuffer.begin(), tmpbuffer.end());
-
-        //increment number of scripts
-        numscripts++;
-    }
-
-    //write header
-    buffer.clear();
-    writeHeader(buffer, MessageTypes::Initialization);
-
-    //write client ID to receive init message
-    buffer.insert(
-        buffer.end(),
-        reinterpret_cast<char*>(&requesterID),
-        reinterpret_cast<char*>(&requesterID) + sizeof(uint32_t)
+    header.insert(header.end(),
+        reinterpret_cast<const char*>(&ProtocolVersion),
+        reinterpret_cast<const char*>(&ProtocolVersion) + sizeof(uint32_t)
     );
 
-    //write total size of data chunk
-    uint32_t totlen = static_cast<uint32_t>(scriptbuffer.size());
-    buffer.insert(
-        buffer.end(),
-        reinterpret_cast<char*>(&totlen),
-        reinterpret_cast<char*>(&totlen) + sizeof(uint32_t)
+    header.insert(header.end(),
+        reinterpret_cast<const char*>(&messageTypeOut),
+        reinterpret_cast<const char*>(&messageTypeOut) + sizeof(uint32_t)
     );
 
-    //write number of scripts
-    buffer.insert(
-        buffer.end(),
-        reinterpret_cast<char*>(&numscripts),
-        reinterpret_cast<char*>(&numscripts) + sizeof(uint16_t)
+    header.insert(header.end(),
+        reinterpret_cast<const char*>(&messageSizeOut),
+        reinterpret_cast<const char*>(&messageSizeOut) + sizeof(uint32_t)
     );
 
-    //write all scripts
-    buffer.insert(buffer.end(), scriptbuffer.begin(), scriptbuffer.end());
+    if (!_socket->put<char>(header.data(), header.size())) {
+        return false;
+    }
+    if (!_socket->put<char>(message.content.data(), message.content.size())) {
+        return false;
+    }
+    return true;
+}
 
-    //queue message
-    std::cout << "initializationRequest queue" << std::endl;
-    queueMessage(MessageType::Initialization, buffer);
-    */
-//}
+void ParallelConnection::disconnect() {
+    if (_socket) {
+        _socket->disconnect();
+    }
+}
 
-void ParallelConnection::listenCommunication() {
+ghoul::io::TcpSocket* ParallelConnection::socket() {
+    return _socket.get();
+}
+
+ParallelConnection::Message ParallelConnection::receiveMessage() {
+    // Header consists of 'OS' + majorVersion + minorVersion + messageSize
     constexpr size_t headerSize = 2 * sizeof(char) + 3 * sizeof(uint32_t);
 
     // Create basic buffer for receiving first part of messages
     std::vector<char> headerBuffer(headerSize);
     std::vector<char> messageBuffer;
 
-    int nBytesRead = 0;
-
-    // While we're still connected
-    while (_isConnected.load()) {
-        // Receive the header data
-        nBytesRead = receiveData(_clientSocket, headerBuffer, headerSize, 0);
-
-        // If enough data was received
-        if (nBytesRead <= 0) {
-            if (!_disconnect) {
-                LERROR(fmt::format(
-                    "Error {} detected in connection when reader header; disconnecting!",
-                    _ERRNO
-                ));
-                signalDisconnect();
-            }
-            break;
-        }
-
-        // Make sure that header matches this version of OpenSpace
-        if (!(headerBuffer[0] == 'O' && headerBuffer[1] && 'S')) {
-            LERROR("Expected to read message header 'OS' from socket.");
-            signalDisconnect();
-            break;
-        }
-
-        uint32_t* ptr = reinterpret_cast<uint32_t*>(&headerBuffer[2]);
-
-        uint32_t protocolVersionIn = *(ptr++);
-        uint32_t messageTypeIn = *(ptr++);
-        uint32_t messageSizeIn = *(ptr++);
-
-        if (protocolVersionIn != ProtocolVersion) {
-            LERROR(fmt::format(
-                "Protocol versions do not match. Server version: {}, Client version: {}",
-                protocolVersionIn,
-                ProtocolVersion
-            ));
-            signalDisconnect();
-            break;
-        }
-
-        size_t messageSize = messageSizeIn;
-
-        // Receive the payload
-        messageBuffer.resize(messageSize);
-        nBytesRead = receiveData(
-            _clientSocket,
-            messageBuffer,
-            static_cast<int>(messageSize),
-            0
-        );
-
-        if (nBytesRead <= 0) {
-            if (!_disconnect) {
-                LERROR(fmt::format(
-                    "Error {} detected in connection when reading message; disconnecting",
-                    _ERRNO
-                ));
-                signalDisconnect();
-            }
-            break;
-        }
-
-        // And delegate decoding depending on type
-        queueInMessage(Message(static_cast<MessageType>(messageTypeIn), messageBuffer));
+    
+    // Receive the header data
+    if (!_socket->get(headerBuffer.data(), headerSize)) {
+        LERROR("Failed to read header from socket. Disconencting.");
+        throw ConnectionLostError();
     }
 
-}
-
-int ParallelConnection::receiveData(_SOCKET& socket, std::vector<char>& buffer,
-                                    int length, int flags)
-{
-    SocketResultType result = 0;
-    SocketResultType received = 0;
-    while (result < length) {
-        received = recv(socket, buffer.data() + result, length - result, flags);
-
-        if (received > 0) {
-            result += received;
-            received = 0;
-        }
-        else {
-            // Error receiving
-            result = received;
-            break;
-        }
+    // Make sure that header matches this version of OpenSpace
+    if (!(headerBuffer[0] == 'O' && headerBuffer[1] && 'S')) {
+        LERROR("Expected to read message header 'OS' from socket.");
+        throw ConnectionLostError();
     }
 
-    return static_cast<int>(result);
-}
+    uint32_t* ptr = reinterpret_cast<uint32_t*>(&headerBuffer[2]);
 
-void ParallelConnection::setPort(std::string port){
-    _port = std::move(port);
-}
+    uint32_t protocolVersionIn = *(ptr++);
+    uint32_t messageTypeIn = *(ptr++);
+    uint32_t messageSizeIn = *(ptr++);
 
-void ParallelConnection::setAddress(std::string address){
-    _address = std::move(address);
-}
-
-void ParallelConnection::setName(std::string name){
-    _name = std::move(name);
-}
-
-void ParallelConnection::requestHostship(){
-    std::vector<char> buffer;
-    uint32_t passcode = hash(_hostPassword);
-    buffer.insert(
-        buffer.end(),
-        reinterpret_cast<char*>(&passcode),
-        reinterpret_cast<char*>(&passcode) + sizeof(uint32_t)
-    );
-    queueOutMessage(Message(MessageType::HostshipRequest, buffer));
-}
-
-void ParallelConnection::resignHostship() {
-    std::vector<char> buffer;
-    queueOutMessage(Message(MessageType::HostshipResignation, buffer));
-}
-
-void ParallelConnection::setPassword(std::string pwd) {
-    _password = std::move(pwd);
-}
-
-void ParallelConnection::setHostPassword(std::string pwd) {
-    _hostPassword = std::move(pwd);
-}
-
-bool ParallelConnection::initNetworkAPI() {
-#if defined(WIN32)
-    WORD version = MAKEWORD(2, 2);
-    WSADATA wsaData;
-    const int error = WSAStartup(version, &wsaData);
-
-    if (error != 0 || LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2) {
-        // Incorrect WinSock version
-        LERROR("Failed to init winsock API.");
-        // WSACleanup();
-        return false;
-    }
-#else
-    // No init needed on unix
-#endif
-
-    return true;
-}
-
-void ParallelConnection::sendScript(std::string script) {
-    if (!isHost()) {
-        return;
+    if (protocolVersionIn != ProtocolVersion) {
+        LERROR(fmt::format(
+            "Protocol versions do not match. Remote version: {}, Local version: {}",
+            protocolVersionIn,
+            ProtocolVersion
+        ));
+        throw ConnectionLostError();
     }
 
-    datamessagestructures::ScriptMessage sm;
-    sm._script = std::move(script);
+    size_t messageSize = messageSizeIn;
 
-    std::vector<char> buffer;
-    sm.serialize(buffer);
-
-    queueOutDataMessage(DataMessage(datamessagestructures::Type::ScriptData, buffer));
-}
-
-void ParallelConnection::resetTimeOffset() {
-    OsEng.navigationHandler().keyframeNavigator().clearKeyframes();
-    OsEng.timeManager().clearKeyframes();
-    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
-    _latencyDiffs.clear();
-}
-
-void ParallelConnection::preSynchronization() {
-    std::unique_lock<std::mutex> unqlock(_receiveBufferMutex);
-    while (!_receiveBuffer.empty()) {
-        Message& message = _receiveBuffer.front();
-        handleMessage(message);
-        _receiveBuffer.pop_front();
+    // Receive the payload
+    messageBuffer.resize(messageSize);
+    if (!_socket->get(messageBuffer.data(), messageSize)) {
+        LERROR("Failed to read message from socket. Disconencting.");
+        throw ConnectionLostError();
     }
 
-    if (status() == Status::Host) {
-        if (OsEng.timeManager().time().timeJumped()) {
-            _timeJumped = true;
-        }
-        double now = OsEng.windowWrapper().applicationTime();
-
-        if (_lastCameraKeyframeTimestamp + _cameraKeyframeInterval < now) {
-            sendCameraKeyframe();
-            _lastCameraKeyframeTimestamp = now;
-        }
-        if (_lastTimeKeyframeTimestamp + _timeKeyframeInterval < now) {
-            sendTimeKeyframe();
-            _lastTimeKeyframeTimestamp = now;
-        }
-    }
-}
-
-void ParallelConnection::setStatus(Status status) {
-    if (_status != status) {
-        _status = status;
-        _timeJumped = true;
-        _connectionEvent->publish("statusChanged");
-    }
-}
-
-ParallelConnection::Status ParallelConnection::status() {
-    return _status;
-}
-
-void ParallelConnection::setNConnections(size_t nConnections) {
-    if (_nConnections != nConnections) {
-        _nConnections = nConnections;
-        _connectionEvent->publish("nConnectionsChanged");
-    }
-}
-
-int ParallelConnection::nConnections() {
-    return static_cast<int>(_nConnections);
-}
-
-bool ParallelConnection::isHost() {
-    return _status == Status::Host;
-}
-
-void ParallelConnection::setHostName(const std::string& hostName) {
-    if (_hostName != hostName) {
-        _hostName = hostName;
-        _connectionEvent->publish("hostNameChanged");
-    }
-}
-
-const std::string& ParallelConnection::hostName() {
-    return _hostName;
-}
-
-void ParallelConnection::sendCameraKeyframe() {
-    SceneGraphNode* focusNode = OsEng.navigationHandler().focusNode();
-    if (!focusNode) {
-        return;
-    }
-
-    // Create a keyframe with current position and orientation of camera
-    datamessagestructures::CameraKeyframe kf;
-    kf._position = OsEng.navigationHandler().focusNodeToCameraVector();
-
-    kf._followNodeRotation =
-                     OsEng.navigationHandler().orbitalNavigator().followingNodeRotation();
-    if (kf._followNodeRotation) {
-        kf._position = glm::inverse(focusNode->worldRotationMatrix()) * kf._position;
-        kf._rotation = OsEng.navigationHandler().focusNodeToCameraRotation();
-    } else {
-        kf._rotation = OsEng.navigationHandler().camera()->rotationQuaternion();
-    }
-
-    kf._focusNode = focusNode->name();
-
-    // Timestamp as current runtime of OpenSpace instance
-    kf._timestamp = OsEng.windowWrapper().applicationTime();
-
-    // Create a buffer for the keyframe
-    std::vector<char> buffer;
-
-    // Fill the keyframe buffer
-    kf.serialize(buffer);
-
-    // Send message
-    queueOutDataMessage(DataMessage(datamessagestructures::Type::CameraData, buffer));
-}
-
-void ParallelConnection::sendTimeKeyframe() {
-    // Create a keyframe with current position and orientation of camera
-    datamessagestructures::TimeKeyframe kf;
-
-    Time& time = OsEng.timeManager().time();
-
-    kf._dt = time.deltaTime();
-    kf._paused = time.paused();
-    kf._requiresTimeJump = _timeJumped;
-    kf._time = time.j2000Seconds();
-
-    // Timestamp as current runtime of OpenSpace instance
-    kf._timestamp = OsEng.windowWrapper().applicationTime();
-
-    // Create a buffer for the keyframe
-    std::vector<char> buffer;
-
-    // Fill the keyframe buffer
-    kf.serialize(buffer);
-
-    // Send message
-    queueOutDataMessage(DataMessage(datamessagestructures::Type::TimeData, buffer));
-    _timeJumped = false;
-}
-
-uint32_t ParallelConnection::hash(const std::string& val) {
-    uint32_t hashVal = 0, i;
-    size_t len = val.length();
-
-    for (hashVal = i = 0; i < len; ++i) {
-        hashVal += val.c_str()[i];
-        hashVal += (hashVal << 10);
-        hashVal ^= (hashVal >> 6);
-    }
-
-    hashVal += (hashVal << 3);
-    hashVal ^= (hashVal >> 11);
-    hashVal += (hashVal << 15);
-
-    return hashVal;
-}
-
-std::shared_ptr<ghoul::Event<>> ParallelConnection::connectionEvent() {
-    return _connectionEvent;
-}
-
-scripting::LuaLibrary ParallelConnection::luaLibrary() {
-    return {
-        "parallel",
-        {
-            {
-                "connect",
-                &luascriptfunctions::connect,
-                {},
-                "",
-                "Connect to parallel"
-            },
-            {
-                "disconnect",
-                &luascriptfunctions::disconnect,
-                {},
-                "",
-                "Disconnect from parallel"
-            },
-            {
-                "requestHostship",
-                &luascriptfunctions::requestHostship,
-                {},
-                "",
-                "Request to be the host for this session"
-            },
-            {
-                "resignHostship",
-                &luascriptfunctions::resignHostship,
-                {},
-                "",
-                "Resign hostship"
-            },
-        }
-    };
+    // And delegate decoding depending on type
+    return ParallelConnection::Message(static_cast<ParallelConnection::MessageType>(messageTypeIn), messageBuffer);
 }
 
 } // namespace openspace
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
new file mode 100644
index 0000000000..e388914926
--- /dev/null
+++ b/src/network/parallelpeer.cpp
@@ -0,0 +1,621 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * 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/network/parallelpeer.h>
+
+#include <openspace/openspace.h>
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/interaction/navigationhandler.h>
+#include <openspace/interaction/orbitalnavigator.h>
+#include <openspace/scene/scenegraphnode.h>
+#include <openspace/util/time.h>
+#include <openspace/util/timemanager.h>
+
+#include <ghoul/logging/logmanager.h>
+
+#include "parallelpeer_lua.inl"
+
+namespace {
+const uint32_t ProtocolVersion = 3;
+const size_t MaxLatencyDiffs = 64;
+const char* _loggerCat = "ParallelPeer";
+
+static const openspace::properties::Property::PropertyInfo PasswordInfo = {
+    "Password",
+    "Password",
+    "The general password that allows this OpenSpace instance access to the Wormhole "
+    "server."
+};
+
+static const openspace::properties::Property::PropertyInfo HostPasswordInfo = {
+    "HostPassword",
+    "Host Password",
+    "The password that is required to take control of the joint session and thus "
+    "send all commands to connected clients."
+};
+
+static const openspace::properties::Property::PropertyInfo PortInfo = {
+    "Port",
+    "Port",
+    "The port on which the Wormhole server is listening to connections from "
+    "OpenSpace."
+};
+
+static const openspace::properties::Property::PropertyInfo AddressInfo = {
+    "Address",
+    "Address",
+    "The address of the Wormhole server either as a DNS name or an IP address."
+};
+
+static const openspace::properties::Property::PropertyInfo NameInfo = {
+    "Name",
+    "Connection Name",
+    "The name of this OpenSpace instance that will be potentially broadcast to other "
+    "connected instances."
+};
+
+static const openspace::properties::Property::PropertyInfo BufferTimeInfo = {
+    "BufferTime",
+    "Buffer Time",
+    "" // @TODO Missing documentation
+};
+
+static const openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = {
+    "TimeKeyframeInterval",
+    "Time keyframe interval",
+    "" // @TODO Missing documentation
+};
+
+static const openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = {
+    "CameraKeyframeInterval",
+    "Camera Keyframe interval",
+    "" // @TODO Missing documentation
+};
+
+static const openspace::properties::Property::PropertyInfo TimeToleranceInfo = {
+    "TimeTolerance",
+    "Time tolerance",
+    "" // @TODO Missing documentation
+};
+
+} // namespace
+
+namespace openspace {
+
+ParallelPeer::ParallelPeer()
+    : properties::PropertyOwner({ "ParallelPeer", "Parallel Peer" })
+    , _password(PasswordInfo)
+    , _hostPassword(HostPasswordInfo)
+    , _port(PortInfo)
+    , _address(AddressInfo)
+    , _name(NameInfo)
+    , _bufferTime(BufferTimeInfo, 0.2f, 0.01f, 5.0f)
+    , _timeKeyframeInterval(TimeKeyFrameInfo, 0.1f, 0.f, 1.f)
+    , _cameraKeyframeInterval(CameraKeyFrameInfo, 0.1f, 0.f, 1.f)
+    , _timeTolerance(TimeToleranceInfo, 1.f, 0.5f, 5.f)
+    , _lastTimeKeyframeTimestamp(0)
+    , _lastCameraKeyframeTimestamp(0)
+    , _shouldDisconnect(false)
+    , _nConnections(0)
+    , _status(ParallelConnection::Status::Disconnected)
+    , _hostName("")
+    , _receiveThread(nullptr)
+    , _connection(nullptr)
+{
+    addProperty(_name);
+    addProperty(_port);
+    addProperty(_address);
+    addProperty(_bufferTime);
+
+    addProperty(_password);
+    addProperty(_hostPassword);
+
+    addProperty(_timeKeyframeInterval);
+    addProperty(_cameraKeyframeInterval);
+    addProperty(_timeTolerance);
+
+    _connectionEvent = std::make_shared<ghoul::Event<>>();
+}
+
+ParallelPeer::~ParallelPeer() {
+    disconnect();
+}
+
+void ParallelPeer::connect() {
+    disconnect();
+
+    setStatus(ParallelConnection::Status::Connecting);
+    std::string port = _port;
+
+    std::unique_ptr<ghoul::io::TcpSocket> socket =
+        std::make_unique<ghoul::io::TcpSocket>(_address, atoi(port.c_str()));
+
+    socket->connect();
+    _connection = ParallelConnection(std::move(socket));
+
+    sendAuthentication();
+
+    _receiveThread = std::make_unique<std::thread>(
+        [this]() { handleCommunication(); }
+    );
+}
+
+void ParallelPeer::disconnect() {
+    _shouldDisconnect = true;
+    _connection.disconnect();
+    if (_receiveThread && _receiveThread->joinable()) {
+        _receiveThread->join();
+        _receiveThread = nullptr;
+    }
+    _shouldDisconnect = false;
+    setStatus(ParallelConnection::Status::Disconnected);
+}
+
+void ParallelPeer::sendAuthentication() {
+    std::string name = _name.value();
+    // Length of this nodes name
+    uint32_t nameLength = static_cast<uint32_t>(name.length());
+
+    // Total size of the buffer: (passcode + namelength + name)
+    size_t size = sizeof(uint64_t) + sizeof(uint32_t) + nameLength;
+
+    // Create and reserve buffer
+    std::vector<char> buffer;
+    buffer.reserve(size);
+
+    uint64_t passCode = std::hash<std::string>{}(_password.value());
+
+    // Write the hashed password to buffer
+    buffer.insert(
+        buffer.end(),
+        reinterpret_cast<char*>(&passCode),
+        reinterpret_cast<char*>(&passCode) + sizeof(uint64_t)
+    );
+
+    // Write the length of the nodes name to buffer
+    buffer.insert(
+        buffer.end(),
+        reinterpret_cast<char*>(&nameLength),
+        reinterpret_cast<char*>(&nameLength) + sizeof(uint32_t)
+    );
+
+    // Write this node's name to buffer
+    buffer.insert(buffer.end(), name.begin(), name.end());
+
+    // Send message
+    _connection.sendMessage(ParallelConnection::Message(ParallelConnection::MessageType::Authentication, buffer));
+}
+
+void ParallelPeer::queueInMessage(const ParallelConnection::Message& message) {
+    std::lock_guard<std::mutex> unqlock(_receiveBufferMutex);
+    _receiveBuffer.push_back(message);
+}
+
+void ParallelPeer::handleMessage(const  ParallelConnection::Message& message) {
+    switch (message.type) {
+    case ParallelConnection::MessageType::Data:
+        dataMessageReceived(message.content);
+        break;
+    case ParallelConnection::MessageType::ConnectionStatus:
+        connectionStatusMessageReceived(message.content);
+        break;
+    case ParallelConnection::MessageType::NConnections:
+        nConnectionsMessageReceived(message.content);
+        break;
+    default:
+        //unknown message type
+        break;
+    }
+}
+
+double ParallelPeer::calculateBufferedKeyframeTime(double originalTime) {
+    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
+
+    double timeDiff = OsEng.windowWrapper().applicationTime() - originalTime;
+    if (_latencyDiffs.size() == 0) {
+        _initialTimeDiff = timeDiff;
+    }
+    double latencyDiff = timeDiff - _initialTimeDiff;
+    if (_latencyDiffs.size() >= MaxLatencyDiffs) {
+        _latencyDiffs.pop_front();
+    }
+    _latencyDiffs.push_back(latencyDiff);
+
+    return originalTime + timeDiff + latencyDiff + _bufferTime;
+}
+
+double ParallelPeer::latencyStandardDeviation() const {
+    double accumulatedLatencyDiffSquared = 0;
+    double accumulatedLatencyDiff = 0;
+    for (double diff : _latencyDiffs) {
+        accumulatedLatencyDiff += diff;
+        accumulatedLatencyDiffSquared += diff*diff;
+    }
+    double expectedLatencyDiffSquared =
+        accumulatedLatencyDiffSquared / _latencyDiffs.size();
+
+    double expectedLatencyDiff = accumulatedLatencyDiff / _latencyDiffs.size();
+
+    // V(X) = E(x^2) - E(x)^2
+    double latencyVariance = expectedLatencyDiffSquared -
+        expectedLatencyDiff*expectedLatencyDiff;
+
+    return std::sqrt(latencyVariance);
+}
+
+double ParallelPeer::timeTolerance() const {
+    return _timeTolerance;
+}
+
+void ParallelPeer::dataMessageReceived(const std::vector<char>& messageContent) {
+    // The type of data message received
+    uint32_t type = *(reinterpret_cast<const uint32_t*>(messageContent.data()));
+    std::vector<char> buffer(
+        messageContent.begin() + sizeof(uint32_t),
+        messageContent.end()
+    );
+
+    switch (static_cast<datamessagestructures::Type>(type)) {
+    case datamessagestructures::Type::CameraData: {
+        datamessagestructures::CameraKeyframe kf(buffer);
+        kf._timestamp = calculateBufferedKeyframeTime(kf._timestamp);
+
+        OsEng.navigationHandler().keyframeNavigator().removeKeyframesAfter(kf._timestamp);
+        interaction::KeyframeNavigator::CameraPose pose;
+        pose.focusNode = kf._focusNode;
+        pose.position = kf._position;
+        pose.rotation = kf._rotation;
+        pose.followFocusNodeRotation = kf._followNodeRotation;
+
+        OsEng.navigationHandler().keyframeNavigator().addKeyframe(kf._timestamp, pose);
+        break;
+    }
+    case datamessagestructures::Type::TimeData: {
+        datamessagestructures::TimeKeyframe kf(buffer);
+        kf._timestamp = calculateBufferedKeyframeTime(kf._timestamp);
+
+        OsEng.timeManager().removeKeyframesAfter(kf._timestamp);
+        Time time(kf._time);
+        time.setDeltaTime(kf._dt);
+        time.setPause(kf._paused);
+        time.setTimeJumped(kf._requiresTimeJump);
+
+        OsEng.timeManager().addKeyframe(kf._timestamp, time);
+        break;
+    }
+    case datamessagestructures::Type::ScriptData: {
+        datamessagestructures::ScriptMessage sm;
+        sm.deserialize(buffer);
+
+        OsEng.scriptEngine().queueScript(
+            sm._script,
+            scripting::ScriptEngine::RemoteScripting::No
+        );
+        break;
+    }
+    default: {
+        LERROR(fmt::format(
+            "Unidentified message with identifier {} received in parallel connection",
+            type
+        ));
+        break;
+    }
+    }
+}
+
+
+void ParallelPeer::connectionStatusMessageReceived(const std::vector<char>& message)
+{
+    if (message.size() < 2 * sizeof(uint32_t)) {
+        LERROR("Malformed connection status message.");
+        return;
+    }
+    size_t pointer = 0;
+    uint32_t statusIn = *(reinterpret_cast<const uint32_t*>(&message[pointer]));
+    ParallelConnection::Status status = static_cast<ParallelConnection::Status>(statusIn);
+    pointer += sizeof(uint32_t);
+
+    size_t hostNameSize = *(reinterpret_cast<const uint32_t*>(&message[pointer]));
+    pointer += sizeof(uint32_t);
+
+    if (hostNameSize > message.size() - pointer) {
+        LERROR("Malformed connection status message.");
+        return;
+    }
+
+    std::string hostName = "";
+    if (hostNameSize > 0) {
+        hostName = std::string(&message[pointer], hostNameSize);
+    }
+    pointer += hostNameSize;
+
+    if (status > ParallelConnection::Status::Host) {
+        LERROR("Invalid status.");
+        return;
+    }
+
+    _latencyMutex.lock();
+    _latencyDiffs.clear();
+    _latencyMutex.unlock();
+    setHostName(hostName);
+
+    if (status == _status) {
+        // Status remains unchanged.
+        return;
+    }
+
+    setStatus(status);
+
+    OsEng.navigationHandler().keyframeNavigator().clearKeyframes();
+    OsEng.timeManager().clearKeyframes();
+
+}
+
+void ParallelPeer::nConnectionsMessageReceived(const std::vector<char>& message) {
+    if (message.size() < sizeof(uint32_t)) {
+        LERROR("Malformed host info message.");
+        return;
+    }
+    uint32_t nConnections = *(reinterpret_cast<const uint32_t*>(&message[0]));
+    setNConnections(nConnections);
+}
+
+void ParallelPeer::handleCommunication() {
+    while (!_shouldDisconnect && _connection.isConnectedOrConnecting()) {
+        try {
+            ParallelConnection::Message m = _connection.receiveMessage();
+               queueInMessage(m);
+        } catch (const ParallelConnection::ConnectionLostError&) {
+            LERROR("Parallel connection lost");
+        }
+    }
+    setStatus(ParallelConnection::Status::Disconnected);
+}
+
+void ParallelPeer::setPort(std::string port) {
+    _port = std::move(port);
+}
+
+void ParallelPeer::setAddress(std::string address) {
+    _address = std::move(address);
+}
+
+void ParallelPeer::setName(std::string name) {
+    _name = std::move(name);
+}
+
+void ParallelPeer::requestHostship() {
+    std::vector<char> buffer;
+    uint64_t passwordHash = std::hash<std::string>{}(_hostPassword);
+    buffer.insert(
+        buffer.end(),
+        reinterpret_cast<char*>(&passwordHash),
+        reinterpret_cast<char*>(&passwordHash) + sizeof(uint64_t)
+    );
+    _connection.sendMessage(ParallelConnection::Message(ParallelConnection::MessageType::HostshipRequest, buffer));
+}
+
+void ParallelPeer::resignHostship() {
+    std::vector<char> buffer;
+    _connection.sendMessage(ParallelConnection::Message(ParallelConnection::MessageType::HostshipResignation, buffer));
+}
+
+void ParallelPeer::setPassword(std::string pwd) {
+    _password = std::move(pwd);
+}
+
+void ParallelPeer::setHostPassword(std::string pwd) {
+    _hostPassword = std::move(pwd);
+}
+
+void ParallelPeer::sendScript(std::string script) {
+    if (!isHost()) {
+        return;
+    }
+
+    datamessagestructures::ScriptMessage sm;
+    sm._script = std::move(script);
+
+    std::vector<char> buffer;
+    sm.serialize(buffer);
+
+    ParallelConnection::DataMessage message(datamessagestructures::Type::ScriptData, buffer);
+    _connection.sendDataMessage(message);
+}
+
+void ParallelPeer::resetTimeOffset() {
+    OsEng.navigationHandler().keyframeNavigator().clearKeyframes();
+    OsEng.timeManager().clearKeyframes();
+    std::lock_guard<std::mutex> latencyLock(_latencyMutex);
+    _latencyDiffs.clear();
+}
+
+void ParallelPeer::preSynchronization() {
+    std::unique_lock<std::mutex> unqlock(_receiveBufferMutex);
+    while (!_receiveBuffer.empty()) {
+        ParallelConnection::Message& message = _receiveBuffer.front();
+        handleMessage(message);
+        _receiveBuffer.pop_front();
+    }
+
+    if (status() == ParallelConnection::Status::Host) {
+        if (OsEng.timeManager().time().timeJumped()) {
+            _timeJumped = true;
+        }
+        double now = OsEng.windowWrapper().applicationTime();
+
+        if (_lastCameraKeyframeTimestamp + _cameraKeyframeInterval < now) {
+            sendCameraKeyframe();
+            _lastCameraKeyframeTimestamp = now;
+        }
+        if (_lastTimeKeyframeTimestamp + _timeKeyframeInterval < now) {
+            sendTimeKeyframe();
+            _lastTimeKeyframeTimestamp = now;
+        }
+    }
+    if (_shouldDisconnect) {
+        disconnect();
+    }
+}
+
+void ParallelPeer::setStatus(ParallelConnection::Status status) {
+    if (_status != status) {
+        _status = status;
+        _timeJumped = true;
+        _connectionEvent->publish("statusChanged");
+    }
+}
+
+ParallelConnection::Status ParallelPeer::status() {
+    return _status;
+}
+
+void ParallelPeer::setNConnections(size_t nConnections) {
+    if (_nConnections != nConnections) {
+        _nConnections = nConnections;
+        _connectionEvent->publish("nConnectionsChanged");
+    }
+}
+
+int ParallelPeer::nConnections() {
+    return static_cast<int>(_nConnections);
+}
+
+bool ParallelPeer::isHost() {
+    return _status == ParallelConnection::Status::Host;
+}
+
+void ParallelPeer::setHostName(const std::string& hostName) {
+    if (_hostName != hostName) {
+        _hostName = hostName;
+        _connectionEvent->publish("hostNameChanged");
+    }
+}
+
+const std::string& ParallelPeer::hostName() {
+    return _hostName;
+}
+
+void ParallelPeer::sendCameraKeyframe() {
+    SceneGraphNode* focusNode = OsEng.navigationHandler().focusNode();
+    if (!focusNode) {
+        return;
+    }
+
+    // Create a keyframe with current position and orientation of camera
+    datamessagestructures::CameraKeyframe kf;
+    kf._position = OsEng.navigationHandler().focusNodeToCameraVector();
+
+    kf._followNodeRotation =
+        OsEng.navigationHandler().orbitalNavigator().followingNodeRotation();
+    if (kf._followNodeRotation) {
+        kf._position = glm::inverse(focusNode->worldRotationMatrix()) * kf._position;
+        kf._rotation = OsEng.navigationHandler().focusNodeToCameraRotation();
+    }
+    else {
+        kf._rotation = OsEng.navigationHandler().camera()->rotationQuaternion();
+    }
+
+    kf._focusNode = focusNode->identifier();
+
+    // Timestamp as current runtime of OpenSpace instance
+    kf._timestamp = OsEng.windowWrapper().applicationTime();
+
+    // Create a buffer for the keyframe
+    std::vector<char> buffer;
+
+    // Fill the keyframe buffer
+    kf.serialize(buffer);
+
+    // Send message
+    _connection.sendDataMessage(ParallelConnection::DataMessage(datamessagestructures::Type::CameraData, buffer));
+}
+
+void ParallelPeer::sendTimeKeyframe() {
+    // Create a keyframe with current position and orientation of camera
+    datamessagestructures::TimeKeyframe kf;
+
+    Time& time = OsEng.timeManager().time();
+
+    kf._dt = time.deltaTime();
+    kf._paused = time.paused();
+    kf._requiresTimeJump = _timeJumped;
+    kf._time = time.j2000Seconds();
+
+    // Timestamp as current runtime of OpenSpace instance
+    kf._timestamp = OsEng.windowWrapper().applicationTime();
+
+    // Create a buffer for the keyframe
+    std::vector<char> buffer;
+
+    // Fill the keyframe buffer
+    kf.serialize(buffer);
+
+    // Send message
+    _connection.sendDataMessage(ParallelConnection::DataMessage(datamessagestructures::Type::TimeData, buffer));
+    _timeJumped = false;
+}
+
+std::shared_ptr<ghoul::Event<>> ParallelPeer::connectionEvent() {
+    return _connectionEvent;
+}
+
+scripting::LuaLibrary ParallelPeer::luaLibrary() {
+    return {
+        "parallel",
+        {
+            {
+                "connect",
+                &luascriptfunctions::connect,
+                {},
+                "",
+                "Connect to parallel"
+            },
+            {
+                "disconnect",
+                &luascriptfunctions::disconnect,
+                {},
+                "",
+                "Disconnect from parallel"
+            },
+            {
+                "requestHostship",
+                &luascriptfunctions::requestHostship,
+                {},
+                "",
+                "Request to be the host for this session"
+            },
+            {
+                "resignHostship",
+                &luascriptfunctions::resignHostship,
+                {},
+                "",
+                "Resign hostship"
+            },
+        }
+    };
+}
+
+} // namespace openspace
diff --git a/src/network/parallelconnection_lua.inl b/src/network/parallelpeer_lua.inl
similarity index 93%
rename from src/network/parallelconnection_lua.inl
rename to src/network/parallelpeer_lua.inl
index df8ae51841..dfa5dc636c 100644
--- a/src/network/parallelconnection_lua.inl
+++ b/src/network/parallelpeer_lua.inl
@@ -28,7 +28,7 @@ int connect(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::connect");
 
     if (OsEng.windowWrapper().isMaster()) {
-        OsEng.parallelConnection().clientConnect();
+        OsEng.parallelPeer().connect();
     }
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -39,7 +39,7 @@ int disconnect(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::disconnect");
 
     if (OsEng.windowWrapper().isMaster()) {
-        OsEng.parallelConnection().signalDisconnect();
+        OsEng.parallelPeer().connect();
     }
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -50,7 +50,7 @@ int requestHostship(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::requestHostship");
 
     if (OsEng.windowWrapper().isMaster()) {
-        OsEng.parallelConnection().requestHostship();
+        OsEng.parallelPeer().requestHostship();
     }
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
@@ -61,7 +61,7 @@ int resignHostship(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::resignHostship");
 
     if (OsEng.windowWrapper().isMaster()) {
-        OsEng.parallelConnection().resignHostship();
+        OsEng.parallelPeer().resignHostship();
     }
 
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
diff --git a/src/network/parallelserver.cpp b/src/network/parallelserver.cpp
new file mode 100644
index 0000000000..bb9281d374
--- /dev/null
+++ b/src/network/parallelserver.cpp
@@ -0,0 +1,443 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2018                                                               *
+ *                                                                                       *
+ * 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/network/parallelserver.h>
+
+#include <ghoul/logging/logmanager.h>
+
+#include <functional>
+
+namespace {
+const char* _loggerCat = "ParallelServer";
+} // namespace
+
+namespace openspace {
+
+void ParallelServer::start(
+    int port,
+    const std::string& password,
+    const std::string& changeHostPassword)
+{
+    _socketServer.listen("localhost", port);
+    _passwordHash = std::hash<std::string>{}(password);
+    _changeHostPasswordHash = std::hash<std::string>{}(changeHostPassword);
+
+    _serverThread = std::thread([this](){
+        handleNewPeers();
+    });
+    _eventLoopThread = std::thread([this]() {
+        eventLoop();
+    });
+}
+
+void ParallelServer::setDefaultHostAddress(std::string defaultHostAddress) {
+    std::lock_guard<std::mutex> lock(_hostInfoMutex); 
+    _defaultHostAddress = std::move(defaultHostAddress);
+
+}
+
+std::string ParallelServer::defaultHostAddress() const
+{
+    std::lock_guard<std::mutex> lock(_hostInfoMutex);
+    return _defaultHostAddress;
+}
+
+void ParallelServer::stop() {
+    _shouldStop = true;
+    _socketServer.close();
+}
+
+void ParallelServer::handleNewPeers() {
+    while (!_shouldStop) {
+        std::unique_ptr<ghoul::io::TcpSocket> socket =
+            _socketServer.awaitPendingTcpSocket();
+
+        socket->startStreams();
+
+        size_t id = _nextConnectionId++;
+        std::shared_ptr<Peer> p = std::make_shared<Peer>(Peer{
+            id,
+            "",
+            ParallelConnection(std::move(socket)),
+            ParallelConnection::Status::Connecting,
+            std::thread()
+        });
+        auto it = _peers.emplace(p->id, p);
+        it.first->second->thread = std::thread([this, id]() {
+            handlePeer(id);
+        });
+    }
+}
+    
+std::shared_ptr<ParallelServer::Peer> ParallelServer::peer(size_t id) {
+    std::lock_guard<std::mutex> lock(_peerListMutex);
+    const auto& it = _peers.find(id);
+    if (it == _peers.end()) {
+        return nullptr;
+    }
+    return it->second;
+}
+
+void ParallelServer::handlePeer(size_t id) {
+    while (!_shouldStop) {
+        std::shared_ptr<Peer> p = peer(id);
+        if (!p) {
+            return;
+        }
+
+        if (!p->parallelConnection.isConnectedOrConnecting()) {
+            return;
+        }
+        try {
+            ParallelConnection::Message m = p->parallelConnection.receiveMessage();
+            _incomingMessages.push({id, m});
+        } catch (const ParallelConnection::ConnectionLostError&) {
+            LERROR(fmt::format("Connection lost to {}", p->id));
+            _incomingMessages.push({
+                id,
+                ParallelConnection::Message(
+                    ParallelConnection::MessageType::Disconnection, std::vector<char>())
+            });
+            return;
+        }
+    }
+}
+
+void ParallelServer::eventLoop() {
+    while (!_shouldStop) {
+        PeerMessage pm = _incomingMessages.pop();
+        handlePeerMessage(std::move(pm));
+    }
+}
+
+void ParallelServer::handlePeerMessage(PeerMessage peerMessage) {
+    ParallelConnection::MessageType messageType = peerMessage.message.type;
+    size_t peerId = peerMessage.peerId;
+    std::vector<char>& data = peerMessage.message.content;
+
+    const auto& it = _peers.find(peerId);
+    if (it == _peers.end()) {
+        return;
+    }
+
+    std::shared_ptr<Peer>& peer = it->second;
+    
+    switch (messageType) {
+        case ParallelConnection::MessageType::Authentication:
+            handleAuthentication(peer, std::move(data));
+            break;
+        case ParallelConnection::MessageType::Data:
+            handleData(peer, std::move(data));
+            break;
+        case ParallelConnection::MessageType::HostshipRequest:
+            handleHostshipRequest(peer, std::move(data));
+            break;
+        case ParallelConnection::MessageType::HostshipResignation:
+            handleHostshipResignation(peer, std::move(data));
+            break;
+        case ParallelConnection::MessageType::Disconnection:
+            disconnect(peer);
+            break;
+        default:
+            LERROR(fmt::format("Unsupported message type: {}",
+                static_cast<int>(messageType)));
+            break;
+    }
+}
+    
+void ParallelServer::handleAuthentication(std::shared_ptr<Peer> peer,
+                                          std::vector<char> message)
+{
+    std::stringstream input(std::string(message.begin(), message.end()));
+
+    // 8 bytes passcode
+    uint64_t passwordHash = 0;
+    input.read(reinterpret_cast<char*>(&passwordHash), sizeof(uint64_t));
+
+    if (passwordHash != _passwordHash) {
+        LERROR(fmt::format("Connection {} provided incorrect passcode.", peer->id));
+        disconnect(peer);
+        return;
+    }
+
+    // 4 bytes name size
+    uint32_t nameSize = 0;
+    input.read(reinterpret_cast<char*>(&nameSize), sizeof(uint32_t));
+
+    // <nameSize> bytes name
+    std::string name(nameSize, static_cast<char>(0));
+    input.read(&name[0], nameSize);
+
+    if (nameSize == 0) {
+        name = "Anonymous";
+    }
+
+    setName(peer, name);
+
+    LINFO(fmt::format("Connection established with {} \"{}\"", peer->id, name));
+
+    std::string defaultHostAddress;
+    {
+        std::lock_guard<std::mutex> _hostMutex(_hostInfoMutex);
+        defaultHostAddress = _defaultHostAddress;
+    }
+    if (_hostPeerId == 0 &&
+        peer->parallelConnection.socket()->address() == defaultHostAddress)
+    {
+        // Directly promote the conenction to host (initialize)
+        // if there is no host, and ip matches default host ip.
+        LINFO(fmt::format("Connection {} directly promoted to host.", peer->id));
+        assignHost(peer);
+        for (auto& it : _peers) {
+            sendConnectionStatus(peer);
+        }
+    }
+    else {
+        setToClient(peer);
+    }
+
+    setNConnections(nConnections() + 1);
+}
+    
+void ParallelServer::handleData(std::shared_ptr<Peer> peer, std::vector<char> data) {
+    if (peer->id != _hostPeerId) {
+        LINFO(fmt::format(
+            "Connection {} tried to send data without being the host. Ignoring", peer->id
+        ));
+    }
+    sendMessageToClients(ParallelConnection::MessageType::Data, data);
+
+}
+
+void ParallelServer::handleHostshipRequest(std::shared_ptr<Peer> peer,
+                                           std::vector<char> message)
+{
+    std::stringstream input(std::string(message.begin(), message.end()));
+
+    LINFO(fmt::format("Connection {} requested hostship.", peer->id));
+
+    uint64_t passwordHash = 0;
+    input.read(reinterpret_cast<char*>(&passwordHash), sizeof(uint64_t));
+
+    if (passwordHash != _changeHostPasswordHash) {
+        LERROR(fmt::format("Connection {} provided incorrect host password.", peer->id));
+        return;
+    }
+
+    size_t oldHostPeerId = 0;
+    {
+        std::lock_guard<std::mutex> lock(_hostInfoMutex);
+        oldHostPeerId = _hostPeerId;
+    }
+
+    if (oldHostPeerId == peer->id) {
+        LINFO(fmt::format("Connection {} is already the host.", peer->id));
+        return;
+    }
+
+    assignHost(peer);
+    LINFO(fmt::format("Switched host from {} to {}.", oldHostPeerId, peer->id));
+}
+    
+void ParallelServer::handleHostshipResignation(std::shared_ptr<Peer> peer,
+                                               std::vector<char> data)
+{
+    LINFO(fmt::format("Connection {} wants to resign its hostship.", peer->id));
+
+    size_t oldHostPeerId = 0;
+    {
+        std::lock_guard<std::mutex> lock(_hostInfoMutex);
+        oldHostPeerId = _hostPeerId;
+    }
+
+    setToClient(peer);
+
+    LINFO(fmt::format("Connection {} resigned as host.", peer->id));
+}
+
+bool ParallelServer::isConnected(std::shared_ptr<Peer> peer) const {
+    return peer->status != ParallelConnection::Status::Connecting &&
+        peer->status != ParallelConnection::Status::Disconnected;
+}
+
+void ParallelServer::sendMessage(std::shared_ptr<Peer> peer,
+    ParallelConnection::MessageType messageType,
+    const std::vector<char>& message)
+{
+    peer->parallelConnection.sendMessage(
+        ParallelConnection::Message(messageType, message)
+    );
+}
+
+void ParallelServer::sendMessageToAll(ParallelConnection::MessageType messageType,
+    const std::vector<char>& message)
+{
+    for (auto& it : _peers) {
+        if (isConnected(it.second))
+        {
+            it.second->parallelConnection.sendMessage(
+                ParallelConnection::Message(messageType, message)
+            );
+        }
+    }
+}
+
+void ParallelServer::sendMessageToClients(ParallelConnection::MessageType messageType,
+    const std::vector<char>& message)
+{
+    for (auto& it : _peers) {
+        if (it.second->status == ParallelConnection::Status::ClientWithHost) {
+            it.second->parallelConnection.sendMessage(
+                ParallelConnection::Message(messageType, message)
+            );
+        }
+    }
+}
+
+void ParallelServer::disconnect(std::shared_ptr<Peer> peer) {
+    if (isConnected(peer)) {
+        setNConnections(nConnections() - 1);
+    }
+
+    size_t hostPeerId = 0;
+    {
+        std::lock_guard<std::mutex> lock(_hostInfoMutex);
+        hostPeerId = _hostPeerId;
+    }
+
+    // Make sure any disconnecting host is first degraded to client,
+    // in order to notify other clients about host disconnection.
+    if (peer->id == hostPeerId) {
+        setToClient(peer);
+    }
+
+    peer->parallelConnection.disconnect();
+    peer->thread.join();
+    _peers.erase(peer->id);
+}
+
+void ParallelServer::setName(std::shared_ptr<Peer> peer, std::string name) {
+    peer->name = name;
+    size_t hostPeerId = 0;
+    {
+        std::lock_guard<std::mutex> lock(_hostInfoMutex);
+        hostPeerId = _hostPeerId;
+    }
+
+    // Make sure everyone gets the new host name.
+    if (peer->id == hostPeerId) {
+        {
+            std::lock_guard<std::mutex> lock(_hostInfoMutex);
+            _hostName = name;
+        }
+
+        for (auto& it : _peers) {
+            sendConnectionStatus(peer);
+        }
+    }
+}
+
+void ParallelServer::assignHost(std::shared_ptr<Peer> newHost) {
+    {
+        std::lock_guard<std::mutex> lock(_hostInfoMutex);
+        std::shared_ptr<ParallelServer::Peer> oldHost = peer(_hostPeerId);
+
+        if (oldHost) {
+            oldHost->status = ParallelConnection::Status::ClientWithHost;
+        }
+        _hostPeerId = newHost->id;
+        _hostName = newHost->name;
+    }
+    newHost->status = ParallelConnection::Status::Host;
+
+    for (auto& it : _peers) {
+        if (it.second != newHost) {
+            it.second->status = ParallelConnection::Status::ClientWithHost;
+        }
+        sendConnectionStatus(it.second);
+    }
+}
+
+void ParallelServer::setToClient(std::shared_ptr<Peer> peer) {
+    if (peer->status == ParallelConnection::Status::Host) {
+        {
+            std::lock_guard<std::mutex> lock(_hostInfoMutex);
+            _hostPeerId = 0;
+            _hostName = "";
+        }
+
+        // If host becomes client, make all clients hostless.
+        for (auto& it : _peers) {
+            it.second->status = ParallelConnection::Status::ClientWithoutHost;
+            sendConnectionStatus(it.second);
+        }
+    } else {
+        peer->status = (_hostPeerId > 0) ? ParallelConnection::Status::ClientWithHost
+                                         : ParallelConnection::Status::ClientWithoutHost;
+        sendConnectionStatus(peer);
+    }
+}
+
+void ParallelServer::setNConnections(size_t nConnections) {
+    _nConnections = nConnections;
+    std::vector<char> data;
+    const uint32_t n = _nConnections;
+    data.insert(
+        data.end(),
+        reinterpret_cast<const char*>(&n),
+        reinterpret_cast<const char*>(&n) + sizeof(uint32_t)
+    );
+    sendMessageToAll(ParallelConnection::MessageType::NConnections, data);
+}
+
+void ParallelServer::sendConnectionStatus(std::shared_ptr<Peer> peer) {
+    std::vector<char> data;
+    const uint32_t outStatus = static_cast<uint32_t>(peer->status);
+    data.insert(
+        data.end(),
+        reinterpret_cast<const char*>(&outStatus),
+        reinterpret_cast<const char*>(&outStatus) + sizeof(uint32_t)
+    );
+
+    const uint32_t outHostNameSize = static_cast<uint32_t>(_hostName.size());
+    data.insert(
+        data.end(),
+        reinterpret_cast<const char*>(&outHostNameSize),
+        reinterpret_cast<const char*>(&outHostNameSize) + sizeof(uint32_t)
+    );
+
+    data.insert(
+        data.end(),
+        reinterpret_cast<const char*>(_hostName.data()),
+        reinterpret_cast<const char*>(_hostName.data() + outHostNameSize)
+    );
+
+    sendMessage(peer, ParallelConnection::MessageType::ConnectionStatus, data);
+}
+
+size_t ParallelServer::nConnections() const {
+    return _nConnections;
+}
+
+} // namespace openspace
diff --git a/src/performance/performancemanager.cpp b/src/performance/performancemanager.cpp
index c5f49f89c0..cfc9cf480f 100644
--- a/src/performance/performancemanager.cpp
+++ b/src/performance/performancemanager.cpp
@@ -399,11 +399,11 @@ void PerformanceManager::storeScenePerformanceMeasurements(
 #ifdef _MSC_VER
         strcpy_s(
             layout->sceneGraphEntries[i].name,
-            node->name().length() + 1,
-            node->name().c_str()
+            node->identifier().length() + 1,
+            node->identifier().c_str()
         );
 #else
-        strcpy(layout->sceneGraphEntries[i].name, node->name().c_str());
+        strcpy(layout->sceneGraphEntries[i].name, node->identifier().c_str());
 #endif
 
         SceneGraphNode::PerformanceRecord r = node->performanceRecord();
diff --git a/src/properties/binaryproperty.cpp b/src/properties/binaryproperty.cpp
new file mode 100644
index 0000000000..4c78a37d16
--- /dev/null
+++ b/src/properties/binaryproperty.cpp
@@ -0,0 +1,59 @@
+/*****************************************************************************************
+*                                                                                       *
+* OpenSpace                                                                             *
+*                                                                                       *
+* Copyright (c) 2014-2017                                                               *
+*                                                                                       *
+* 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/properties/binaryproperty.h>
+
+#include <ghoul/lua/ghoul_lua.h>
+
+namespace openspace::properties {
+
+REGISTER_TEMPLATEPROPERTY_SOURCE(
+    BinaryProperty,
+    std::vector<char>,
+    std::vector<char>(0),
+    [](lua_State* state, bool& success) -> std::vector<char> {
+        // TODO: Convert from lua
+        std::vector<char> result;
+        success = true;
+        return result;
+    },
+    [](lua_State* state, std::vector<char>) -> bool {
+        // TODO: Convert to lua
+        return true;
+    },
+    [](std::string value, bool& success) -> std::vector<char> {
+        // TODO: From json conversion
+        std::vector<char> result;
+        success = true;
+        return result;
+    },
+    [](std::string& outValue, std::vector<char> inValue) -> bool {
+        // TODO: To json conversion 
+        outValue = "";
+        return true;
+    },
+    LUA_TTABLE
+)
+
+} // namespace openspace::properties
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 752bae34d8..47ad089f49 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -124,18 +124,18 @@ std::string OptionProperty::getDescriptionByValue(int value) {
     }
 }
 
-std::string OptionProperty::generateAdditionalDescription() const {
+std::string OptionProperty::generateAdditionalJsonDescription() const {
     // @REFACTOR from selectionproperty.cpp, possible refactoring? ---abock
-    std::string result;
-    result += OptionsKey + " = {";
+    std::string result =
+        "{ \"" + OptionsKey + "\": [";
     for (size_t i = 0; i < _options.size(); ++i) {
         const Option& o = _options[i];
-        result += "[\"" + std::to_string(o.value) + "\"] = \"" + o.description + "\"";
+        result += "{\"" + std::to_string(o.value) + "\": \"" + o.description + "\"}";
         if (i != _options.size() - 1)
             result += ",";
     }
 
-    result += "}";
+    result += "] }";
     return result;
 }
 
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 5a111b3930..6fa6a8f80d 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -51,7 +51,10 @@ const char* Property::ViewOptions::LightPosition = "lightPosition";
 const char* Property::IdentifierKey = "Identifier";
 const char* Property::NameKey = "Name";
 const char* Property::TypeKey = "Type";
+const char* Property::DescriptionKey = "Description";
+const char* Property::JsonValueKey = "Value";
 const char* Property::MetaDataKey = "MetaData";
+const char* Property::AdditionalDataKey = "AdditionalData";
 
 #ifdef _DEBUG
 uint64_t Property::Identifier = 0;
@@ -73,6 +76,10 @@ Property::Property(PropertyInfo info)
     setVisibility(info.visibility);
 }
 
+Property::~Property() {
+    notifyDeleteListeners();
+}
+
 const std::string& Property::identifier() const {
     return _identifier;
 }
@@ -81,7 +88,7 @@ std::string Property::fullyQualifiedIdentifier() const {
     std::string identifier = _identifier;
     PropertyOwner* currentOwner = owner();
     while (currentOwner) {
-        std::string ownerId = currentOwner->name();
+        std::string ownerId = currentOwner->identifier();
         if (!ownerId.empty()) {
             identifier = ownerId + "." + identifier;
         }
@@ -116,6 +123,15 @@ bool Property::getStringValue(std::string&) const {
     return false;
 }
 
+std::string Property::getStringValue() const {
+    std::string value;
+    bool status = getStringValue(value);
+    if (!status) {
+        throw std::runtime_error("Could not get string value");
+    }
+    return value;
+}
+
 bool Property::setStringValue(std::string) {
     return false;
 }
@@ -173,6 +189,23 @@ const ghoul::Dictionary& Property::metaData() const {
     return _metaData;
 }
 
+std::string Property::toJson() const {
+    std::string result = "{";
+    result += "\"" + std::string(DescriptionKey) + "\": " + generateBaseJsonDescription() + ", ";
+    result += "\"" + std::string(JsonValueKey) + "\": " + jsonValue();
+    result += "}";
+    return result;
+}
+
+std::string Property::jsonValue() const {
+    std::string value = getStringValue();
+    if (value[0] == '"' && value[value.size() - 1] == '"') {
+        value.erase(0, 1);
+        value.erase(value.size() - 1, 1);
+    }
+    return value;
+}
+
 Property::OnChangeHandle Property::onChange(std::function<void()> callback) {
     ghoul_assert(callback, "The callback must not be empty");
     OnChangeHandle handle = _currentHandleValue++;
@@ -180,6 +213,13 @@ Property::OnChangeHandle Property::onChange(std::function<void()> callback) {
     return handle;
 }
 
+Property::OnChangeHandle Property::onDelete(std::function<void()> callback) {
+    ghoul_assert(callback, "The callback must not be empty");
+    OnDeleteHandle handle = _currentHandleValue++;
+    _onDeleteCallbacks.emplace_back(handle, std::move(callback));
+    return handle;
+}
+
 void Property::removeOnChange(OnChangeHandle handle) {
     if (handle == OnChangeHandleAll) {
         _onChangeCallbacks.clear();
@@ -202,6 +242,23 @@ void Property::removeOnChange(OnChangeHandle handle) {
     }
 }
 
+void Property::removeOnDelete(OnDeleteHandle handle) {
+    auto it = std::find_if(
+        _onDeleteCallbacks.begin(),
+        _onDeleteCallbacks.end(),
+        [handle](const std::pair<OnDeleteHandle, std::function<void()>>& p) {
+            return p.first == handle;
+        }
+    );
+
+    ghoul_assert(
+        it != _onDeleteCallbacks.end(),
+        "handle must be a valid callback handle"
+    );
+
+    _onDeleteCallbacks.erase(it);
+}
+
 PropertyOwner* Property::owner() const {
     return _owner;
 }
@@ -210,44 +267,59 @@ void Property::setPropertyOwner(PropertyOwner* owner) {
     _owner = owner;
 }
 
-void Property::notifyListener() {
+void Property::notifyChangeListeners() {
     for (const std::pair<OnChangeHandle, std::function<void()>>& p : _onChangeCallbacks) {
         p.second();
     }
 }
 
-// This was used in the old version of Property::Description but was never used. Is this
-// still useful? ---abock
-std::string Property::generateBaseDescription() const {
-    return
-        std::string(TypeKey) + " = \"" + className() + "\", " +
-        IdentifierKey + " = \"" + fullyQualifiedIdentifier() + "\", " +
-        NameKey + " = \"" + guiName() + "\", " +
-        generateMetaDataDescription() + ", " +
-        generateAdditionalDescription();
+void Property::notifyDeleteListeners() {
+    for (const std::pair<OnDeleteHandle, std::function<void()>>& p : _onDeleteCallbacks) {
+        p.second();
+    }
 }
 
-std::string Property::generateMetaDataDescription() const {
+std::string Property::generateBaseJsonDescription() const {
+    return 
+        "{ \"" + std::string(TypeKey) + "\": \"" + className() + "\", " +
+        "\"" + std::string(IdentifierKey) + "\": \"" + fullyQualifiedIdentifier() + "\", " +
+        "\"" + std::string(NameKey) + "\": \"" + guiName() + "\", " +
+        "\"" + std::string(MetaDataKey) + "\": " + generateMetaDataJsonDescription() + ", " +
+        "\"" + std::string(AdditionalDataKey) + "\": " + generateAdditionalJsonDescription() +
+        " }";
+}
+
+std::string Property::generateMetaDataJsonDescription() const {
     static const std::map<Visibility, std::string> VisibilityConverter = {
         { Visibility::All, "All" },
         { Visibility::Developer, "Developer" },
         { Visibility::User, "User" },
         { Visibility::Hidden, "Hidden" }
     };
-    Visibility visibility = _metaData.value<Visibility>(MetaDataKeyVisibility);
-    bool isReadOnly = _metaData.value<bool>(MetaDataKeyReadOnly);
-
+    Visibility visibility = static_cast<Visibility>(
+        _metaData.value<std::underlying_type_t<Visibility>>(MetaDataKeyVisibility));
     std::string vis = VisibilityConverter.at(visibility);
 
-    return
-        std::string(MetaDataKey) + " = {" +
-        MetaDataKeyGroup +   " = '" + groupIdentifier() + "'," +
-        MetaDataKeyVisibility + " = " + vis + "," +
-        MetaDataKeyReadOnly +" = " + (isReadOnly ? "true" : "false") + "}";
+    bool isReadOnly = false;
+    if (_metaData.hasKey(MetaDataKeyReadOnly)) {
+        isReadOnly = _metaData.value<bool>(MetaDataKeyReadOnly);
+    }
+
+    std::string result = "{ ";
+    result += "\"" + std::string(MetaDataKeyGroup) + "\": \"" + groupIdentifier() + "\", ";
+    result += "\"" + std::string(MetaDataKeyVisibility) + "\": \"" + vis + "\", ";
+    result += "\"" + std::string(MetaDataKeyReadOnly) + "\": " + (isReadOnly ? "true" : "false");
+    result += " }";
+    return result;
 }
 
-std::string Property::generateAdditionalDescription() const {
-    return "";
+std::string Property::generateAdditionalJsonDescription() const {
+    return "{}";
 }
 
+void Property::setInterpolationTarget(ghoul::any) {}
+void Property::setLuaInterpolationTarget(lua_State*) {}
+void Property::setStringInterpolationTarget(std::string) {}
+void Property::interpolateValue(float, ghoul::EasingFunc<float>) {}
+
 } // namespace openspace::properties
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index d7a4e21729..5cc27fcec5 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -28,15 +28,15 @@
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/misc/invariants.h>
 #include <algorithm>
 #include <numeric>
 
-namespace openspace::properties {
-
 namespace {
     constexpr const char* _loggerCat = "PropertyOwner";
 } // namespace
 
+namespace openspace::properties {
 
 PropertyOwner::PropertyOwner(PropertyOwnerInfo info)
     : DocumentationGenerator(
@@ -58,10 +58,20 @@ PropertyOwner::PropertyOwner(PropertyOwnerInfo info)
         },
         "${WEB}/properties/script.js"
     )
-    , _name(std::move(info.name))
+    , _identifier(std::move(info.identifier))
+    , _guiName(std::move(info.guiName))
     , _description(std::move(info.description))
     , _owner(nullptr)
-{}
+{
+    ghoul_precondition(
+        _identifier.find_first_of("\t\n ") == std::string::npos,
+        "Identifier must contain any whitespaces"
+    );
+    ghoul_precondition(
+        _identifier.find_first_of(".") == std::string::npos,
+        "Identifier must contain any whitespaces"
+    );
+}
 
 PropertyOwner::~PropertyOwner() {
     _properties.clear();
@@ -125,14 +135,14 @@ std::vector<PropertyOwner*> PropertyOwner::propertySubOwners() const {
     return _subOwners;
 }
 
-PropertyOwner* PropertyOwner::propertySubOwner(const std::string& name) const {
+PropertyOwner* PropertyOwner::propertySubOwner(const std::string& identifier) const {
     std::vector<PropertyOwner*>::const_iterator it = std::find_if(
         _subOwners.begin(),
         _subOwners.end(),
-        [&name](PropertyOwner* owner) { return owner->name() == name;  }
+        [&identifier](PropertyOwner* owner) { return owner->identifier() == identifier; }
     );
 
-    if (it == _subOwners.end() || (*it)->name() != name) {
+    if (it == _subOwners.end() || (*it)->identifier() != identifier) {
         return nullptr;
     }
     else {
@@ -140,12 +150,12 @@ PropertyOwner* PropertyOwner::propertySubOwner(const std::string& name) const {
     }
 }
 
-bool PropertyOwner::hasPropertySubOwner(const std::string& name) const {
-    return propertySubOwner(name) != nullptr;
+bool PropertyOwner::hasPropertySubOwner(const std::string& identifier) const {
+    return propertySubOwner(identifier) != nullptr;
 }
 
-void PropertyOwner::setPropertyGroupName(std::string groupID, std::string name) {
-    _groupNames[std::move(groupID)] = std::move(name);
+void PropertyOwner::setPropertyGroupName(std::string groupID, std::string identifier) {
+    _groupNames[std::move(groupID)] = std::move(identifier);
 }
 
 std::string PropertyOwner::propertyGroupName(const std::string& groupID) const {
@@ -159,7 +169,7 @@ std::string PropertyOwner::propertyGroupName(const std::string& groupID) const {
 }
 
 void PropertyOwner::addProperty(Property* prop) {
-    ghoul_assert(prop != nullptr, "prop must not be nullptr");
+    ghoul_precondition(prop != nullptr, "prop must not be nullptr");
 
     if (prop->identifier().empty()) {
         LERROR("No property identifier specified");
@@ -177,7 +187,7 @@ void PropertyOwner::addProperty(Property* prop) {
         LERROR(fmt::format(
             "Property identifier '{}' already present in PropertyOwner '{}'",
             prop->identifier(),
-            name()
+            identifier()
         ));
         return;
     } else {
@@ -202,30 +212,35 @@ void PropertyOwner::addProperty(Property& prop) {
 }
 
 void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner* owner) {
-    ghoul_assert(owner != nullptr, "owner must not be nullptr");
-    ghoul_assert(!owner->name().empty(), "PropertyOwner must have a name");
+    ghoul_precondition(owner != nullptr, "owner must not be nullptr");
+    ghoul_precondition(
+        !owner->identifier().empty(),
+        "PropertyOwner must have an identifier"
+    );
 
     // See if we can find the name of the propertyowner to add using the lower bound
     std::vector<PropertyOwner*>::const_iterator it = std::find_if(
         _subOwners.begin(),
         _subOwners.end(),
-        [name = owner->name()](PropertyOwner* o) { return o->name() == name;  }
+        [identifier = owner->identifier()](PropertyOwner* o) {
+            return o->identifier() == identifier;
+        }
     );
 
     // If we found the propertyowner's name, we need to bail out
-    if (it != _subOwners.end() && (*it)->name() == owner->name()) {
+    if (it != _subOwners.end() && (*it)->identifier() == owner->identifier()) {
         LERROR(fmt::format(
             "PropertyOwner '{}' already present in PropertyOwner '{}'",
-            owner->name(),
-            name()
+            owner->identifier(),
+            identifier()
         ));
         return;
     } else {
         // We still need to check if the PropertyOwners name is used in a Property
-        const bool hasProp = hasProperty(owner->name());
+        const bool hasProp = hasProperty(owner->identifier());
         if (hasProp) {
             LERROR(fmt::format(
-                "PropertyOwner '{}'s name already names a Property", owner->name()
+                "PropertyOwner '{}'s name already names a Property", owner->identifier()
             ));
             return;
         }
@@ -241,7 +256,7 @@ void PropertyOwner::addPropertySubOwner(openspace::properties::PropertyOwner& ow
 }
 
 void PropertyOwner::removeProperty(Property* prop) {
-    ghoul_assert(prop != nullptr, "prop must not be nullptr");
+    ghoul_precondition(prop != nullptr, "prop must not be nullptr");
 
     // See if we can find the identifier of the property to add in the properties list
     std::vector<Property*>::const_iterator it = std::find_if(
@@ -266,21 +281,23 @@ void PropertyOwner::removeProperty(Property& prop) {
 }
 
 void PropertyOwner::removePropertySubOwner(openspace::properties::PropertyOwner* owner) {
-    ghoul_assert(owner != nullptr, "owner must not be nullptr");
+    ghoul_precondition(owner != nullptr, "owner must not be nullptr");
 
     // See if we can find the name of the propertyowner to add
     std::vector<PropertyOwner*>::const_iterator it = std::find_if(
         _subOwners.begin(),
         _subOwners.end(),
-        [name = owner->name()](PropertyOwner* o) { return o->name() == name;  }
+        [identifier = owner->identifier()](PropertyOwner* o) {
+            return o->identifier() == identifier;
+        }
     );
 
     // If we found the propertyowner, we can delete it
-    if (it != _subOwners.end() && (*it)->name() == owner->name()) {
+    if (it != _subOwners.end() && (*it)->identifier() == owner->identifier()) {
         _subOwners.erase(it);
     } else {
         LERROR(fmt::format(
-            "PropertyOwner with name '{}' not found for removal", owner->name()
+            "PropertyOwner with name '{}' not found for removal", owner->identifier()
         ));
     }
 }
@@ -289,12 +306,29 @@ void PropertyOwner::removePropertySubOwner(openspace::properties::PropertyOwner&
     removePropertySubOwner(&owner);
 }
 
-void PropertyOwner::setName(std::string name) {
-    _name = std::move(name);
+void PropertyOwner::setIdentifier(std::string identifier) {
+    ghoul_precondition(
+        _identifier.find_first_of("\t\n ") == std::string::npos,
+        "Identifier must contain any whitespaces"
+    );
+    ghoul_precondition(
+        _identifier.find_first_of(".") == std::string::npos,
+        "Identifier must contain any whitespaces"
+    );
+
+    _identifier = std::move(identifier);
 }
 
-std::string PropertyOwner::name() const {
-    return _name;
+std::string PropertyOwner::identifier() const {
+    return _identifier;
+}
+
+void PropertyOwner::setGuiName(std::string guiName) {
+    _guiName = std::move(guiName);
+}
+
+const std::string& PropertyOwner::guiName() const {
+    return _guiName.empty() ? _identifier : _guiName;
 }
 
 void PropertyOwner::setDescription(std::string description) {
@@ -326,7 +360,7 @@ std::string PropertyOwner::generateJson() const {
     {
         std::stringstream json;
         json << "{";
-        json << "\"name\": \"" << owner->name() << "\",";
+        json << "\"name\": \"" << owner->identifier() << "\",";
 
         json << "\"properties\": [";
         auto properties = owner->properties();
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index 34f94969ec..8146047e65 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -153,18 +153,19 @@ bool PropertyDelegate<TemplateProperty<std::vector<int>>>::toString(
     return true;
 }
 
-std::string SelectionProperty::generateAdditionalDescription() const {
-    std::string result;
-    result += OptionsKey + " = {";
+std::string SelectionProperty::generateAdditionalJsonDescription() const {
+    std::string result = "{ \"" + OptionsKey + "\": [";
     for (size_t i = 0; i < _options.size(); ++i) {
         const Option& o = _options[i];
-        result += "[\"" + std::to_string(o.value) + "\"] = \"" + o.description + "\"";
+        result += "{";
+        result +=  "\"" + std::to_string(o.value) + "\": \"" + o.description + "\"";
+        result += "}";
         if (i != _options.size() - 1) {
             result += ",";
         }
     }
 
-    result += "}";
+    result += "] }";
     return result;
 }
 
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index f3fbf7836d..ba738f1549 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -35,12 +35,23 @@ std::string TriggerProperty::className() const {
 }
 
 bool TriggerProperty::setLuaValue(lua_State*) {
-    notifyListener();
+    notifyChangeListeners();
     return true;
 }
 
 void TriggerProperty::set(ghoul::any) {
-    notifyListener();
+    notifyChangeListeners();
+}
+
+std::string TriggerProperty::toJson() const {
+    std::string result = "{";
+    result += "\"" + std::string(DescriptionKey) + "\": " + generateBaseJsonDescription();
+    result += "}";
+    return result;
+}
+
+std::string TriggerProperty::jsonValue() const {
+    return "";
 }
 
 } // namespace openspace::properties
diff --git a/src/query/query.cpp b/src/query/query.cpp
index 9ded69df3a..61e51c4ed6 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -37,10 +37,6 @@
 #include <modules/iswa/util/iswamanager.h>
 #include <modules/iswa/rendering/iswacygnet.h>
 
-namespace {
-    constexpr const char* _loggerCat = "Query";
-} // namespace
-
 namespace openspace {
 
 Scene* sceneGraph() {
@@ -77,5 +73,4 @@ std::vector<properties::Property*> allProperties() {
     return properties;
 }
 
-
 }  // namespace
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index 51efdf8e40..5b447029c3 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -49,14 +49,14 @@ Dashboard::Dashboard()
 }
 
 void Dashboard::addDashboardItem(std::unique_ptr<DashboardItem> item) {
-    std::string originalName = item->name();
+    std::string originalIdentifier = item->identifier();
     int suffix = 1;
     while (true) {
         auto it = std::find_if(
             _items.begin(),
             _items.end(),
             [&item](const std::unique_ptr<DashboardItem>& i) {
-                return (i->name() == item->name());
+                return (i->identifier() == item->identifier());
             }
         );
 
@@ -65,7 +65,8 @@ void Dashboard::addDashboardItem(std::unique_ptr<DashboardItem> item) {
             break;
         }
         else {
-            item->setName(originalName + " " + std::to_string(suffix));
+            item->setIdentifier(originalIdentifier + std::to_string(suffix));
+            item->setGuiName(originalIdentifier + " " + std::to_string(suffix));
             ++suffix;
         }
     }
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index c4f9b20e71..56809d7432 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -51,8 +51,8 @@ std::unique_ptr<DashboardItem> DashboardItem::createFromDictionary(
     return factory->create(dashboardType, dictionary);
 }
 
-DashboardItem::DashboardItem(std::string name)
-    : properties::PropertyOwner({ std::move(name) })
+DashboardItem::DashboardItem(std::string identifier, std::string guiName)
+    : properties::PropertyOwner({ std::move(identifier), std::move(guiName) })
     , _isEnabled(EnabledInfo, true)
 {
     addProperty(_isEnabled);
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 50fb6fab47..1d4a732904 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -466,7 +466,7 @@ void FramebufferRenderer::updateRaycastData() {
             _exitPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
                 "Volume " + std::to_string(data.id) + " exit",
                 vsPath,
-                ExitFragmentShaderPath,
+                absPath(ExitFragmentShaderPath),
                 dict
             );
         } catch (ghoul::RuntimeError e) {
@@ -474,7 +474,7 @@ void FramebufferRenderer::updateRaycastData() {
         }
         try {
             ghoul::Dictionary outsideDict = dict;
-            outsideDict.setValue("getEntryPath", GetEntryOutsidePath);
+            outsideDict.setValue("getEntryPath", absPath(GetEntryOutsidePath));
             _raycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
                 "Volume " + std::to_string(data.id) + " raycast",
                 absPath(vsPath),
@@ -486,7 +486,7 @@ void FramebufferRenderer::updateRaycastData() {
         }
         try {
             ghoul::Dictionary insideDict = dict;
-            insideDict.setValue("getEntryPath", GetEntryInsidePath);
+            insideDict.setValue("getEntryPath", absPath(GetEntryInsidePath));
             _insideRaycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
                 "Volume " + std::to_string(data.id) + " inside raycast",
                 absPath("${SHADERS}/framebuffer/resolveframebuffer.vert"),
@@ -533,12 +533,13 @@ void FramebufferRenderer::updateDeferredcastData() {
 
         try {
             ghoul::Dictionary deferredDict = dict;
-            //deferredDict.setValue("getEntryPath", GetEntryOutsidePath);
+            //deferredDict.setValue("getEntryPath", absPath(GetEntryOutsidePath));
             _deferredcastPrograms[caster] = ghoul::opengl::ProgramObject::Build(
                 "Deferred " + std::to_string(data.id) + " raycast",
                 absPath(vsPath),
                 absPath(deferredShaderPath),
                 deferredDict);
+            
             using IgnoreError = ghoul::opengl::ProgramObject::IgnoreError;
             _deferredcastPrograms[caster]->setIgnoreSubroutineUniformLocationError(
                 IgnoreError::Yes
@@ -546,6 +547,8 @@ void FramebufferRenderer::updateDeferredcastData() {
             _deferredcastPrograms[caster]->setIgnoreUniformLocationError(
                 IgnoreError::Yes
             );
+            
+            caster->initializeCachedVariables(*_deferredcastPrograms[caster]);
         }
         catch (ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
@@ -1117,7 +1120,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
         glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
         GLenum dBuffer[1] = { GL_COLOR_ATTACHMENT0 };
         glDrawBuffers(1, dBuffer);
-        glClear(GL_COLOR_BUFFER_BIT);
+        //glClear(GL_COLOR_BUFFER_BIT);
 
         bool firstPaint = true;
 
@@ -1203,20 +1206,7 @@ void FramebufferRenderer::render(float blackoutFactor, bool doPerformanceMeasure
         }
     }
 
-    if (!tasks.deferredcasterTasks.empty()) {
-        // JCC: Temporarily disabled. Need to test it on mac and linux before final
-        // merging.
-        /*glBindFramebuffer(GL_READ_FRAMEBUFFER, _deferredFramebuffer);
-        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, defaultFbo);
-        GLenum dBuffer[] = { GL_COLOR_ATTACHMENT0 };
-        glDrawBuffers(1, dBuffer);
-        glReadBuffer(GL_COLOR_ATTACHMENT0);
-        glBlitFramebuffer(0, 0, GLsizei(_resolution.x), GLsizei(_resolution.y),
-            0, 0, GLsizei(_resolution.x), GLsizei(_resolution.y),
-            GL_COLOR_BUFFER_BIT, GL_NEAREST);
-        */
-        //glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
-    } else {
+    if (tasks.deferredcasterTasks.empty()) {
         glBindFramebuffer(GL_FRAMEBUFFER, defaultFbo);
         _resolveProgram->activate();
 
@@ -1298,7 +1288,7 @@ std::vector<double> FramebufferRenderer::mSSAPattern() const {
 
 void FramebufferRenderer::updateRendererData() {
     ghoul::Dictionary dict;
-    dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath));
+    dict.setValue("fragmentRendererPath", absPath(RenderFragmentShaderPath));
 
     _rendererData = dict;
 
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 7eb4b43065..37a2042e23 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -676,8 +676,8 @@ void LoadingScreen::setPhase(Phase phase) {
     _iProgress = 0;
 }
 
-void LoadingScreen::updateItem(const std::string& itemName,
-                               ItemStatus newStatus,
+void LoadingScreen::updateItem(const std::string& itemIdentifier,
+                               const std::string& itemName, ItemStatus newStatus,
                                float newProgress)
 {
     if (!_showNodeNames) {
@@ -690,8 +690,8 @@ void LoadingScreen::updateItem(const std::string& itemName,
     auto it = std::find_if(
         _items.begin(),
         _items.end(),
-        [&itemName](const Item& i) {
-            return i.name == itemName;
+        [&itemIdentifier](const Item& i) {
+            return i.identifier == itemIdentifier;
         }
     );
     if (it != _items.end()) {
@@ -704,11 +704,15 @@ void LoadingScreen::updateItem(const std::string& itemName,
     else {
         ghoul_assert(
             newStatus == ItemStatus::Started,
-            "Item '" + itemName + "' did not exist but first message was not Started"
+            fmt::format(
+                "Item '{}' did not exist and first message was not 'Started'",
+                itemIdentifier
+            )
         );
         // We are not computing the location in here since doing it this way might stall
         // the main thread while trying to find a position for the new item
         _items.push_back({
+            itemIdentifier,
             itemName,
             ItemStatus::Started,
             newProgress,
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 7ddd86c41a..3693b4ed2f 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -37,7 +37,6 @@
 #include <ghoul/opengl/programobject.h>
 
 namespace {
-    constexpr const char* _loggerCat = "Renderable";
     constexpr const char* keyStart = "StartTime";
     constexpr const char* keyEnd = "EndTime";
     constexpr const char* KeyType = "Type";
@@ -48,6 +47,12 @@ namespace {
         "Is Enabled",
         "This setting determines whether this object will be visible or not."
     };
+
+    static const openspace::properties::Property::PropertyInfo OpacityInfo = {
+        "Opacity",
+        "Transparency",
+        "This value determines the transparency of this object."
+    };
 } // namespace
 
 namespace openspace {
@@ -59,21 +64,27 @@ documentation::Documentation Renderable::Documentation() {
         "Renderable",
         "renderable",
         {
-        {
-            KeyType,
-            new StringAnnotationVerifier("A valid Renderable created by a factory"),
-            Optional::No,
-            "This key specifies the type of Renderable that gets created. It has to be "
-            "one of the valid Renderables that are available for creation (see the "
-            "FactoryDocumentation for a list of possible Renderables), which depends on "
-            "the configration of the application"
-        },
-        {
-            EnabledInfo.identifier,
-            new BoolVerifier,
-            Optional::Yes,
-            EnabledInfo.description
-        }
+            {
+                KeyType,
+                new StringAnnotationVerifier("A valid Renderable created by a factory"),
+                Optional::No,
+                "This key specifies the type of Renderable that gets created. It has to "
+                "be one of the valid Renderables that are available for creation (see "
+                "the FactoryDocumentation for a list of possible Renderables), which "
+                "depends on the configration of the application"
+            },
+            {
+                EnabledInfo.identifier,
+                new BoolVerifier,
+                Optional::Yes,
+                EnabledInfo.description
+            },
+            {
+                OpacityInfo.identifier,
+                new DoubleInRangeVerifier(0.0, 1.0),
+                Optional::Yes,
+                OpacityInfo.description
+            }
         }
     };
 }
@@ -81,13 +92,6 @@ documentation::Documentation Renderable::Documentation() {
 std::unique_ptr<Renderable> Renderable::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
-    // The name is passed down from the SceneGraphNode
-    ghoul_assert(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyName),
-        "The SceneGraphNode did not set the 'name' key"
-    );
-    std::string name = dictionary.value<std::string>(SceneGraphNode::KeyName);
-
     documentation::testSpecificationAndThrow(Documentation(), dictionary, "Renderable");
 
     std::string renderableType = dictionary.value<std::string>(KeyType);
@@ -101,16 +105,12 @@ std::unique_ptr<Renderable> Renderable::createFromDictionary(
 Renderable::Renderable(const ghoul::Dictionary& dictionary)
     : properties::PropertyOwner({ "renderable" })
     , _enabled(EnabledInfo, true)
+    , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
     , _renderBin(RenderBin::Opaque)
     , _startTime("")
     , _endTime("")
     , _hasTimeInterval(false)
 {
-    ghoul_assert(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyName),
-        std::string("SceneGraphNode must specify '") + SceneGraphNode::KeyName + "'"
-    );
-
     dictionary.getValue(keyStart, _startTime);
     dictionary.getValue(keyEnd, _endTime);
 
@@ -131,7 +131,7 @@ Renderable::Renderable(const ghoul::Dictionary& dictionary)
         }
     }
 
-    if (_startTime != "" && _endTime != "") {
+    if (!_startTime.empty() && !_endTime.empty()) {
         _hasTimeInterval = true;
     }
 
@@ -139,6 +139,10 @@ Renderable::Renderable(const ghoul::Dictionary& dictionary)
         _enabled = dictionary.value<bool>(EnabledInfo.identifier);
     }
 
+    if (dictionary.hasKey(OpacityInfo.identifier)) {
+        _opacity = static_cast<float>(dictionary.value<double>(OpacityInfo.identifier));
+    }
+
     addProperty(_enabled);
 }
 
@@ -230,4 +234,15 @@ void Renderable::onEnabledChange(std::function<void(bool)> callback) {
     });
 }
 
+void Renderable::registerUpdateRenderBinFromOpacity() {
+    _opacity.onChange([this](){
+        if (_opacity > 0.f && _opacity < 1.f) {
+            setRenderBin(Renderable::RenderBin::Transparent);
+        }
+        else {
+            setRenderBin(Renderable::RenderBin::Opaque);
+        }
+    });
+}
+
 }  // namespace openspace
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 835598b28a..461f57a96c 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -74,9 +74,9 @@
 #include <ghoul/io/texture/texturewritersoil.h>
 #endif //GHOUL_USE_SOIL
 
-#ifdef GHOUL_USE_STB
+#ifdef GHOUL_USE_STB_IMAGE
 #include <ghoul/io/texture/texturereaderstb.h>
-#endif // GHOUL_USE_STB
+#endif // GHOUL_USE_STB_IMAGE
 
 #include <array>
 #include <stack>
@@ -256,6 +256,7 @@ RenderEngine::RenderEngine()
     , _hdrBackground(BackgroundExposureInfo, 2.8f, 0.01f, 10.0f)
     , _gamma(GammaInfo, 2.2f, 0.01f, 10.0f)
     , _frameNumber(0)
+    , _screenSpaceOwner({ "ScreenSpace" })
 {
     _doPerformanceMeasurements.onChange([this](){
         if (_doPerformanceMeasurements) {
@@ -406,11 +407,11 @@ void RenderEngine::initialize() {
         std::make_shared<ghoul::io::TextureWriterSOIL>()
     );
 #endif // GHOUL_USE_SOIL
-#ifdef GHOUL_USE_STB
+#ifdef GHOUL_USE_STB_IMAGE
     ghoul::io::TextureReader::ref().addReader(
         std::make_shared<ghoul::io::TextureReaderSTB>()
     );    
-#endif
+#endif // GHOUL_USE_STB_IMAGE
 
     ghoul::io::TextureReader::ref().addReader(
         std::make_shared<ghoul::io::TextureReaderCMAP>()
@@ -470,7 +471,11 @@ void RenderEngine::deinitializeGL() {
 }
 
 void RenderEngine::updateScene() {
-    if (!_scene) return;
+    if (!_scene) {
+        return;
+    }
+
+    _scene->updateInterpolations();
 
     const Time& currentTime = OsEng.timeManager().time();
     _scene->update({
@@ -970,6 +975,9 @@ std::shared_ptr<performance::PerformanceManager> RenderEngine::performanceManage
 void RenderEngine::addScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s) {
     s->initialize();
     s->initializeGL();
+
+    _screenSpaceOwner.addPropertySubOwner(s.get());
+
     _screenSpaceRenderables.push_back(std::move(s));
 }
 
@@ -982,6 +990,8 @@ void RenderEngine::removeScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRender
 
     if (it != _screenSpaceRenderables.end()) {
         s->deinitialize();
+        _screenSpaceOwner.removePropertySubOwner(s.get());
+
         _screenSpaceRenderables.erase(it);
     }
 }
@@ -994,13 +1004,13 @@ void RenderEngine::removeScreenSpaceRenderable(const std::string& name) {
 }
 
 std::shared_ptr<ScreenSpaceRenderable> RenderEngine::screenSpaceRenderable(
-                                                                  const std::string& name)
+                                                            const std::string& identifier)
 {
     auto it = std::find_if(
         _screenSpaceRenderables.begin(),
         _screenSpaceRenderables.end(),
-        [name](const std::shared_ptr<ScreenSpaceRenderable>& s) {
-            return s->name() == name;
+        [&identifier](const std::shared_ptr<ScreenSpaceRenderable>& s) {
+            return s->identifier() == identifier;
         }
     );
 
@@ -1250,4 +1260,8 @@ std::vector<Syncable*> RenderEngine::getSyncables() {
     }
 }
 
+properties::PropertyOwner& RenderEngine::screenSpaceOwner() {
+    return _screenSpaceOwner;
+}
+
 } // namespace openspace
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index df683fad23..61a2e23043 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -123,6 +123,22 @@ documentation::Documentation ScreenSpaceRenderable::Documentation() {
                 "the application and can be written to disk on application startup into "
                 "the FactoryDocumentation."
             },
+            {
+                KeyName,
+                new StringVerifier,
+                Optional::Yes,
+                "Specifies the name of this screenspace renderable. This does not have "
+                "to be unique to the scene, but it is recommended to be."
+            },
+            {
+                KeyIdentifier,
+                new StringVerifier,
+                Optional::Yes,
+                "This is the unique identifier for this screenspace renderable. It has "
+                "to be unique amongst all existing screenspace nodes that already have "
+                "been added to the scene. The identifier is not allowed to have any "
+                "whitespace or '.' and must not be empty."
+            },
             {
                 EnabledInfo.identifier,
                 new BoolVerifier,
@@ -190,9 +206,10 @@ std::unique_ptr<ScreenSpaceRenderable> ScreenSpaceRenderable::createFromDictiona
     );
 
     std::string renderableType = dictionary.value<std::string>(KeyType);
-
-    auto factory = FactoryManager::ref().factory<ScreenSpaceRenderable>();
-    return factory->create(renderableType, dictionary);
+    return FactoryManager::ref().factory<ScreenSpaceRenderable>()->create(
+        renderableType,
+        dictionary
+    );
 }
 
 ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary)
@@ -220,6 +237,15 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     , _shader(nullptr)
     , _radius(PlaneDepth)
 {
+    if (dictionary.hasKey(KeyIdentifier)) {
+        setIdentifier(dictionary.value<std::string>(KeyIdentifier));
+    }
+
+    if (dictionary.hasKey(KeyName)) {
+        setGuiName(dictionary.value<std::string>(KeyName));
+    }
+
+
     addProperty(_enabled);
     addProperty(_useFlatScreen);
     addProperty(_euclideanPosition);
@@ -296,7 +322,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
 
     _delete.onChange([this](){
         std::string script =
-            "openspace.removeScreenSpaceRenderable('" + name() + "');";
+            "openspace.removeScreenSpaceRenderable('" + identifier() + "');";
         OsEng.scriptEngine().queueScript(
             script,
             scripting::ScriptEngine::RemoteScripting::No
@@ -427,31 +453,30 @@ glm::vec2 ScreenSpaceRenderable::toSpherical(const glm::vec2& euclidean) {
 }
 
 void ScreenSpaceRenderable::createShaders() {
-    if (!_shader) {
-        ghoul::Dictionary dict = ghoul::Dictionary();
+    ghoul::Dictionary dict = ghoul::Dictionary();
 
-        auto res = OsEng.windowWrapper().currentWindowResolution();
-        ghoul::Dictionary rendererData = {
-            { "fragmentRendererPath", "${SHADERS}/framebuffer/renderframebuffer.frag" },
-            { "windowWidth" , res.x },
-            { "windowHeight" , res.y }
-        };
+    auto res = OsEng.windowWrapper().currentWindowResolution();
+    ghoul::Dictionary rendererData = {
+        { "fragmentRendererPath", "${SHADERS}/framebuffer/renderframebuffer.frag" },
+        { "windowWidth" , res.x },
+        { "windowHeight" , res.y }
+    };
 
-        dict.setValue("rendererData", rendererData);
-        dict.setValue("fragmentPath", "${MODULE_BASE}/shaders/screenspace_fs.glsl");
-        _shader = ghoul::opengl::ProgramObject::Build(
-            "ScreenSpaceProgram",
-            absPath("${MODULE_BASE}/shaders/screenspace_vs.glsl"),
-            absPath("${SHADERS}/render.frag"),
-            dict
-        );
+    dict.setValue("rendererData", rendererData);
+    dict.setValue("fragmentPath", "${MODULE_BASE}/shaders/screenspace_fs.glsl");
+    _shader = ghoul::opengl::ProgramObject::Build(
+        "ScreenSpaceProgram",
+        absPath("${MODULE_BASE}/shaders/screenspace_vs.glsl"),
+        absPath("${SHADERS}/render.frag"),
+        dict
+    );
+
+    _uniformCache.occlusionDepth = _shader->uniformLocation("OcclusionDepth");
+    _uniformCache.alpha = _shader->uniformLocation("Alpha");
+    _uniformCache.modelTransform = _shader->uniformLocation("ModelTransform");
+    _uniformCache.viewProj = _shader->uniformLocation("ViewProjectionMatrix");
+    _uniformCache.texture = _shader->uniformLocation("texture1");
 
-        _uniformCache.occlusionDepth = _shader->uniformLocation("OcclusionDepth");
-        _uniformCache.alpha = _shader->uniformLocation("Alpha");
-        _uniformCache.modelTransform = _shader->uniformLocation("ModelTransform");
-        _uniformCache.viewProj = _shader->uniformLocation("ViewProjectionMatrix");
-        _uniformCache.texture = _shader->uniformLocation("texture1");
-    }
 }
 
 glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index 45480b43a9..4d3800be54 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -92,7 +92,7 @@ ghoul::opengl::Texture& TransferFunction::getTexture() {
 }
 
 void TransferFunction::update() {
-    if (_needsUpdate) {
+  /*  if (_needsUpdate) {
         if (hasExtension(_filepath, "txt")) {
             setTextureFromTxt();
         } else {
@@ -103,14 +103,14 @@ void TransferFunction::update() {
         if (_tfChangedCallback) {
             _tfChangedCallback(*this);
         }
-    }
+    }*/
 }
 
 void TransferFunction::setCallback(TfChangedCallback callback) {
     _tfChangedCallback = std::move(callback);
 }
 
-void TransferFunction::setTextureFromTxt() {
+void TransferFunction::setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture> ptr) {
     std::ifstream in;
     in.open(_filepath.c_str());
 
@@ -164,9 +164,9 @@ void TransferFunction::setTextureFromTxt() {
     }
 
     // allocate new float array with zeros
-    float* transferFunction = new float[width*4]();
-    for (int i = 0; i < 4*width; ++i) {
-        transferFunction[i] = 0.0f;
+    float* transferFunction = new float[width * 4];
+    for (int i = 0; i < 4 * width; ++i) {
+        transferFunction[i] = 0.f;
     }
 
     size_t lowerIndex = static_cast<size_t>(floorf(lower * static_cast<float>(width-1)));
@@ -176,9 +176,9 @@ void TransferFunction::setTextureFromTxt() {
     auto currentKey = prevKey + 1;
     auto lastKey = mappingKeys.end() -1;
 
-    for (size_t i=lowerIndex; i<=upperIndex; i++) {
-        float fpos = static_cast<float>(i)/static_cast<float>(width-1);
-        if (fpos > (*currentKey).position) {
+    for (size_t i = lowerIndex; i <= upperIndex; ++i) {
+        float fpos = static_cast<float>(i) / static_cast<float>(width-1);
+        if (fpos > currentKey->position) {
             prevKey = currentKey;
             currentKey++;
             if (currentKey == mappingKeys.end()) {
@@ -186,24 +186,25 @@ void TransferFunction::setTextureFromTxt() {
             }
         }
 
-        float dist = fpos-(*prevKey).position;
-        float weight = dist/((*currentKey).position-(*prevKey).position);
+        float dist = fpos - prevKey->position;
+        float weight = dist / (currentKey->position - prevKey->position);
 
-        for (size_t channel=0; channel<4; ++channel) {
-            size_t position = 4*i + channel;
+        for (size_t channel = 0; channel < 4; ++channel) {
+            size_t position = 4 * i + channel;
             // Interpolate linearly between prev and next mapping key
-            float value = ((*prevKey).color[channel] * (1.f - weight) +
-                          (*currentKey).color[channel] * weight) / 255.f;
+            float value = (prevKey->color[channel] * (1.f - weight) +
+                          currentKey->color[channel] * weight) / 255.f;
             if (channel < 3) {
                 // Premultiply with alpha
-                value *= ((*prevKey).color[3] * (1.f - weight) +
-                         (*currentKey).color[3] * weight) / 255.f;
+                value *= (prevKey->color[3] * (1.f - weight) +
+                         currentKey->color[3] * weight) / 255.f;
             }
             transferFunction[position] = value;
         }
     }
 
     // no need to deallocate transferFunction. Ownership is transferred to the Texture.
+
     _texture = std::make_unique<ghoul::opengl::Texture>(
         transferFunction,
         glm::size3_t(width, 1, 1),
@@ -221,13 +222,19 @@ void TransferFunction::setTextureFromImage() {
 }
 
 glm::vec4 TransferFunction::sample(size_t offset) {
-    if (!_texture) return glm::vec4(0.0);
+    if (!_texture) {
+        return glm::vec4(0.f);
+    }
 
     int nPixels = _texture->width();
 
     // Clamp to range.
-    if (offset >= nPixels) offset = nPixels - 1;
-    if (offset < 0) offset = 0;
+    if (offset >= nPixels) {
+        offset = nPixels - 1;
+    }
+    if (offset < 0) {
+        offset = 0;
+    }
 
     return _texture->texelAsFloat(offset);
 }
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 3ad32a7d02..185919c430 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -122,9 +122,7 @@ void Asset::setState(Asset::State state) {
     }
 }
 
-void Asset::requiredAssetChangedState(std::shared_ptr<Asset> child,
-    Asset::State childState)
-{
+void Asset::requiredAssetChangedState(std::shared_ptr<Asset>, Asset::State childState) {
     if (!isLoaded()) {
         // Prohibit state change to SyncResolved if additional requirements
         // may still be added.
@@ -175,8 +173,8 @@ void Asset::addSynchronization(std::shared_ptr<ResourceSynchronization> synchron
     SynchronizationWatcher::WatchHandle watch =
         _synchronizationWatcher->watchSynchronization(
             synchronization,
-            [this](ResourceSynchronization::State state) {
-                syncStateChanged(state);
+            [this, synchronization](ResourceSynchronization::State state) {
+                syncStateChanged(synchronization, state);
             }
         );
     _syncWatches.push_back(watch);
@@ -189,12 +187,19 @@ void Asset::clearSynchronizations() {
     _syncWatches.clear();
 }
 
-void Asset::syncStateChanged(ResourceSynchronization::State state) {
+void Asset::syncStateChanged(std::shared_ptr<ResourceSynchronization> sync,
+                             ResourceSynchronization::State state)
+{
+
     if (state == ResourceSynchronization::State::Resolved) {
         if (!isSynchronized() && isSyncResolveReady()) {
             setState(State::SyncResolved);
         }
     } else if (state == ResourceSynchronization::State::Rejected) {
+        LERROR(fmt::format(
+            "Failed to synchronize resource '{}'' in asset '{}'", sync->name(), id()
+        ));
+
         setState(State::SyncRejected);
     }
 }
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 1ff97c945e..685058578f 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -70,7 +70,7 @@ std::unique_ptr<Scale> Scale::createFromDictionary(const ghoul::Dictionary& dict
 
     auto factory = FactoryManager::ref().factory<Scale>();
     std::unique_ptr<Scale> result = factory->create(scaleType, dictionary);
-    result->setName("Scale");
+    result->setIdentifier("Scale");
     return result;
 }
 
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index 07c3ca5890..a3361b0907 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -35,19 +35,18 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/scripting/scriptengine.h>
 #include <openspace/util/time.h>
-
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
-#include <ghoul/misc/dictionary.h>
-#include <ghoul/misc/exception.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/misc/exception.h>
+#include <ghoul/misc/invariants.h>
 #include <ghoul/misc/threadpool.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
-
+#include <algorithm>
 #include <chrono>
 #include <iostream>
 #include <iterator>
@@ -62,7 +61,8 @@
 namespace {
     constexpr const char* _loggerCat = "Scene";
     constexpr const char* KeyName = "Name";
-    constexpr const char* KeyParentName = "Parent";
+    constexpr const char* KeyIdentifier = "Identifier";
+    constexpr const char* KeyParent = "Parent";
 } // namespace
 
 namespace openspace {
@@ -72,7 +72,7 @@ Scene::Scene(std::unique_ptr<SceneInitializer> initializer)
     , _dirtyNodeRegistry(false)
     , _initializer(std::move(initializer))
 {
-    _rootDummy.setName(SceneGraphNode::RootNodeName);
+    _rootDummy.setIdentifier(SceneGraphNode::RootNodeIdentifier);
     _rootDummy.setScene(this);
 }
 
@@ -98,14 +98,14 @@ Camera* Scene::camera() const {
 }
 
 void Scene::registerNode(SceneGraphNode* node) {
-    if (_nodesByName.count(node->name())){
+    if (_nodesByIdentifier.count(node->identifier())){
         throw Scene::InvalidSceneError(
-            "Node with name " + node->name() + " already exits."
+            "Node with identifier " + node->identifier() + " already exits."
         );
     }
 
     _topologicallySortedNodes.push_back(node);
-    _nodesByName[node->name()] = node;
+    _nodesByIdentifier[node->identifier()] = node;
     addPropertySubOwner(node);
     _dirtyNodeRegistry = true;
 }
@@ -119,7 +119,12 @@ void Scene::unregisterNode(SceneGraphNode* node) {
         ),
         _topologicallySortedNodes.end()
     );
-    _nodesByName.erase(node->name());
+    _nodesByIdentifier.erase(node->identifier());
+    // Just try to remove all properties; if the property doesn't exist, the
+    // removeInterpolation will not do anything
+    for (properties::Property* p : node->properties()) {
+        removeInterpolation(p);
+    }
     removePropertySubOwner(node);
     _dirtyNodeRegistry = true;
 }
@@ -146,7 +151,7 @@ void Scene::sortTopologically() {
     _circularNodes.clear();
 
     ghoul_assert(
-        _topologicallySortedNodes.size() == _nodesByName.size(),
+        _topologicallySortedNodes.size() == _nodesByIdentifier.size(),
         "Number of scene graph nodes is inconsistent"
     );
 
@@ -155,7 +160,7 @@ void Scene::sortTopologically() {
     }
 
     // Only the Root node can have an in-degree of 0
-    SceneGraphNode* root = _nodesByName[SceneGraphNode::RootNodeName];
+    SceneGraphNode* root = _nodesByIdentifier[SceneGraphNode::RootNodeIdentifier];
     if (!root) {
         throw Scene::InvalidSceneError("No root node found");
     }
@@ -304,9 +309,9 @@ void Scene::update(const UpdateData& data) {
     }
     for (SceneGraphNode* node : _topologicallySortedNodes) {
         try {
-            LTRACE("Scene::update(begin '" + node->name() + "')");
+            LTRACE("Scene::update(begin '" + node->identifier() + "')");
             node->update(data);
-            LTRACE("Scene::update(end '" + node->name() + "')");
+            LTRACE("Scene::update(end '" + node->identifier() + "')");
         }
         catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.what());
@@ -317,9 +322,9 @@ void Scene::update(const UpdateData& data) {
 void Scene::render(const RenderData& data, RendererTasks& tasks) {
     for (SceneGraphNode* node : _topologicallySortedNodes) {
         try {
-            LTRACE("Scene::render(begin '" + node->name() + "')");
+            LTRACE("Scene::render(begin '" + node->identifier() + "')");
             node->render(data, tasks);
-            LTRACE("Scene::render(end '" + node->name() + "')");
+            LTRACE("Scene::render(end '" + node->identifier() + "')");
         }
         catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.what());
@@ -332,8 +337,8 @@ void Scene::clear() {
     _rootDummy.clearChildren();
 }
 
-const std::unordered_map<std::string, SceneGraphNode*>& Scene::nodesByName() const {
-    return _nodesByName;
+const std::unordered_map<std::string, SceneGraphNode*>& Scene::nodesByIdentifier() const {
+    return _nodesByIdentifier;
 }
 
 SceneGraphNode* Scene::root() {
@@ -345,8 +350,8 @@ const SceneGraphNode* Scene::root() const {
 }
 
 SceneGraphNode* Scene::sceneGraphNode(const std::string& name) const {
-    auto it = _nodesByName.find(name);
-    if (it != _nodesByName.end()) {
+    auto it = _nodesByIdentifier.find(name);
+    if (it != _nodesByIdentifier.end()) {
         return it->second;
     }
     return nullptr;
@@ -360,30 +365,26 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& dict) {
     // First interpret the dictionary
     std::vector<std::string> dependencyNames;
 
-    if (!dict.hasKey(KeyName)) {
-        // TODO: Throw exception
-        LERROR("Name missing for scene graph node");
-        return nullptr;
-    }
+    const std::string nodeIdentifier = dict.value<std::string>(KeyIdentifier);
+    const bool hasParent = dict.hasKey(KeyParent);
 
-    const std::string nodeName = dict.value<std::string>(KeyName);
-    const bool hasParent = dict.hasKey(KeyParentName);
-
-    if (_nodesByName.find(nodeName) != _nodesByName.end()) {
+    if (_nodesByIdentifier.find(nodeIdentifier) != _nodesByIdentifier.end()) {
         LERROR(fmt::format(
             "Cannot add scene graph node '{}'. A node with that name already exists",
-            nodeName
+            nodeIdentifier
         ));
         return nullptr;
     }
 
     SceneGraphNode* parent = nullptr;
     if (hasParent) {
-        std::string parentName = dict.value<std::string>(KeyParentName);
-        parent = sceneGraphNode(parentName);
+        const std::string parentIdentifier = dict.value<std::string>(KeyParent);
+        parent = sceneGraphNode(parentIdentifier);
         if (!parent) {
             // TODO: Throw exception
-            LERROR("Could not find parent '" + parentName + "' for '" + nodeName + "'");
+            LERROR(fmt::format(
+                "Could not find parent '{}' for '{}'", parentIdentifier, nodeIdentifier
+            ));
             return nullptr;
         }
     }
@@ -391,7 +392,7 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& dict) {
     std::unique_ptr<SceneGraphNode> node = SceneGraphNode::createFromDictionary(dict);
     if (!node) {
         // TODO: Throw exception
-        LERROR("Could not create node from dictionary: " + nodeName);
+        LERROR("Could not create node from dictionary: " + nodeIdentifier);
     }
 
     if (dict.hasKey(SceneGraphNode::KeyDependencies)) {
@@ -412,11 +413,13 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& dict) {
     // Make sure all dependencies are found
     std::vector<SceneGraphNode*> dependencies;
     bool foundAllDeps = true;
-    for (const auto& depName : dependencyNames) {
+    for (const std::string& depName : dependencyNames) {
         SceneGraphNode* dep = sceneGraphNode(depName);
         if (!dep) {
             // TODO: Throw exception
-            LERROR("Could not find dependency '" + depName + "' for '" + nodeName + "'");
+            LERROR(fmt::format(
+                "Could not find dependency '{}' for '{}'", depName, nodeIdentifier
+            ));
             foundAllDeps = false;
             continue;
         }
@@ -440,6 +443,112 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& dict) {
     return rawNodePointer;
 }
 
+void Scene::addInterpolation(properties::Property* prop, float durationSeconds,
+                             ghoul::EasingFunction easingFunction)
+{
+    ghoul_precondition(prop != nullptr, "prop must not be nullptr");
+    ghoul_precondition(durationSeconds > 0.0, "durationSeconds must be positive");
+    ghoul_postcondition(
+        std::find_if(
+            _interpolationInfos.begin(),
+            _interpolationInfos.end(),
+            [prop](const InterpolationInfo& info) {
+                return info.prop == prop && !info.isExpired;
+            }
+        ) != _interpolationInfos.end(),
+        "A new interpolation record exists for p that is not expired"
+    );
+
+    ghoul::EasingFunc<float> func =
+        easingFunction == ghoul::EasingFunction::Linear
+         ?
+        nullptr :
+        ghoul::easingFunction<float>(easingFunction);
+
+    // First check if the current property already has an interpolation information
+    for (std::vector<InterpolationInfo>::iterator it = _interpolationInfos.begin();
+        it != _interpolationInfos.end();
+        ++it)
+    {
+        if (it->prop == prop) {
+            it->beginTime = std::chrono::steady_clock::now();
+            it->durationSeconds = durationSeconds;
+            it->easingFunction = func;
+            // If we found it, we can break since we make sure that each property is only
+            // represented once in this
+            return;
+        }
+    }
+
+    InterpolationInfo i;
+    i.prop = prop;
+    i.beginTime = std::chrono::steady_clock::now();
+    i.durationSeconds = durationSeconds;
+    i.easingFunction = func;
+
+    _interpolationInfos.push_back(std::move(i));
+}
+
+void Scene::removeInterpolation(properties::Property* prop) {
+    ghoul_precondition(prop != nullptr, "prop must not be nullptr");
+    ghoul_postcondition(
+        std::find_if(
+            _interpolationInfos.begin(),
+            _interpolationInfos.end(),
+            [prop](const InterpolationInfo& info) {
+                return info.prop == prop;
+            }
+        ) == _interpolationInfos.end(),
+        "No interpolation record exists for prop"
+    );
+
+    _interpolationInfos.erase(
+        std::remove_if(
+            _interpolationInfos.begin(),
+            _interpolationInfos.end(),
+            [prop](const InterpolationInfo& info) { return info.prop == prop; }
+        ),
+        _interpolationInfos.end()
+    );
+}
+
+void Scene::updateInterpolations() {
+    using namespace std::chrono;
+    auto now = steady_clock::now();
+
+    for (InterpolationInfo& i : _interpolationInfos) {
+        long long usPassed = duration_cast<std::chrono::microseconds>(
+            now - i.beginTime
+        ).count();
+
+        float t = static_cast<float>(
+            static_cast<double>(usPassed) /
+            static_cast<double>(i.durationSeconds * 1000000)
+        );
+
+        // @FRAGILE(abock): This method might crash if someone deleted the property
+        //                  underneath us. We take care of removing entire PropertyOwners,
+        //                  but we assume that Propertys live as long as their
+        //                  SceneGraphNodes. This is true in general, but if Propertys are
+        //                  created and destroyed often by the SceneGraphNode, this might
+        //                  become a problem.
+        i.prop->interpolateValue(glm::clamp(t, 0.f, 1.f), i.easingFunction);
+
+        i.isExpired = (t >= 1.f);
+    }
+
+    _interpolationInfos.erase(
+        std::remove_if(
+            _interpolationInfos.begin(),
+            _interpolationInfos.end(),
+            [](const InterpolationInfo& i) {
+                return i.isExpired;
+            }
+        ),
+        _interpolationInfos.end()
+    );
+}
+
 void Scene::writeSceneLicenseDocumentation(const std::string& path) const {
     SceneLicenseWriter writer(_licenses);
     writer.writeDocumentation(path);
@@ -453,41 +562,42 @@ scripting::LuaLibrary Scene::luaLibrary() {
                 "setPropertyValue",
                 &luascriptfunctions::property_setValue,
                 {},
-                "string, *",
+                "name, value [, duration, easing, optimization]",
                 "Sets all property(s) identified by the URI (with potential wildcards) "
                 "in the first argument. The second argument can be any type, but it has "
                 "to match the type that the property (or properties) expect. If the "
-                "first term (separated by '.') in the uri is bracketed with { }, then "
-                "this term is treated as a group tag name, and the function will "
-                "search through all property owners to find those that are tagged with "
-                "this group name, and set their property values accordingly."
-            },
-            {
-                "setPropertyValueRegex",
-                &luascriptfunctions::property_setValueRegex,
-                {},
-                "string, *",
-                "Sets all property(s) that pass the regular expression in the first "
-                "argument. The second argument can be any type, but it has to match "
-                "the type of the properties that matched the regular expression. "
-                "The regular expression has to be of the ECMAScript grammar. If the "
-                "first term (separated by '.') in the uri is bracketed with { }, then "
-                "this term is treated as a group tag name, and the function will search "
-                "through all property owners to find those that are tagged with this "
-                "group name, and set their property values accordingly."
+                "third is not present or is '0', the value changes instantly, otherwise "
+                "the change will take that many seconds and the value is interpolated at "
+                "each steap in between. The fourth parameter is an optional easing "
+                "function if a 'duration' has been specified. If 'duration' is 0, this "
+                "parameter value is ignored. Otherwise, it can be one of many supported "
+                "easing functions. See easing.h for available functions. The fifth "
+                "argument must be either empty, 'regex', or 'single'. If the last "
+                "argument is empty (the default), the URI is interpreted using a "
+                "wildcard in which '*' is expanded to '(.*)' and bracketed components "
+                "'{ }' are interpreted as group tag names. Then, the passed value will "
+                "be set on all properties that fit the regex + group name combination. "
+                "If the third argument is 'regex' neither the '*' expansion, nor the "
+                "group tag expansion is performed and the first argument is used as an "
+                "ECMAScript style regular expression that matches against the fully "
+                "qualified IDs of properties. If the third arugment is 'single' no "
+                "substitutions are performed and exactly 0 or 1 properties are changed."
             },
             {
                 "setPropertyValueSingle",
                 &luascriptfunctions::property_setValueSingle,
                 {},
-                "string, *",
-                "Sets all property(s) identified by the URI in the first argument to the "
-                "value passed in the second argument. The type of the second argument is "
-                "arbitrary, but it must agree with the type the denoted Property expects."
-                " If the first term (separated by '.') in the uri is bracketed with { }, "
-                " then this term is treated as a group tag name, and the function will "
-                "search through all property owners to find those that are tagged with "
-                "this group name, and set their property values accordingly."
+                "URI, value [, duration, easing]",
+                "Sets the property identified by the URI in the first argument. The "
+                "second argument can be any type, but it has to match the type that the "
+                "property expects. If the third is not present or is '0', the value "
+                "changes instantly, otherwise the change will take that many seconds and "
+                "the value is interpolated at each steap in between. The fourth "
+                "parameter is an optional easing function if a 'duration' has been "
+                "specified. If 'duration' is 0, this parameter value is ignored. "
+                "Otherwise, it has to be 'linear', 'easein', 'easeout', or 'easeinout'. "
+                "This is the same as calling the setValue method and passing 'single' as "
+                "the fourth argument to setPropertyValue."
             },
             {
                 "getPropertyValue",
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index d0807b0f1f..b390877b16 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -23,24 +23,14 @@
  ****************************************************************************************/
 
 #include <openspace/documentation/documentation.h>
-
+#include <ghoul/misc/defer.h>
+#include <ghoul/misc/easing.h>
 #include <regex>
 
 namespace openspace {
 
 namespace {
 
-void executePropertySet(properties::Property* prop, lua_State* L) {
-    prop->setLuaValue(L);
-    //ensure properties are synced over parallel connection
-    std::string value;
-    prop->getStringValue(value);
-    /*OsEng.parallelConnection().scriptMessage(
-    prop->fullyQualifiedIdentifier(),
-    value
-    );*/
-}
-
 template <class T>
 properties::PropertyOwner* findPropertyOwnerWithMatchingGroupTag(T* prop,
                                                            const std::string& tagToMatch)
@@ -66,19 +56,27 @@ properties::PropertyOwner* findPropertyOwnerWithMatchingGroupTag(T* prop,
     return tagMatchOwner;
 }
 
-void applyRegularExpression(lua_State* L, std::regex regex,
-                            std::vector<properties::Property*> properties, int type,
-                            std::string groupName = "")
+void applyRegularExpression(lua_State* L, const std::string& regex,
+                            std::vector<properties::Property*> properties,
+                            double interpolationDuration,
+                            const std::string& groupName,
+                            ghoul::EasingFunction easingFunction)
 {
     using ghoul::lua::errorLocation;
     using ghoul::lua::luaTypeToString;
     bool isGroupMode = !groupName.empty();
 
+    const int type = lua_type(L, -1);
+
+    // Stores whether we found at least one matching property. If this is false at the end
+    // of the loop, the property name regex was probably misspelled.
+    bool foundMatching = false;
+    std::regex r(regex);
     for (properties::Property* prop : properties) {
         // Check the regular expression for all properties
         std::string id = prop->fullyQualifiedIdentifier();
 
-        if (std::regex_match(id, regex)) {
+        if (std::regex_match(id, r)) {
             // If the fully qualified id matches the regular expression, we queue the
             // value change if the types agree
             if (isGroupMode) {
@@ -105,13 +103,37 @@ void applyRegularExpression(lua_State* L, std::regex regex,
                     )
                 );
             } else {
-               executePropertySet(prop, L);
+                foundMatching = true;
+
+                if (interpolationDuration == 0.0) {
+                    OsEng.renderEngine().scene()->removeInterpolation(prop);
+                    prop->setLuaValue(L);
+                }
+                else {
+                    prop->setLuaInterpolationTarget(L);
+                    OsEng.renderEngine().scene()->addInterpolation(
+                        prop,
+                        static_cast<float>(interpolationDuration),
+                        easingFunction
+                    );
+                }
             }
         }
     }
+
+    if (!foundMatching) {
+        LERRORC(
+            "property_setValue",
+            fmt::format(
+                "{}: No property matched the requested URI '{}'",
+                errorLocation(L),
+                regex
+            )
+        );
+    }
 }
 
-//Checks to see if URI contains a group tag (with { } around the first term). If so,
+// Checks to see if URI contains a group tag (with { } around the first term). If so,
 // returns true and sets groupName with the tag
 bool doesUriContainGroupTag(const std::string& command, std::string& groupName) {
     std::string name = command.substr(0, command.find_first_of("."));
@@ -138,13 +160,15 @@ std::string extractUriWithoutGroupName(std::string uri) {
 
 namespace openspace::luascriptfunctions {
 
-int setPropertyCall_single(properties::Property* prop, std::string uri, lua_State* L,
-                           const int type)
+int setPropertyCall_single(properties::Property& prop, const std::string& uri,
+                          lua_State* L, double duration,
+                          ghoul::EasingFunction eastingFunction)
 {
     using ghoul::lua::errorLocation;
     using ghoul::lua::luaTypeToString;
 
-    if (type != prop->typeLua()) {
+    const int type = lua_type(L, -1);
+    if (type != prop.typeLua()) {
         LERRORC(
             "property_setValue",
             fmt::format(
@@ -153,78 +177,24 @@ int setPropertyCall_single(properties::Property* prop, std::string uri, lua_Stat
                 errorLocation(L),
                 uri,
                 luaTypeToString(type),
-                luaTypeToString(prop->typeLua())
+                luaTypeToString(prop.typeLua())
             )
         );
     }
     else {
-        prop->setLuaValue(L);
-        //ensure properties are synced over parallel connection
-        std::string value;
-        prop->getStringValue(value);
-    }
-
-    return 0;
-}
-
-/**
- * \ingroup LuaScripts
- * setPropertyValueSingle(string, *):
- * Sets all property(s) identified by the URI in the first argument to the value passed
- * in the second argument. The type of the second argument is arbitrary, but it must
- * agree with the type the denoted Property expects.
- * If the first term (separated by '.') in the uri is bracketed with { }, then this
- * term is treated as a group tag name, and the function will search through all
- * property owners to find those that are tagged with this group name, and set their
- * property values accordingly.
- */
-int property_setValueSingle(lua_State* L) {
-    using ghoul::lua::errorLocation;
-    using ghoul::lua::luaTypeToString;
-
-    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::property_setValueSingle");
-
-    std::string uri = luaL_checkstring(L, -2);
-    const int type = lua_type(L, -1);
-    std::string tagToMatch;
-
-    if (doesUriContainGroupTag(uri, tagToMatch)) {
-        std::string pathRemainderToMatch = extractUriWithoutGroupName(uri);
-        for (properties::Property* prop : allProperties()) {
-            std::string propFullId = prop->fullyQualifiedIdentifier();
-            //Look for a match in the uri with the group name (first term) removed
-            int propMatchLength =
-                static_cast<int>(propFullId.length()) -
-                static_cast<int>(pathRemainderToMatch.length());
-
-            if (propMatchLength >= 0) {
-                std::string thisPropMatchId = propFullId.substr(propMatchLength);
-                //If remainder of uri matches (with group name removed),
-                if (pathRemainderToMatch.compare(thisPropMatchId) == 0)  {
-                    properties::PropertyOwner* matchingTaggedOwner
-                        = findPropertyOwnerWithMatchingGroupTag(prop, tagToMatch);
-                    if (matchingTaggedOwner) {
-                        setPropertyCall_single(prop, uri, L, type);
-                    }
-                }
-            }
+        if (duration == 0.0) {
+            OsEng.renderEngine().scene()->removeInterpolation(&prop);
+            prop.setLuaValue(L);
         }
-    } else {
-        properties::Property* prop = property(uri);
-        if (!prop) {
-            LERRORC(
-                "property_setValue",
-                fmt::format(
-                    "{}: Property with URI '{}' was not found",
-                    errorLocation(L),
-                    uri
-                )
+        else {
+            prop.setLuaInterpolationTarget(L);
+            OsEng.renderEngine().scene()->addInterpolation(
+                &prop,
+                static_cast<float>(duration),
+                eastingFunction
             );
-            return 0;
         }
-        setPropertyCall_single(prop, uri, L, type);
     }
-
     return 0;
 }
 
@@ -244,83 +214,155 @@ int property_setValue(lua_State* L) {
     using ghoul::lua::errorLocation;
     using ghoul::lua::luaTypeToString;
 
-    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::property_setGroup");
+    ghoul::lua::checkArgumentsAndThrow(L, { 2, 5 }, "lua::property_setValue");
+    defer { lua_settop(L, 0); };
 
-    std::string regex = luaL_checkstring(L, -2);
-    std::string groupName;
+    std::string uriOrRegex = luaL_checkstring(L, 1);
+    std::string optimization;
+    double interpolationDuration = 0.0;
+    std::string easingMethodName;
+    ghoul::EasingFunction easingMethod = ghoul::EasingFunction::Linear;
 
-    // Replace all wildcards *  with the correct regex (.*)
-    size_t startPos = regex.find("*");
-    while (startPos != std::string::npos) {
-        regex.replace(startPos, 1, "(.*)");
-        startPos += 4;
-        startPos = regex.find("*", startPos);
+    if (lua_gettop(L) >= 3) {
+        if (lua_type(L, 3) == LUA_TNUMBER) {
+            interpolationDuration = luaL_checknumber(L, 3);
+        }
+        else {
+            optimization = luaL_checkstring(L, 3);
+        }
+
+        if (lua_gettop(L) >= 4) {
+            if (lua_type(L, 4) == LUA_TNUMBER) {
+                interpolationDuration = luaL_checknumber(L, 4);
+            }
+            else {
+                optimization = luaL_checkstring(L, 4);
+            }
+        }
+
+        if (lua_gettop(L) == 5) {
+            easingMethodName = luaL_checkstring(L, 5);
+        }
+
+        // Later functions expect the value to be at the last position on the stack
+        lua_pushvalue(L, 2);
     }
 
-    if (doesUriContainGroupTag(regex, groupName)) {
-        std::string pathRemainderToMatch = extractUriWithoutGroupName(regex);
-        //Remove group name from start of regex and replace with '.*'
-        regex = replaceUriWithGroupName(regex, ".*");
-    }
-
-    applyRegularExpression(
-        L,
-        std::regex(regex/*, std::regex_constants::optimize*/),
-        allProperties(),
-        lua_type(L, -1),
-        groupName
-    );
-
-    return 0;
-}
-
-/**
- * \ingroup LuaScripts
- * setPropertyValueRegex(string, *):
- * Sets all property(s) that pass the regular expression in the first argument. The second
- * argument can be any type, but it has to match the type of the properties that matched
- * the regular expression. The regular expression has to be of the ECMAScript grammar.
- * If the first term (separated by '.') in the uri is bracketed with { }, then this
- * term is treated as a group tag name, and the function will search through all
- * property owners to find those that are tagged with this group name, and set their
- * property values accordingly.
-*/
-int property_setValueRegex(lua_State* L) {
-    using ghoul::lua::errorLocation;
-    using ghoul::lua::luaTypeToString;
-
-    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::property_setValueRegex");
-
-    std::string regex = luaL_checkstring(L, -2);
-    std::string groupName;
-
-    if (doesUriContainGroupTag(regex, groupName)) {
-        std::string pathRemainderToMatch = extractUriWithoutGroupName(regex);
-        //Remove group name from start of regex and replace with '.*'
-        regex = replaceUriWithGroupName(regex, ".*");
-    }
-
-    try {
-        applyRegularExpression(
-            L,
-            std::regex(regex, std::regex_constants::optimize),
-            allProperties(),
-            lua_type(L, -1),
-            groupName
+    if (interpolationDuration == 0.0 && !easingMethodName.empty()) {
+        LWARNINGC(
+            "property_setValue",
+            "Easing method specified while interpolation duration is equal to 0"
         );
     }
-    catch (const std::regex_error& e) {
+
+    if (!easingMethodName.empty()) {
+        bool correctName = ghoul::isValidEasingFunctionName(easingMethodName.c_str());
+        if (!correctName) {
+            LWARNINGC(
+                "property_setValue",
+                fmt::format("{} is not a valid easing method", easingMethodName)
+            );
+        }
+        else {
+            easingMethod = ghoul::easingFunctionFromName(easingMethodName.c_str());
+        }
+    }
+
+    if (optimization.empty()) {
+        // Replace all wildcards * with the correct regex (.*)
+        size_t startPos = uriOrRegex.find("*");
+        while (startPos != std::string::npos) {
+            uriOrRegex.replace(startPos, 1, "(.*)");
+            startPos += 4;
+            startPos = uriOrRegex.find("*", startPos);
+        }
+
+        std::string groupName;
+        if (doesUriContainGroupTag(uriOrRegex, groupName)) {
+            std::string pathRemainderToMatch = extractUriWithoutGroupName(uriOrRegex);
+            //Remove group name from start of regex and replace with '.*'
+            uriOrRegex = replaceUriWithGroupName(uriOrRegex, ".*");
+        }
+
+        try {
+            applyRegularExpression(
+                L,
+                uriOrRegex,
+                allProperties(),
+                interpolationDuration,
+                groupName,
+                easingMethod
+            );
+        }
+        catch (const std::regex_error& e) {
+            LERRORC(
+                "property_setValue",
+                fmt::format(
+                    "Malformed regular expression: '{}': {}", uriOrRegex, e.what()
+                )
+            );
+        }
+        return 0;
+    }
+    else if (optimization == "regex") {
+        try {
+            applyRegularExpression(
+                L,
+                uriOrRegex,
+                allProperties(),
+                interpolationDuration,
+                "",
+                easingMethod
+            );
+        }
+        catch (const std::regex_error& e) {
+            LERRORC(
+                "property_setValueRegex",
+                fmt::format(
+                    "Malformed regular expression: '{}': {}", uriOrRegex, e.what()
+                )
+            );
+        }
+    }
+    else if (optimization == "single") {
+        properties::Property* prop = property(uriOrRegex);
+        if (!prop) {
+            LERRORC(
+                "property_setValue",
+                fmt::format(
+                    "{}: Property with URI '{}' was not found",
+                    errorLocation(L),
+                    uriOrRegex
+                )
+            );
+            return 0;
+        }
+        return setPropertyCall_single(
+            *prop,
+            uriOrRegex,
+            L,
+            interpolationDuration,
+            easingMethod
+        );
+    }
+    else {
         LERRORC(
-            "property_setValueRegex",
+            "lua::property_setGroup",
             fmt::format(
-                "Malformed regular expression: '{}': {}", regex, e.what()
+                "{}: Unexpected optimization '{}'",
+                errorLocation(L),
+                optimization
             )
         );
     }
-
     return 0;
 }
 
+int property_setValueSingle(lua_State* L) {
+    lua_pushstring(L, "single");
+    return property_setValue(L);
+}
+
 /**
  * \ingroup LuaScripts
  * getPropertyValue(string):
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index 46bf237288..84f720dfc5 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -56,7 +56,9 @@
 namespace {
     constexpr const char* _loggerCat = "SceneGraphNode";
     constexpr const char* KeyRenderable = "Renderable";
-    constexpr const char* KeyGuiPath = "GuiPath";
+    constexpr const char* KeyGuiName = "GUI.Name";
+    constexpr const char* KeyGuiPath = "GUI.Path";
+    constexpr const char* KeyGuiHidden = "GUI.Hidden";
 
     constexpr const char* keyTransformTranslation = "Transform.Translation";
     constexpr const char* keyTransformRotation = "Transform.Rotation";
@@ -65,13 +67,6 @@ namespace {
 
 namespace openspace {
 
-// Constants used outside of this file
-const std::string SceneGraphNode::RootNodeName = "Root";
-const std::string SceneGraphNode::KeyName = "Name";
-const std::string SceneGraphNode::KeyParentName = "Parent";
-const std::string SceneGraphNode::KeyDependencies = "Dependencies";
-const std::string SceneGraphNode::KeyTag = "Tag";
-
 std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
@@ -83,8 +78,16 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
 
     std::unique_ptr<SceneGraphNode> result = std::make_unique<SceneGraphNode>();
 
-    std::string name = dictionary.value<std::string>(KeyName);
-    result->setName(name);
+    std::string identifier = dictionary.value<std::string>(KeyIdentifier);
+    result->setIdentifier(std::move(identifier));
+
+    if (dictionary.hasKey(KeyGuiName)) {
+        result->setGuiName(dictionary.value<std::string>(KeyGuiName));
+    }
+
+    if (dictionary.hasKey(KeyGuiHidden)) {
+        result->_guiHintHidden = dictionary.value<bool>(KeyGuiHidden);
+    }
 
     if (dictionary.hasKey(keyTransformTranslation)) {
         ghoul::Dictionary translationDictionary;
@@ -94,13 +97,13 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         );
         if (result->_transform.translation == nullptr) {
             LERROR(fmt::format(
-                "Failed to create ephemeris for SceneGraphNode '{}'", result->name()
+                "Failed to create ephemeris for SceneGraphNode '{}'", result->identifier()
             ));
             return nullptr;
         }
         result->addPropertySubOwner(result->_transform.translation.get());
         LDEBUG(fmt::format(
-            "Successfully created ephemeris for '{}'", result->name()
+            "Successfully created ephemeris for '{}'", result->identifier()
         ));
     }
 
@@ -110,12 +113,14 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         result->_transform.rotation = Rotation::createFromDictionary(rotationDictionary);
         if (result->_transform.rotation == nullptr) {
             LERROR(fmt::format(
-                "Failed to create rotation for SceneGraphNode '{}'", result->name()
+                "Failed to create rotation for SceneGraphNode '{}'", result->identifier()
             ));
             return nullptr;
         }
         result->addPropertySubOwner(result->_transform.rotation.get());
-        LDEBUG(fmt::format("Successfully created rotation for '{}'", result->name()));
+        LDEBUG(fmt::format(
+            "Successfully created rotation for '{}'", result->identifier()
+        ));
     }
 
     if (dictionary.hasKey(keyTransformScale)) {
@@ -124,12 +129,12 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         result->_transform.scale = Scale::createFromDictionary(scaleDictionary);
         if (result->_transform.scale == nullptr) {
             LERROR(fmt::format(
-                "Failed to create scale for SceneGraphNode '{}'", result->name()
+                "Failed to create scale for SceneGraphNode '{}'", result->identifier()
             ));
             return nullptr;
         }
         result->addPropertySubOwner(result->_transform.scale.get());
-        LDEBUG(fmt::format("Successfully created scale for '{}'", result->name()));
+        LDEBUG(fmt::format("Successfully created scale for '{}'", result->identifier()));
     }
 
     // We initialize the renderable last as it probably has the most dependencies
@@ -137,17 +142,20 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         ghoul::Dictionary renderableDictionary;
         dictionary.getValue(KeyRenderable, renderableDictionary);
 
-        renderableDictionary.setValue(KeyName, name);
+        renderableDictionary.setValue(KeyIdentifier, identifier);
 
         result->_renderable = Renderable::createFromDictionary(renderableDictionary);
         if (result->_renderable == nullptr) {
             LERROR(fmt::format(
-                "Failed to create renderable for SceneGraphNode '{}'", result->name()
+                "Failed to create renderable for SceneGraphNode '{}'",
+                result->identifier()
             ));
             return nullptr;
         }
         result->addPropertySubOwner(result->_renderable.get());
-        LDEBUG(fmt::format("Successfully created renderable for '{}'", result->name()));
+        LDEBUG(fmt::format(
+            "Successfully created renderable for '{}'", result->identifier()
+        ));
     }
 
     if (dictionary.hasKey(KeyTag)) {
@@ -173,7 +181,7 @@ std::unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
         result->_guiPath = dictionary.value<std::string>(KeyGuiPath);
     }
 
-    LDEBUG(fmt::format("Successfully created SceneGraphNode '{}'", result->name()));
+    LDEBUG(fmt::format("Successfully created SceneGraphNode '{}'", result->identifier()));
     return result;
 }
 
@@ -194,7 +202,7 @@ SceneGraphNode::SceneGraphNode()
 SceneGraphNode::~SceneGraphNode() {}
 
 void SceneGraphNode::initialize() {
-    LDEBUG(fmt::format("Initialize: {}", name()));
+    LDEBUG(fmt::format("Initialize: {}", identifier()));
     if (_renderable) {
         _renderable->initialize();
     }
@@ -219,7 +227,7 @@ void SceneGraphNode::initializeGL() {
 }
 
 void SceneGraphNode::deinitialize() {
-    LDEBUG(fmt::format("Deinitialize: {}", name()));
+    LDEBUG(fmt::format("Deinitialize: {}", identifier()));
 
     setScene(nullptr);
 
@@ -570,6 +578,10 @@ const std::string& SceneGraphNode::guiPath() const {
     return _guiPath;
 }
 
+bool SceneGraphNode::hasGuiHintHidden() const {
+    return _guiHintHidden;
+}
+
 glm::dvec3 SceneGraphNode::calculateWorldPosition() const {
     // recursive up the hierarchy if there are parents available
     if (_parent) {
@@ -696,21 +708,21 @@ bool SceneGraphNode::sphereInsideFrustum(const psc& s_pos, const PowerScaledScal
 }
 */
 
-SceneGraphNode* SceneGraphNode::childNode(const std::string& name)
-{
-    if (this->name() == name)
+SceneGraphNode* SceneGraphNode::childNode(const std::string& identifier) {
+    if (this->identifier() == identifier) {
         return this;
+    }
     else
         for (std::unique_ptr<SceneGraphNode>& it : _children) {
-            SceneGraphNode* tmp = it->childNode(name);
-            if (tmp)
+            SceneGraphNode* tmp = it->childNode(identifier);
+            if (tmp) {
                 return tmp;
+            }
         }
     return nullptr;
 }
 
-void SceneGraphNode::updateCamera(Camera* camera) const{
-
+void SceneGraphNode::updateCamera(Camera* camera) const {
     psc origin(worldPosition());
     //int i = 0;
     // the camera position
diff --git a/src/scene/scenegraphnode_doc.inl b/src/scene/scenegraphnode_doc.inl
index 5d455d30b9..938d2322b2 100644
--- a/src/scene/scenegraphnode_doc.inl
+++ b/src/scene/scenegraphnode_doc.inl
@@ -35,13 +35,13 @@ documentation::Documentation SceneGraphNode::Documentation() {
         "core_scene_node",
         {
         {
-            "Name",
+            "Identifier",
             new StringVerifier,
             Optional::No,
-            "The name of this scenegraph node. This name must be unique among all scene "
-            "graph nodes that are loaded in a specific scene. If a duplicate is detected "
-            "the loading of the node will fail, as will all childing that depend on the "
-            "node."
+            "The identifier of this scenegraph node. This name must be unique among all "
+            "scene graph nodes that are loaded in a specific scene. If a duplicate is "
+            "detected the loading of the node will fail, as will all childing that "
+            "depend on the node. The identifier must not contain any whitespaces or '.'."
         },
         {
             "Parent",
@@ -99,13 +99,39 @@ documentation::Documentation SceneGraphNode::Documentation() {
             "corresponding to a 'Translation', a 'Rotation', and a 'Scale'."
         },
         {
-            "GuiPath",
-            new StringVerifier,
+            "GUI",
+            new TableVerifier({
+                {
+                    "Name",
+                    new StringVerifier,
+                    Optional::Yes,
+                    "An optional user-facing name for this SceneGraphNode, which does "
+                    "not have to be unique, though it is recommended, and can contain "
+                    "any characters."
+                },
+                {
+                    "Path",
+                    new StringVerifier,
+                    Optional::Yes,
+                    "If this value is specified, this '/' separated URI specifies the "
+                    "location of this scenegraph node in a GUI representation, for "
+                    "instance '/SolarSystem/Earth/Moon'."
+                },
+                {
+                    "Hidden",
+                    new BoolVerifier,
+                    Optional::Yes,
+                    "If this value is specified, GUI applications are incouraged to "
+                    "ignore this scenegraph node. This is most useful to trim collective "
+                    "lists of nodes and not display, for example, barycenters."
+                }
+            }),
             Optional::Yes,
-            "If this value is specified, this '/' separated URI specifies the location "
-            "of this scenegraph node in a GUI representation, for instance "
-            "'/SolarSystem/Earth/Moon'."
-        }
+            "Additional information that is passed to GUI applications. These are all "
+            "hints and do not have any impact on the actual function of the scenegraph "
+            "node."
+        },
+
         }
     };
 }
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index c47830714a..0d586f1950 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -54,7 +54,8 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
         LoadingScreen& loadingScreen = OsEng.loadingScreen();
 
         loadingScreen.updateItem(
-            node->name(),
+            node->identifier(),
+            node->guiName(),
             LoadingScreen::ItemStatus::Initializing,
             1.f
         );
@@ -65,7 +66,8 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
         _initializingNodes.erase(node);
 
         loadingScreen.updateItem(
-            node->name(),
+            node->identifier(),
+            node->guiName(),
             LoadingScreen::ItemStatus::Finished,
             1.f
         );
@@ -74,7 +76,8 @@ void MultiThreadedSceneInitializer::initializeNode(SceneGraphNode* node) {
     LoadingScreen& loadingScreen = OsEng.loadingScreen();
     loadingScreen.setItemNumber(loadingScreen.itemNumber() + 1);
     loadingScreen.updateItem(
-        node->name(),
+        node->identifier(),
+        node->guiName(),
         LoadingScreen::ItemStatus::Started,
         0.f
     );
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index f1a7008251..404a43d9be 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -67,7 +67,7 @@ std::unique_ptr<Translation> Translation::createFromDictionary(
     ghoul::TemplateFactory<Translation>* factory
           = FactoryManager::ref().factory<Translation>();
     std::unique_ptr<Translation> result = factory->create(translationType, dictionary);
-    result->setName("Translation");
+    result->setIdentifier("Translation");
     return result;
 }
 
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 5d70cfa16d..d7839e0749 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -32,7 +32,7 @@
 
 #include <openspace/engine/configurationmanager.h>
 #include <openspace/engine/openspaceengine.h>
-#include <openspace/network/parallelconnection.h>
+#include <openspace/network/parallelpeer.h>
 #include <openspace/util/syncbuffer.h>
 
 #include <fstream>
@@ -646,8 +646,8 @@ void ScriptEngine::presync(bool isMaster) {
         _receivedScripts.push_back(_currentSyncedScript);
         _queuedScripts.pop_back();
 
-        if (OsEng.parallelConnection().isHost() && remoteScripting) {
-            OsEng.parallelConnection().sendScript(_currentSyncedScript);
+        if (OsEng.parallelPeer().isHost() && remoteScripting) {
+            OsEng.parallelPeer().sendScript(_currentSyncedScript);
         }
     }
     _mutex.unlock();
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index ab32cbf98c..3aa1d5192a 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -84,6 +84,7 @@ int loadScheduledScript(lua_State* L) {
         });
     }
 
+    lua_settop(L, 0);
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
     return 0;
 }
diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp
index 75e7028eeb..22a059c5df 100644
--- a/src/util/blockplaneintersectiongeometry.cpp
+++ b/src/util/blockplaneintersectiongeometry.cpp
@@ -36,12 +36,11 @@ namespace {
 
 namespace openspace {
 
-BlockPlaneIntersectionGeometry::BlockPlaneIntersectionGeometry(
-        glm::vec3 blockSize,
-        glm::vec3 planeNormal,
-        float planeDistance)
-    : _initialized(false)
-    , _vaoId(0)
+BlockPlaneIntersectionGeometry::BlockPlaneIntersectionGeometry(glm::vec3 blockSize,
+                                                               glm::vec3 planeNormal,
+                                                               float planeDistance)
+    // : _initialized(false)
+    : _vaoId(0)
     , _vBufferId(0)
     , _size(blockSize)
 {}
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index d17d09828e..4c1e83e9d6 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -313,6 +313,14 @@ float Histogram::entropy() {
     return entropy;
 }
 
+std::vector<char> Histogram::getBinaryData() const {
+    std::vector<char> dataVector(
+        reinterpret_cast<char*>(_data),
+        reinterpret_cast<char*>(_data + _numValues)
+    );
+    return dataVector;
+}
+
 void Histogram::print() const {
     //for (int i = 0; i < _numBins; i++) {
     //    //float low = _minValue + float(i) / _numBins * (_maxValue - _minValue);
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 29c869d2f3..41fde1bc65 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -397,6 +397,10 @@ bool HttpFileDownload::initDownload() {
     return true;
 }
 
+const std::string& HttpFileDownload::destination() const {
+    return _destination;
+}
+
 bool HttpFileDownload::deinitDownload() {
     _file.close();
     --nCurrentFilehandles;
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index 197dfb40ae..fb40e0c5f8 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -49,18 +49,18 @@ OpenSpaceModule::OpenSpaceModule(std::string name)
 void OpenSpaceModule::initialize(const ModuleEngine* moduleEngine,
                                  const ghoul::Dictionary& configuration)
 {
-    std::string upperName = name();
+    std::string upperIdentifier = identifier();
     std::transform(
-        upperName.begin(),
-        upperName.end(),
-        upperName.begin(),
+        upperIdentifier.begin(),
+        upperIdentifier.end(),
+        upperIdentifier.begin(),
         [](char v) { return static_cast<char>(toupper(v)); }
     );
 
     std::string moduleToken =
         ghoul::filesystem::FileSystem::TokenOpeningBraces +
         std::string(ModuleBaseToken) +
-        upperName +
+        upperIdentifier +
         ghoul::filesystem::FileSystem::TokenClosingBraces;
 
     std::string path = modulePath();
@@ -92,21 +92,21 @@ ghoul::systemcapabilities::Version OpenSpaceModule::requiredOpenGLVersion() cons
 }
 
 std::string OpenSpaceModule::modulePath() const {
-    std::string moduleName = name();
+    std::string moduleIdentifier = identifier();
     std::transform(
-        moduleName.begin(),
-        moduleName.end(),
-        moduleName.begin(),
+        moduleIdentifier.begin(),
+        moduleIdentifier.end(),
+        moduleIdentifier.begin(),
         [](char v) { return static_cast<char>(tolower(v)); }
     );
 
     // First try the internal module directory
-    if (FileSys.directoryExists(absPath("${MODULES}/" + moduleName))) {
-        return absPath("${MODULES}/" + moduleName);
+    if (FileSys.directoryExists(absPath("${MODULES}/" + moduleIdentifier))) {
+        return absPath("${MODULES}/" + moduleIdentifier);
     }
     else { // Otherwise, it might be one of the external directories
         for (const char* dir : ModulePaths) {
-            const std::string path = std::string(dir) + '/' + moduleName;
+            const std::string path = std::string(dir) + '/' + moduleIdentifier;
             if (FileSys.directoryExists(absPath(path))) {
                 return absPath(path);
             }
@@ -115,7 +115,7 @@ std::string OpenSpaceModule::modulePath() const {
 
     // If we got this far, neither the internal module nor any of the external modules fit
     throw ghoul::RuntimeError(
-        "Could not resolve path for module '" + name() + "'",
+        "Could not resolve path for module '" + identifier() + "'",
         "OpenSpaceModule"
     );
 }
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 5540f4c860..2bc10bd6ce 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -192,7 +192,9 @@ scripting::LuaLibrary Time::luaLibrary() {
                 "Sets the current simulation time to the "
                 "specified value. If the parameter is a number, the value is the number "
                 "of seconds past the J2000 epoch. If it is a string, it has to be a "
-                "valid ISO 8601 date string (YYYY-MM-DDTHH:MN:SS)"
+                "valid ISO 8601-like date string of the format YYYY-MM-DDTHH:MN:SS. "
+                "Note: providing time zone using the Z format is not supported. UTC is "
+                "assumed."
             },
             {
                 "currentTime",
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index 996d8bb56c..86239736bd 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -45,6 +45,7 @@ int time_setDeltaTime(lua_State* L) {
     const bool isNumber = (lua_isnumber(L, -1) != 0);
     if (isNumber) {
         double value = lua_tonumber(L, -1);
+        lua_pop(L, 1);
         OsEng.timeManager().time().setDeltaTime(value);
         ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
         return 0;
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index ad2f346258..4171dddbda 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -26,7 +26,7 @@
 
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/wrapper/windowwrapper.h>
-#include <openspace/network/parallelconnection.h>
+#include <openspace/network/parallelpeer.h>
 #include <openspace/util/timeline.h>
 
 namespace openspace {
@@ -34,7 +34,6 @@ namespace openspace {
 using datamessagestructures::TimeKeyframe;
 
 void TimeManager::preSynchronization(double dt) {
-//    double now = OsEng.runTime();
     removeKeyframesBefore(_latestConsumedTimestamp);
     if (_shouldSetTime) {
         time().setTime(_timeNextFrame.j2000Seconds());
@@ -44,6 +43,22 @@ void TimeManager::preSynchronization(double dt) {
     } else {
         consumeKeyframes(dt);
     }
+
+    // Notify observers about time changes if any.
+    double newTime = time().j2000Seconds();
+    double newDeltaTime = time().deltaTime();
+    if (newTime != _lastTime) {
+        for (const auto& it : _timeChangeCallbacks) {
+            it.second();
+        }
+    }
+    if (newDeltaTime != _lastDeltaTime) {
+        for (const auto& it : _deltaTimeChangeCallbacks) {
+            it.second();
+        }
+    }
+    _lastTime = newTime;
+    _lastDeltaTime = newDeltaTime;
 }
 
 void TimeManager::consumeKeyframes(double dt) {
@@ -108,7 +123,7 @@ void TimeManager::consumeKeyframes(double dt) {
             return;
         }
 
-        const double secondsOffTolerance = OsEng.parallelConnection().timeTolerance();
+        const double secondsOffTolerance = OsEng.parallelPeer().timeTolerance();
 
         double predictedTime = time().j2000Seconds() + time().deltaTime() *
                                (next.timestamp - now);
@@ -174,4 +189,51 @@ std::vector<Syncable*> TimeManager::getSyncables() {
     return{ &_currentTime };
 }
 
+TimeManager::CallbackHandle TimeManager::addTimeChangeCallback(TimeChangeCallback cb) {
+    CallbackHandle handle = _nextCallbackHandle++;
+    _timeChangeCallbacks.push_back({ handle, std::move(cb) });
+    return handle;
 }
+
+TimeManager::CallbackHandle TimeManager::addDeltaTimeChangeCallback(TimeChangeCallback cb)
+{
+    CallbackHandle handle = _nextCallbackHandle++;
+    _deltaTimeChangeCallbacks.push_back({ handle, std::move(cb) });
+    return handle;
+}
+
+void TimeManager::removeTimeChangeCallback(CallbackHandle handle) {
+    auto it = std::find_if(
+        _timeChangeCallbacks.begin(),
+        _timeChangeCallbacks.end(),
+        [handle](const std::pair<CallbackHandle, std::function<void()>>& cb) {
+            return cb.first == handle;
+        }
+    );
+
+    ghoul_assert(
+        it != _timeChangeCallbacks.end(),
+        "handle must be a valid callback handle"
+    );
+
+    _timeChangeCallbacks.erase(it);
+}
+
+void TimeManager::removeDeltaTimeChangeCallback(CallbackHandle handle) {
+    auto it = std::find_if(
+        _deltaTimeChangeCallbacks.begin(),
+        _deltaTimeChangeCallbacks.end(),
+        [handle](const std::pair<CallbackHandle, std::function<void()>>& cb) {
+            return cb.first == handle;
+        }
+    );
+
+    ghoul_assert(
+        it != _deltaTimeChangeCallbacks.end(),
+        "handle must be a valid callback handle"
+    );
+
+    _deltaTimeChangeCallbacks.erase(it);
+}
+
+} // namespace openspace
diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp
index eba2959ee3..f84580190d 100644
--- a/src/util/transformationmanager.cpp
+++ b/src/util/transformationmanager.cpp
@@ -26,17 +26,16 @@
 #include <openspace/util/spicemanager.h>
 #include <ghoul/logging/logmanager.h>
 
-namespace {
-    constexpr const char* _loggerCat = "TransformationManager";
-} // namespace
-
 namespace openspace {
 
 TransformationManager::TransformationManager(){
 #ifdef OPENSPACE_MODULE_KAMELEON_ENABLED
     _kameleon = std::make_shared<ccmc::Kameleon>();
 #else
-    LWARNING("Kameleon module needed for transformations with dynamic frames");
+    LWARNINGC(
+        "TransformationManager",
+        "Kameleon module needed for transformations with dynamic frames"
+    );
 #endif
     _kameleonFrames = {
         "J2000", "GEI", "GEO", "MAG", "GSE", "GSM", "SM", "RTN", "GSEQ",   //geocentric
@@ -124,7 +123,10 @@ glm::dmat3 TransformationManager::frameTransformationMatrix(
         return kameleonTransformation*spiceTransformation;
     }
 #else
-    LERROR("Can not transform dynamic frames without kameleon module enabled");
+    LERRORC(
+        "TransformationManager",
+        "Can not transform dynamic frames without kameleon module enabled"
+    );
 #endif
     return glm::dmat3(1.0);
 }
diff --git a/support/cmake/openspace_header.template b/support/cmake/openspace_header.template
index 860d305fb4..4a5bc0aff9 100644
--- a/support/cmake/openspace_header.template
+++ b/support/cmake/openspace_header.template
@@ -41,7 +41,8 @@ constexpr const char* OPENSPACE_VERSION_STRING_FULL = "@OPENSPACE_VERSION_MAJOR@
 
 constexpr const char* OPENSPACE_GIT_BRANCH = "@OPENSPACE_GIT_BRANCH@";
 constexpr const char* OPENSPACE_GIT_COMMIT = "@OPENSPACE_GIT_COMMIT@";
-constexpr const char* OPENSPACE_GIT_FULL = "@OPENSPACE_GIT_BRANCH@@@OPENSPACE_GIT_COMMIT@";
+constexpr const char* OPENSPACE_GIT_STATUS = "@OPENSPACE_GIT_STATUS@";
+constexpr const char* OPENSPACE_GIT_FULL = "@OPENSPACE_GIT_BRANCH@@@OPENSPACE_GIT_COMMIT@ @OPENSPACE_GIT_STATUS@";
 
 } // namespace openspace
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 1016a8cfe3..af3fb23472 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -31,6 +31,7 @@
 #pragma clang diagnostic ignored "-Wmissing-noreturn"
 #pragma clang diagnostic ignored "-Wshift-sign-overflow"
 #pragma clang diagnostic ignored "-Wsign-compare"
+#pragma clang diagnostic ignored "-Wused-but-marked-unused"
 #elif defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wundef"
diff --git a/tests/regression/517.inl b/tests/regression/517.inl
index 774f842459..cf28d26f79 100644
--- a/tests/regression/517.inl
+++ b/tests/regression/517.inl
@@ -31,8 +31,8 @@ TEST_F(Issue527, Regression) {
     openspace::properties::OptionProperty p({ "id", "gui", "desc"});
 
     p.addOptions({
-        {-1, "a" },
-        {-2, "b" }
+        { -1, "a" },
+        { -2, "b" }
     });
 
 
diff --git a/tests/test_rawvolumeio.inl b/tests/test_rawvolumeio.inl
index f161d6cd36..cacb18b60d 100644
--- a/tests/test_rawvolumeio.inl
+++ b/tests/test_rawvolumeio.inl
@@ -34,12 +34,10 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/glm.h>
 
-using namespace openspace;
-
 class RawVolumeIoTest : public testing::Test {};
 
 TEST_F(RawVolumeIoTest, TinyInputOutput) {
-    using namespace volume;
+    using namespace openspace::volume;
 
     glm::uvec3 dims{ 1, 1, 1 };
     float value = 0.5;
@@ -62,7 +60,7 @@ TEST_F(RawVolumeIoTest, TinyInputOutput) {
 }
 
 TEST_F(RawVolumeIoTest, BasicInputOutput) {
-    using namespace volume;
+    using namespace openspace::volume;
 
     glm::uvec3 dims{ 2, 4, 8 };
     auto value = [dims](glm::uvec3 v) {
@@ -70,7 +68,8 @@ TEST_F(RawVolumeIoTest, BasicInputOutput) {
     };
 
     RawVolume<float> vol(dims);
-    vol.forEachVoxel([&vol, &value](glm::uvec3 x, float v) {
+    vol.forEachVoxel([&vol, &value](glm::uvec3 x, float
+        ) {
         vol.set(x, value(x));
     });