diff --git a/gui/chronosharegui.cpp b/gui/chronosharegui.cpp
index 8f46363..13c3a51 100644
--- a/gui/chronosharegui.cpp
+++ b/gui/chronosharegui.cpp
@@ -21,10 +21,13 @@
 #include "chronosharegui.h"
 #include "logging.h"
 
+
+
 INIT_LOGGER ("Gui");
 
 ChronoShareGui::ChronoShareGui(QWidget *parent)
   : QWidget(parent)
+  , m_watcher (0)
   // , m_settingsFilePath(QDir::homePath() + "/.chronoshare")
 {
   // load settings
@@ -46,10 +49,21 @@
 
   // show tray icon
   m_trayIcon->show();
+
+  // Dispatcher(const boost::filesystem::path &path, const std::string &localUserName,  const Ccnx::Name &localPrefix,
+  //            const std::string &sharedFolder, const boost::filesystem::path &rootDir,
+  //            Ccnx::CcnxWrapperPtr ccnx, SchedulerPtr scheduler, int poolSize = 2);
+
+  m_watcher = new FsWatcher (m_dirPath);
 }
 
 ChronoShareGui::~ChronoShareGui()
 {
+  if (!m_watcher)
+    {
+      delete m_watcher;
+    }
+
   // cleanup
   delete m_trayIcon;
   delete m_trayIconMenu;
@@ -158,9 +172,8 @@
 {
   // prompt user for new directory
   QString tempPath = QFileDialog::getExistingDirectory(this, tr("Choose a new folder"),
-                                                       m_dirPath, QFileDialog::ShowDirsOnly |
-                                                       QFileDialog::DontResolveSymlinks);
-  QFileInfo qFileInfo(tempPath);
+                                                       m_dirPath, QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+  QFileInfo qFileInfo (tempPath);
 
   if(qFileInfo.isDir())
     m_dirPath = tempPath;
diff --git a/gui/chronosharegui.h b/gui/chronosharegui.h
index f0cbe76..b0d459e 100644
--- a/gui/chronosharegui.h
+++ b/gui/chronosharegui.h
@@ -33,6 +33,8 @@
 #include <QMessageBox>
 #include <QApplication>
 
+#include "fs-watcher.h"
+
 class ChronoShareGui : public QWidget
 {
   Q_OBJECT
@@ -93,6 +95,7 @@
 
   QString m_dirPath; // shared directory
 
+  FsWatcher *m_watcher;
   // QString m_settingsFilePath; // settings file path
   // QString m_settings;
 };