diff --git a/src/dispatcher.cc b/src/dispatcher.cc
index d48bb43..24340c6 100644
--- a/src/dispatcher.cc
+++ b/src/dispatcher.cc
@@ -37,13 +37,19 @@
            , m_objectManager(ccnx, rootDir)
            , m_localUserName(localUserName)
            , m_sharedFolder(sharedFolder)
+           , m_server(NULL)
 {
   m_syncLog = make_shared<SyncLog>(path, localUserName);
   m_actionLog = make_shared<ActionLog>(m_ccnx, path, m_syncLog, localUserName, sharedFolder);
-
   Name syncPrefix(BROADCAST_DOMAIN + sharedFolder);
+
+  m_server = new ContentServer(m_ccnx, m_actionLog, rootDir);
+  m_server->registerPrefix(localPrefix);
+  m_server->registerPrefix(syncPrefix);
+
   m_core = new SyncCore (m_syncLog, localUserName, localPrefix, syncPrefix,
                          bind(&Dispatcher::syncStateChanged, this, _1), ccnx, scheduler);
+
 }
 
 Dispatcher::~Dispatcher()
@@ -53,6 +59,12 @@
     delete m_core;
     m_core = NULL;
   }
+
+  if (m_server != NULL)
+  {
+    delete m_server;
+    m_server = NULL;
+  }
 }
 
 void
diff --git a/src/dispatcher.h b/src/dispatcher.h
index 7c3220e..3ebf67e 100644
--- a/src/dispatcher.h
+++ b/src/dispatcher.h
@@ -28,6 +28,7 @@
 #include "executor.h"
 #include "object-db.h"
 #include "object-manager.h"
+#include "content-server.h"
 #include <boost/function.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/shared_ptr.hpp>
@@ -106,6 +107,7 @@
   // for every fetched segment of a file
   map<Ccnx::Name, ObjectDbPtr> m_objectDbMap;
   std::string m_sharedFolder;
+  ContentServer *m_server;
 };
 
 namespace Error