diff --git a/src/MediaServer/MediaServer.cpp b/src/MediaServer/MediaServer.cpp
index 9dfea0b..3c8d6f2 100644
--- a/src/MediaServer/MediaServer.cpp
+++ b/src/MediaServer/MediaServer.cpp
@@ -17,14 +17,14 @@ MediaServer::MediaServer()
 
 MediaServer::~MediaServer() {};
 
-int MediaServer::getNumImages() { return imageWatcher.filePaths.size(); }
-int MediaServer::getNumVideos() { return videoWatcher.filePaths.size(); }
+int MediaServer::getNumImages() { return imageWatcher.getFilePaths().size(); }
+int MediaServer::getNumVideos() { return videoWatcher.getFilePaths().size(); }
 
 std::vector<std::string>& MediaServer::getImagePaths() {
-  return imageWatcher.filePaths;
+  return imageWatcher.getFilePaths();
 }
 std::vector<std::string>& MediaServer::getVideoPaths() {
-  return videoWatcher.filePaths;
+  return videoWatcher.getFilePaths();
 }
 }
 }
\ No newline at end of file
diff --git a/src/MediaServer/MediaServer.h b/src/MediaServer/MediaServer.h
index 03391e9..acf8ae0 100644
--- a/src/MediaServer/MediaServer.h
+++ b/src/MediaServer/MediaServer.h
@@ -26,6 +26,9 @@ class MediaServer {
   int getNumImages();
   std::vector<string>& getVideoPaths();
   std::vector<string>& getImagePaths();
+  
+  // Custom events
+  //ofEvent<string> on
 
  private:
   // Directory Watchers