diff --git a/FlippR-Driver/networking/CMakeLists.txt b/FlippR-Driver/networking/CMakeLists.txt
index 6b02abb..0d0baa2 100644
--- a/FlippR-Driver/networking/CMakeLists.txt
+++ b/FlippR-Driver/networking/CMakeLists.txt
@@ -6,11 +6,13 @@ set(SOURCES
         input/SocketHandler.cpp
         output/OutputRequestHandler.cpp
         output/OutputRequestHandlerFactory.cpp
+        output/OutputHTTPServer.cpp
         )
 
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/src)
 target_link_libraries(${PROJECT_NAME} PRIVATE FlippR-Driver)
 
 ####################### POCO ##############################
diff --git a/FlippR-Driver/networking/input/SocketHandler.cpp b/FlippR-Driver/networking/input/SocketHandler.cpp
index 57594be..0c04147 100644
--- a/FlippR-Driver/networking/input/SocketHandler.cpp
+++ b/FlippR-Driver/networking/input/SocketHandler.cpp
@@ -11,7 +11,7 @@
 using Poco::Net::StreamSocket;
 using Poco::Net::TCPServerConnection;
 using flippR_driver::input::InputDriver;
-using flippR_driver::input::detail::EventHandler;
+using flippR_driver::input::EventHandler;
 using flippR_driver::input::Event;
 
 namespace flippR_driver
@@ -53,7 +53,8 @@ void SocketHandler::handle(Event &event)
   this->queue->push(event);
 }
 
+
+}
 }
 }
 }
-}
\ No newline at end of file
diff --git a/FlippR-Driver/networking/input/SocketHandler.h b/FlippR-Driver/networking/input/SocketHandler.h
index 00a3147..1ad7085 100644
--- a/FlippR-Driver/networking/input/SocketHandler.h
+++ b/FlippR-Driver/networking/input/SocketHandler.h
@@ -14,6 +14,7 @@
 #include "input/InputDriver.h"
 #include "input/EventHandler.h"
 #include "input/Event.h"
+#include "utility/IBlockingQueue.h"
 
 namespace flippR_driver
 {
@@ -23,7 +24,7 @@ namespace networking
 {
 namespace input
 {
-class SocketHandler : public Poco::Net::TCPServerConnection, flippR_driver::input::detail::EventHandler
+class SocketHandler : public Poco::Net::TCPServerConnection, flippR_driver::input::EventHandler
 {
 public:
   SocketHandler(Poco::Net::StreamSocket streamSocket, std::shared_ptr<flippR_driver::input::InputDriver> input_driver);