diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7de69ef602..137f3ffa83 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -52,6 +52,8 @@
 
 #include <AccountManager.h>
 #include <AddressManager.h>
+#include <AssetClient.h>
+#include <AssetScriptingInterface.h>
 #include <CursorManager.h>
 #include <AudioInjector.h>
 #include <AutoUpdater.h>
@@ -287,6 +289,8 @@ bool setupEssentials(int& argc, char** argv) {
     auto autoUpdater = DependencyManager::set<AutoUpdater>();
     auto pathUtils = DependencyManager::set<PathUtils>();
     auto actionFactory = DependencyManager::set<InterfaceActionFactory>();
+    auto assetClient = DependencyManager::set<AssetClient>();
+    auto assetScriptingInterface = DependencyManager::set<AssetScriptingInterface>();
 
     return true;
 }
@@ -494,7 +498,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     // tell the NodeList instance who to tell the domain server we care about
     nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
-                                                 << NodeType::EntityServer);
+                                                 << NodeType::EntityServer << NodeType::AssetServer);
 
     // connect to the packet sent signal of the _entityEditSender
     connect(&_entityEditSender, &EntityEditPacketSender::packetSent, this, &Application::packetSent);
@@ -1738,6 +1742,7 @@ void Application::sendPingPackets() {
             case NodeType::AvatarMixer:
             case NodeType::AudioMixer:
             case NodeType::EntityServer:
+            case NodeType::AssetServer:
                 return true;
             default:
                 return false;
@@ -3750,6 +3755,8 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
     qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue,
                             RayToOverlayIntersectionResultFromScriptValue);
 
+    scriptEngine->registerGlobalObject("Assets", DependencyManager::get<AssetScriptingInterface>().data());
+
     QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
     scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,
                                        LocationScriptingInterface::locationSetter, windowValue);
diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp
index 293d86475f..795b775d25 100644
--- a/libraries/networking/src/Assignment.cpp
+++ b/libraries/networking/src/Assignment.cpp
@@ -27,6 +27,8 @@ Assignment::Type Assignment::typeForNodeType(NodeType_t nodeType) {
             return Assignment::AgentType;
         case NodeType::EntityServer:
             return Assignment::EntityServerType;
+        case NodeType::AssetServer:
+            return Assignment::AssetServerType;
         default:
             return Assignment::AllTypes;
     }
diff --git a/libraries/networking/src/Assignment.h b/libraries/networking/src/Assignment.h
index 67f861f850..db20c6d06a 100644
--- a/libraries/networking/src/Assignment.h
+++ b/libraries/networking/src/Assignment.h
@@ -33,7 +33,8 @@ public:
         UNUSED_1 = 4,
         UNUSED_2 = 5,
         EntityServerType = 6,
-        AllTypes = 7
+        AssetServerType = 7,
+        AllTypes = 8
     };
 
     enum Command {
diff --git a/libraries/networking/src/NodeType.h b/libraries/networking/src/NodeType.h
index 4427b87158..ab3d4a1dbe 100644
--- a/libraries/networking/src/NodeType.h
+++ b/libraries/networking/src/NodeType.h
@@ -23,6 +23,7 @@ namespace NodeType {
     const NodeType_t Agent = 'I';
     const NodeType_t AudioMixer = 'M';
     const NodeType_t AvatarMixer = 'W';
+    const NodeType_t AssetServer = 'A';
     const NodeType_t Unassigned = 1;
 
     void init();
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 3f3f165e87..b133319a57 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -73,7 +73,11 @@ namespace PacketType {
         EntityQuery,
         EntityAdd,
         EntityErase,
-        EntityEdit
+        EntityEdit,
+        AssetGet,
+        AssetGetReply,
+        AssetUpload,
+        AssetUploadReply,
    };
 };