diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index e79085244f..d13b708837 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Agent.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QEventLoop>
 #include <QtCore/QStandardPaths>
@@ -46,7 +48,6 @@
 #include "RecordingScriptingInterface.h"
 #include "AbstractAudioInterface.h"
 
-#include "Agent.h"
 #include "AvatarAudioTimer.h"
 
 static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES = 10;
diff --git a/assignment-client/src/AssignmentFactory.cpp b/assignment-client/src/AssignmentFactory.cpp
index 75d474f566..38eb72649f 100644
--- a/assignment-client/src/AssignmentFactory.cpp
+++ b/assignment-client/src/AssignmentFactory.cpp
@@ -12,12 +12,13 @@
 #include <udt/PacketHeaders.h>
 
 #include "Agent.h"
+#include "assets/AssetServer.h"
 #include "AssignmentFactory.h"
 #include "audio/AudioMixer.h"
 #include "avatars/AvatarMixer.h"
 #include "entities/EntityServer.h"
-#include "assets/AssetServer.h"
 #include "messages/MessagesMixer.h"
+#include "scripts/EntityScriptServer.h"
 
 ThreadedAssignment* AssignmentFactory::unpackAssignment(ReceivedMessage& message) {
 
@@ -39,7 +40,9 @@ ThreadedAssignment* AssignmentFactory::unpackAssignment(ReceivedMessage& message
             return new AssetServer(message);
         case Assignment::MessagesMixerType:
             return new MessagesMixer(message);
+        case Assignment::EntityScriptServerType:
+            return new EntityScriptServer(message);
         default:
-            return NULL;
+            return nullptr;
     }
 }
diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
new file mode 100644
index 0000000000..66d1aa579d
--- /dev/null
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -0,0 +1,17 @@
+//
+//  EntityScriptServer.cpp
+//  assignment-client/src/scripts
+//
+//  Created by Clément Brisset on 1/5/17.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "EntityScriptServer.h"
+
+EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssignment(message) {
+
+
+}
diff --git a/assignment-client/src/scripts/EntityScriptServer.h b/assignment-client/src/scripts/EntityScriptServer.h
new file mode 100644
index 0000000000..842f3802cf
--- /dev/null
+++ b/assignment-client/src/scripts/EntityScriptServer.h
@@ -0,0 +1,43 @@
+//
+//  EntityScriptServer.h
+//  assignment-client/src/scripts
+//
+//  Created by Clément Brisset on 1/5/17.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_EntityScriptServer_h
+#define hifi_EntityScriptServer_h
+
+#include <QtCore/QObject>
+
+#include <ThreadedAssignment.h>
+
+
+class EntityScriptServer : public ThreadedAssignment {
+    Q_OBJECT
+
+public:
+    EntityScriptServer(ReceivedMessage& message);
+
+public slots:
+    void run() override;
+    void nodeActivated(SharedNodePointer activatedNode);
+    void nodeKilled(SharedNodePointer killedNode);
+    void sendStatsPacket() override;
+
+private slots:
+    void handleAudioPacket(QSharedPointer<ReceivedMessage> message);
+    void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
+    void handleJurisdictionPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
+    void handleSelectedAudioFormat(QSharedPointer<ReceivedMessage> message);
+    
+private:
+
+
+};
+
+#endif // hifi_EntityScriptServer_h
diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index 97f3e1a697..99bfd52cb6 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -46,10 +46,9 @@ QUuid DomainGatekeeper::assignmentUUIDForPendingAssignment(const QUuid& tempUUID
     }
 }
 
-const NodeSet STATICALLY_ASSIGNED_NODES = NodeSet() << NodeType::AudioMixer
-    << NodeType::AvatarMixer << NodeType::EntityServer
-    << NodeType::AssetServer
-    << NodeType::MessagesMixer;
+const NodeSet STATICALLY_ASSIGNED_NODES = NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
+        << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer
+        << NodeType::EntityScriptServer;
 
 void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessage> message) {
     if (message->getSize() == 0) {
@@ -72,7 +71,7 @@ void DomainGatekeeper::processConnectRequestPacket(QSharedPointer<ReceivedMessag
     }
 
     static const NodeSet VALID_NODE_TYPES {
-        NodeType::AudioMixer, NodeType::AvatarMixer, NodeType::AssetServer, NodeType::EntityServer, NodeType::Agent, NodeType::MessagesMixer
+        NodeType::AudioMixer, NodeType::AvatarMixer, NodeType::AssetServer, NodeType::EntityServer, NodeType::Agent, NodeType::MessagesMixer, NodeType::EntityScriptServer
     };
 
     if (!VALID_NODE_TYPES.contains(nodeConnection.nodeType)) {
diff --git a/libraries/networking/src/Assignment.cpp b/libraries/networking/src/Assignment.cpp
index 028cdb95db..9efad15398 100644
--- a/libraries/networking/src/Assignment.cpp
+++ b/libraries/networking/src/Assignment.cpp
@@ -35,6 +35,8 @@ Assignment::Type Assignment::typeForNodeType(NodeType_t nodeType) {
             return Assignment::AssetServerType;
         case NodeType::MessagesMixer:
             return Assignment::MessagesMixerType;
+        case NodeType::EntityScriptServer:
+            return Assignment::EntityScriptServerType;
         default:
             return Assignment::AllTypes;
     }
@@ -139,6 +141,8 @@ const char* Assignment::getTypeName() const {
             return "entity-server";
         case Assignment::MessagesMixerType:
             return "messages-mixer";
+        case Assignment::EntityScriptServerType:
+            return "entity-script-server";
         default:
             return "unknown";
     }
diff --git a/libraries/networking/src/Assignment.h b/libraries/networking/src/Assignment.h
index 906a89774c..bbec40682f 100644
--- a/libraries/networking/src/Assignment.h
+++ b/libraries/networking/src/Assignment.h
@@ -33,7 +33,7 @@ public:
         AgentType = 2,
         AssetServerType = 3,
         MessagesMixerType = 4,
-        UNUSED_1 = 5,
+        EntityScriptServerType = 5,
         EntityServerType = 6,
         AllTypes = 7
     };
diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp
index 8063075e22..033f4bbaa8 100644
--- a/libraries/networking/src/Node.cpp
+++ b/libraries/networking/src/Node.cpp
@@ -41,6 +41,7 @@ void NodeType::init() {
     TypeNameHash.insert(NodeType::AvatarMixer, "Avatar Mixer");
     TypeNameHash.insert(NodeType::MessagesMixer, "Messages Mixer");
     TypeNameHash.insert(NodeType::AssetServer, "Asset Server");
+    TypeNameHash.insert(NodeType::EntityScriptServer, "Entity Script Server");
     TypeNameHash.insert(NodeType::Unassigned, "Unassigned");
 }
 
diff --git a/libraries/networking/src/NodeType.h b/libraries/networking/src/NodeType.h
index d4377f4610..5ae7a835b6 100644
--- a/libraries/networking/src/NodeType.h
+++ b/libraries/networking/src/NodeType.h
@@ -24,6 +24,7 @@ namespace NodeType {
     const NodeType_t AvatarMixer = 'W';
     const NodeType_t AssetServer = 'A';
     const NodeType_t MessagesMixer = 'm';
+    const NodeType_t EntityScriptServer = 'S';
     const NodeType_t Unassigned = 1;
 
     void init();