diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..79ee123 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </state>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7f5a2ab..a861941 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,12 +12,24 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/main.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplayController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplayController.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/progress.marks" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cmake-build-debug/flippr_code.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/flippr_code.cbp" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,11 +41,63 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="19" column="23" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
+            <state relative-caret-position="195">
+              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="16" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="177">
+              <caret line="19" selection-start-line="19" selection-end-line="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="29" column="46" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+              <folding>
+                <element signature="e#130#161#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" selection-start-line="9" selection-end-line="12" selection-end-column="1" />
+              <folding>
+                <element signature="e#42#80#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -101,6 +165,10 @@
         <option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplayController.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" />
       </list>
     </option>
   </component>
@@ -157,45 +225,6 @@
               <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="input" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="input" type="462c0819:PsiDirectoryNode" />
-              <item name="detail" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="output" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="output" type="462c0819:PsiDirectoryNode" />
-              <item name="items" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
-              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="output" type="462c0819:PsiDirectoryNode" />
-              <item name="items" type="462c0819:PsiDirectoryNode" />
-              <item name="detail" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
               <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -211,6 +240,24 @@
               <item name="utility" type="462c0819:PsiDirectoryNode" />
               <item name="networking" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="utility" type="462c0819:PsiDirectoryNode" />
+              <item name="networking" type="462c0819:PsiDirectoryNode" />
+              <item name="input" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="utility" type="462c0819:PsiDirectoryNode" />
+              <item name="networking" type="462c0819:PsiDirectoryNode" />
+              <item name="output" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
               <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -240,16 +287,17 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C/C++" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection" />
       <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/FlippR-Driver/src/utility" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -306,11 +354,12 @@
       <workItem from="1556129966500" duration="735000" />
       <workItem from="1556134046744" duration="615000" />
       <workItem from="1556134690177" duration="5123000" />
+      <workItem from="1556187501636" duration="1792000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="46288000" />
+    <option name="totallyTimeSpent" value="48080000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -322,14 +371,14 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="0" width="1928" height="1062" extended-state="6" />
+    <frame x="0" y="0" width="1366" height="750" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20010673" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26287878" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.329582" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -373,29 +422,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="74">
-          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#43#79#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/SoundBoardPinController.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -406,9 +432,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/BlockingQueue.hpp">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -495,13 +518,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="25" lean-forward="true" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/include/Poco/Net/Socket.h">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -519,16 +535,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="48" selection-start-line="17" selection-start-column="48" selection-end-line="17" selection-end-column="48" />
-          <folding>
-            <element signature="e#130#161#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
@@ -570,13 +576,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5">
-          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/DriverFactory.cpp">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -745,5 +744,52 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" selection-start-line="9" selection-end-line="12" selection-end-column="1" />
+          <folding>
+            <element signature="e#42#80#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="16" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="29" column="46" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="46" />
+          <folding>
+            <element signature="e#130#161#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d00218b..932cdfd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,8 +172,8 @@ add_executable(flippr_code
         FlippR-Driver/src/utility/BlockingQueue.hpp
         FlippR-Driver/src/utility/config.h
         FlippR-Driver/src/utility/IBlockingQueue.h
-        FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
-        FlippR-Driver/src/utility/networking/input/InputSocketHandler.h
+        FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
+        FlippR-Driver/src/utility/networking/input/SocketHandler.h
         FlippR-Driver/src/utility/LoggerFactory.cpp
         FlippR-Driver/src/utility/LoggerFactory.h
         FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp
@@ -197,4 +197,4 @@ add_executable(flippr_code
         FlippR-Driver/tests/catch.hpp
         FlippR-Driver/tests/fakeit.hpp
         FlippR-Driver/tests/main.cpp
-        FlippR-Driver/CMakeLists.txt FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h)
+        FlippR-Driver/CMakeLists.txt FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h FlippR-Driver/src/utility/networking/input/TcpServer.cpp FlippR-Driver/src/utility/networking/input/TcpServer.h)
diff --git a/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp b/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp
similarity index 53%
rename from FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp
rename to FlippR-Driver/src/utility/networking/input/SocketConnection.cpp
index 242b3a2..e8cd851 100644
--- a/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp
+++ b/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp
@@ -2,4 +2,4 @@
 // Created by rhetenor on 3/6/19.
 //
 
-#include "InputSocketConnection.h"
+#include "SocketConnection.h"
diff --git a/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h b/FlippR-Driver/src/utility/networking/input/SocketConnection.h
similarity index 58%
rename from FlippR-Driver/src/utility/networking/input/InputSocketConnection.h
rename to FlippR-Driver/src/utility/networking/input/SocketConnection.h
index d9119f9..f9fa4a3 100644
--- a/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h
+++ b/FlippR-Driver/src/utility/networking/input/SocketConnection.h
@@ -7,12 +7,23 @@
 
 
 #include <Poco/Net/TCPServerConnection.h>
-
-class InputSocketConnection : public Poco::Net::TCPServerConnection
+namespace flippR_driver
+{
+namespace utility
+{
+namespace networking
+{
+namespace input
+{
+class SocketConnection : public Poco::Net::TCPServerConnection
 {
 
 
 };
 
+}
+}
+}
+}
 
 #endif //FLIPPR_CODE_INPUTSOCKETCONNECTION_H
diff --git a/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp b/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
similarity index 73%
rename from FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
rename to FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
index a07d9c4..5b5c602 100644
--- a/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
+++ b/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
@@ -2,7 +2,7 @@
 // Created by rhetenor on 27.11.18.
 //
 
-#include "InputSocketHandler.h"
+#include "SocketHandler.h"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
@@ -12,16 +12,20 @@ namespace flippR_driver
 {
 namespace utility
 {
+namespace networking
+{
+namespace input
+{
 using namespace nlohmann;
 
-InputSocketHandler::InputSocketHandler()
+InputSocketHandler::InputSocketHandler ()
 {}
 
-void InputSocketHandler::handle(flippR_driver::input::Event &event)
+void InputSocketHandler::handle (flippR_driver::input::Event &event)
 {
-  json event_serialization = serialize_event(event);
+  json event_serialization = serialize_event (event);
 
-//  write_to_socket(event_serialization);
+  //  write_to_socket(event_serialization);
 }
 
 //json InputSocketHandler::serialize_event(input::Event &event)
@@ -39,6 +43,7 @@ void InputSocketHandler::handle(flippR_driver::input::Event &event)
 //  return serialized_event;
 //}
 
-
+}
+}
 }
 }
diff --git a/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h b/FlippR-Driver/src/utility/networking/input/SocketHandler.h
similarity index 55%
rename from FlippR-Driver/src/utility/networking/input/InputSocketHandler.h
rename to FlippR-Driver/src/utility/networking/input/SocketHandler.h
index 80098ca..d90893d 100644
--- a/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h
+++ b/FlippR-Driver/src/utility/networking/input/SocketHandler.h
@@ -15,17 +15,24 @@ namespace flippR_driver
 {
 namespace utility
 {
-class InputSocketHandler : public input::EventHandler
+namespace networking
+{
+namespace input
+{
+class InputSocketHandler : public flippR_driver::input::EventHandler
 {
 public:
-  InputSocketHandler();
+  InputSocketHandler ();
 
-  void handle(input::Event &event) override;
+  void handle (flippR_driver::input::Event &event) override;
 
 private:
-  std::string serialize_event(input::Event &event);
+  std::string serialize_event (flippR_driver::input::Event &event);
 
 };
+
+}
+}
 }
 }
 
diff --git a/FlippR-Driver/src/utility/networking/input/TcpServer.cpp b/FlippR-Driver/src/utility/networking/input/TcpServer.cpp
new file mode 100644
index 0000000..e3ffc39
--- /dev/null
+++ b/FlippR-Driver/src/utility/networking/input/TcpServer.cpp
@@ -0,0 +1,5 @@
+//
+// Created by johannes on 25.04.19.
+//
+
+#include "TcpServer.h"
diff --git a/FlippR-Driver/src/utility/networking/input/TcpServer.h b/FlippR-Driver/src/utility/networking/input/TcpServer.h
new file mode 100644
index 0000000..df34ee3
--- /dev/null
+++ b/FlippR-Driver/src/utility/networking/input/TcpServer.h
@@ -0,0 +1,28 @@
+//
+// Created by johannes on 25.04.19.
+//
+
+#ifndef FLIPPR_CODE_TCPSERVER_H
+#define FLIPPR_CODE_TCPSERVER_H
+
+namespace flippR_driver
+{
+namespace utility
+{
+namespace networking
+{
+namespace input
+{
+
+class TcpServer
+{
+
+};
+
+
+}
+}
+}
+}
+
+#endif //FLIPPR_CODE_TCPSERVER_H
diff --git a/cmake-build-debug/CMakeFiles/Makefile2 b/cmake-build-debug/CMakeFiles/Makefile2
index 292861d..4b8a2d8 100644
--- a/cmake-build-debug/CMakeFiles/Makefile2
+++ b/cmake-build-debug/CMakeFiles/Makefile2
@@ -71,7 +71,7 @@ CMAKE_BINARY_DIR = /home/johannes/git/flippr-code/cmake-build-debug
 CMakeFiles/flippr_code.dir/all:
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/depend
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79 "Built target flippr_code"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80 "Built target flippr_code"
 .PHONY : CMakeFiles/flippr_code.dir/all
 
 # Include target in all.
@@ -81,7 +81,7 @@ all: CMakeFiles/flippr_code.dir/all
 
 # Build rule for subdir invocation for target.
 CMakeFiles/flippr_code.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles 79
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles 80
 	$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/flippr_code.dir/all
 	$(CMAKE_COMMAND) -E cmake_progress_start /home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles 0
 .PHONY : CMakeFiles/flippr_code.dir/rule
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake b/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
index ad2103b..eb90881 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
@@ -90,6 +90,7 @@ set(CMAKE_DEPENDS_CHECK_CXX
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/LoggerFactory.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/SocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o"
   "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o"
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make b/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
index 7caf8d5..ba9f3ef 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
@@ -1071,6 +1071,19 @@ CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTT
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s"
 	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.s
 
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o: ../FlippR-Driver/src/utility/networking/input/TcpServer.cpp
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_79) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.cpp
+
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i
+
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s
+
 # Object files for target flippr_code
 flippr_code_OBJECTS = \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/cli/main.cpp.o" \
@@ -1150,7 +1163,8 @@ flippr_code_OBJECTS = \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o" \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o" \
-"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o" \
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o"
 
 # External object files for target flippr_code
 flippr_code_EXTERNAL_OBJECTS =
@@ -1233,9 +1247,10 @@ flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/build.make
 flippr_code: CMakeFiles/flippr_code.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_79) "Linking CXX executable flippr_code"
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_80) "Linking CXX executable flippr_code"
 	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/flippr_code.dir/link.txt --verbose=$(VERBOSE)
 
 # Rule to build all files generated by this target.
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake b/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
index c0937d1..6df5040 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
@@ -77,6 +77,7 @@ file(REMOVE_RECURSE
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o"
   "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o"
   "flippr_code.pdb"
   "flippr_code"
 )
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt b/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt
index 40368bf..3a329f8 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/link.txt
@@ -1 +1 @@
-/usr/bin/c++  -g   CMakeFiles/flippr_code.dir/FlippR-Driver/cli/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/cli/PrintHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/easylogging/easylogging++.cc.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ads1115.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/bmp180.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcNet.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ds18b20.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/htu21d.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max31855.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max5322.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23008.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23016.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23017.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s08.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s17.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3002.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3004.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3422.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp4802.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8574.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8591.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piHiPri.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piThread.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pseudoPins.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/rht03.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sn3218.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softPwm.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softServo.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softTone.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sr595.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPi.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiI2C.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiSPI.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringShift.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wpiExtensions.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/Detector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/DistributingEvent.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/Event.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/InputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/OutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Display.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Item.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Lamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Solenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestDetector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestInputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplay.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestLamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputItem.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o  -o flippr_code 
+/usr/bin/c++  -g   CMakeFiles/flippr_code.dir/FlippR-Driver/cli/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/cli/PrintHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/easylogging/easylogging++.cc.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ads1115.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/bmp180.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcNet.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/drcSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/ds18b20.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/htu21d.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max31855.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/max5322.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23008.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23016.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23017.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s08.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp23s17.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3002.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3004.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp3422.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/mcp4802.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8574.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pcf8591.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piHiPri.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/piThread.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/pseudoPins.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/rht03.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sn3218.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softPwm.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softServo.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/softTone.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/sr595.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPi.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiI2C.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringPiSPI.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringSerial.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wiringShift.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/lib/wiringPi/wpiExtensions.c.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/Detector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/EventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/detail/InputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/DistributingEvent.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/Event.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/input/InputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/OutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Display.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Item.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Lamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Solenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/DriverFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/PinController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestDetector.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestEventNotifier.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/input/TestInputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplay.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestDisplayController.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestLamp.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputDriver.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestOutputItem.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSolenoid.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/output/TestSound.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/tests/main.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o  -o flippr_code 
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make b/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make
index 0e79f04..f2e6a46 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make
@@ -77,4 +77,5 @@ CMAKE_PROGRESS_76 = 76
 CMAKE_PROGRESS_77 = 77
 CMAKE_PROGRESS_78 = 78
 CMAKE_PROGRESS_79 = 79
+CMAKE_PROGRESS_80 = 80
 
diff --git a/cmake-build-debug/CMakeFiles/progress.marks b/cmake-build-debug/CMakeFiles/progress.marks
index 85322d0..d15a2cc 100644
--- a/cmake-build-debug/CMakeFiles/progress.marks
+++ b/cmake-build-debug/CMakeFiles/progress.marks
@@ -1 +1 @@
-79
+80
diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile
index c13104f..ce21ec8 100644
--- a/cmake-build-debug/Makefile
+++ b/cmake-build-debug/Makefile
@@ -1797,6 +1797,33 @@ FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s:
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
 .PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
 
+FlippR-Driver/src/utility/networking/input/TcpServer.o: FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/input/TcpServer.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o
+
+FlippR-Driver/src/utility/networking/input/TcpServer.i: FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/input/TcpServer.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/input/TcpServer.cpp.i
+
+FlippR-Driver/src/utility/networking/input/TcpServer.s: FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/input/TcpServer.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/input/TcpServer.cpp.s
+
 FlippR-Driver/src/utility/networking/output/OutputHTTPServer.o: FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp.o
 
 .PHONY : FlippR-Driver/src/utility/networking/output/OutputHTTPServer.o
@@ -2424,6 +2451,9 @@ help:
 	@echo "... FlippR-Driver/src/utility/networking/input/InputSocketHandler.o"
 	@echo "... FlippR-Driver/src/utility/networking/input/InputSocketHandler.i"
 	@echo "... FlippR-Driver/src/utility/networking/input/InputSocketHandler.s"
+	@echo "... FlippR-Driver/src/utility/networking/input/TcpServer.o"
+	@echo "... FlippR-Driver/src/utility/networking/input/TcpServer.i"
+	@echo "... FlippR-Driver/src/utility/networking/input/TcpServer.s"
 	@echo "... FlippR-Driver/src/utility/networking/output/OutputHTTPServer.o"
 	@echo "... FlippR-Driver/src/utility/networking/output/OutputHTTPServer.i"
 	@echo "... FlippR-Driver/src/utility/networking/output/OutputHTTPServer.s"
diff --git a/cmake-build-debug/flippr_code.cbp b/cmake-build-debug/flippr_code.cbp
index a20004a..9f4d988 100644
--- a/cmake-build-debug/flippr_code.cbp
+++ b/cmake-build-debug/flippr_code.cbp
@@ -599,6 +599,12 @@
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h">
 			<Option target="flippr_code"/>
 		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.h">
+			<Option target="flippr_code"/>
+		</Unit>
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp">
 			<Option target="flippr_code"/>
 		</Unit>