diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123..1c2b66e 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="flippr_code" />
   </state>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fc60e84..6a1119b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,11 +12,24 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.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/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp" 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$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.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/SocketConnection.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/TcpServer.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.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" />
@@ -27,35 +40,74 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <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">
+        <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="270">
-              <caret line="18" selection-start-line="18" selection-end-line="18" />
+            <state>
+              <caret selection-end-line="38" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplay.cpp">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+            <state relative-caret-position="75">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="537">
-              <caret line="15003" lean-forward="true" selection-start-line="15003" selection-end-line="15003" />
+            <state relative-caret-position="540">
+              <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="435">
+              <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
+              <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/SocketHandler.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="285">
+              <caret line="19" selection-start-line="19" selection-end-line="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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">
+            <state relative-caret-position="15">
+              <caret line="1" column="23" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file:///tmp/mozilla_johannes0/TCPServerTest.cpp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="735">
+              <caret line="49" column="33" selection-start-line="49" selection-start-column="33" selection-end-line="50" selection-end-column="30" />
             </state>
           </provider>
         </entry>
@@ -77,10 +129,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/FlippR-Driver/cli/main.cpp" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/cli/PrintHandler.h" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output_socket_solenoid.json" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/contrib/json_example/output/Sound_Config.json" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketHandler.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/CMakeLists.txt" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/OutputSocketConnection.h" />
@@ -123,18 +171,22 @@
         <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" />
         <option value="$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.h" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="15" />
-    <option name="width" value="902" />
-    <option name="height" value="496" />
+    <option name="x" value="23" />
+    <option name="width" value="882" />
+    <option name="height" value="494" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -184,6 +236,13 @@
               <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" />
@@ -313,12 +372,14 @@
       <workItem from="1556129966500" duration="735000" />
       <workItem from="1556134046744" duration="615000" />
       <workItem from="1556134690177" duration="5123000" />
-      <workItem from="1556187501636" duration="3653000" />
+      <workItem from="1556187501636" duration="4257000" />
+      <workItem from="1556211614557" duration="1716000" />
+      <workItem from="1556213821558" duration="125000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="49941000" />
+    <option name="totallyTimeSpent" value="52386000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -330,10 +391,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1366" height="750" extended-state="6" />
+    <frame x="0" y="0" width="1920" height="1058" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26287878" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26947704" />
       <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" />
@@ -381,39 +442,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/BlockingQueue.hpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#210#226#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/DisplayBoardPinController.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/OutputPinController.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#131#163#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/SoundBoardPinController.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/OutputPinController.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#222#248#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.cpp">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -686,20 +714,506 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h">
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp">
       <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" />
+        <state relative-caret-position="537">
+          <caret line="15003" selection-start-line="15003" selection-end-line="15003" />
           <folding>
-            <element signature="e#130#161#0" expanded="true" />
+            <element signature="e#673#704#0" expanded="true" />
+            <element signature="e#819#1181#0" expanded="true" />
+            <element signature="e#1999#2039#0" expanded="true" />
+            <element signature="e#2253#2407#0" expanded="true" />
+            <element signature="e#2611#2643#0" expanded="true" />
+            <element signature="e#3988#4022#0" expanded="true" />
+            <element signature="e#4077#4134#0" expanded="true" />
+            <element signature="e#4161#5102#0" expanded="true" />
+            <element signature="e#5602#5648#0" expanded="true" />
+            <element signature="e#5674#5767#0" expanded="true" />
+            <element signature="e#5939#5991#0" expanded="true" />
+            <element signature="e#6159#6207#0" expanded="true" />
+            <element signature="e#6327#6375#0" expanded="true" />
+            <element signature="e#6494#7034#0" expanded="true" />
+            <element signature="e#7169#7925#0" expanded="true" />
+            <element signature="e#8335#8375#0" expanded="true" />
+            <element signature="e#8528#8572#0" expanded="true" />
+            <element signature="e#9338#9389#0" expanded="true" />
+            <element signature="e#9625#9673#0" expanded="true" />
+            <element signature="e#9990#10613#0" expanded="true" />
+            <element signature="e#11040#11075#0" expanded="true" />
+            <element signature="e#12003#12040#0" expanded="true" />
+            <element signature="e#12217#12265#0" expanded="true" />
+            <element signature="e#12418#12458#0" expanded="true" />
+            <element signature="e#12599#12635#0" expanded="true" />
+            <element signature="e#12692#12735#0" expanded="true" />
+            <element signature="e#12920#12954#0" expanded="true" />
+            <element signature="e#13063#13104#0" expanded="true" />
+            <element signature="e#13248#13285#0" expanded="true" />
+            <element signature="e#13853#13963#0" expanded="true" />
+            <element signature="e#14260#14310#0" expanded="true" />
+            <element signature="e#14655#14749#0" expanded="true" />
+            <element signature="e#14758#14775#0" expanded="true" />
+            <element signature="e#16457#16469#0" expanded="true" />
+            <element signature="e#18000#18018#0" expanded="true" />
+            <element signature="e#21373#21615#0" expanded="true" />
+            <element signature="e#21632#21645#0" expanded="true" />
+            <element signature="e#21693#21737#0" expanded="true" />
+            <element signature="e#22677#22968#0" expanded="true" />
+            <element signature="e#25445#25803#0" expanded="true" />
+            <element signature="e#26298#26730#0" expanded="true" />
+            <element signature="e#27089#27104#0" expanded="true" />
+            <element signature="e#27134#27149#0" expanded="true" />
+            <element signature="e#27174#27273#0" expanded="true" />
+            <element signature="e#27184#27197#0" expanded="true" />
+            <element signature="e#27233#27246#0" expanded="true" />
+            <element signature="e#27357#27474#0" expanded="true" />
+            <element signature="e#27367#27380#0" expanded="true" />
+            <element signature="e#27416#27429#0" expanded="true" />
+            <element signature="e#27600#27645#0" expanded="true" />
+            <element signature="e#27610#27623#0" expanded="true" />
+            <element signature="e#27670#27765#0" expanded="true" />
+            <element signature="e#27680#27693#0" expanded="true" />
+            <element signature="e#27720#27733#0" expanded="true" />
+            <element signature="e#27869#27982#0" expanded="true" />
+            <element signature="e#27879#27892#0" expanded="true" />
+            <element signature="e#27919#27932#0" expanded="true" />
+            <element signature="e#28165#28209#0" expanded="true" />
+            <element signature="e#28175#28188#0" expanded="true" />
+            <element signature="e#28235#28255#0" expanded="true" />
+            <element signature="e#28284#28322#0" expanded="true" />
+            <element signature="e#28295#28308#0" expanded="true" />
+            <element signature="e#28448#28460#0" expanded="true" />
+            <element signature="e#28575#28587#0" expanded="true" />
+            <element signature="e#28923#28935#0" expanded="true" />
+            <element signature="e#29485#30967#0" expanded="true" />
+            <element signature="e#34503#34658#0" expanded="true" />
+            <element signature="e#35194#35525#0" expanded="true" />
+            <element signature="e#38629#38974#0" expanded="true" />
+            <element signature="e#40521#40892#0" expanded="true" />
+            <element signature="e#43206#43590#0" expanded="true" />
+            <element signature="e#45255#45272#0" expanded="true" />
+            <element signature="e#45358#45375#0" expanded="true" />
+            <element signature="e#45838#45850#0" expanded="true" />
+            <element signature="e#46061#46083#0" expanded="true" />
+            <element signature="e#46108#47131#0" expanded="true" />
+            <element signature="e#47156#47306#0" expanded="true" />
+            <element signature="e#47478#47490#0" expanded="true" />
+            <element signature="e#47606#47618#0" expanded="true" />
+            <element signature="e#47654#47680#0" expanded="true" />
+            <element signature="e#47786#47806#0" expanded="true" />
+            <element signature="e#47944#47956#0" expanded="true" />
+            <element signature="e#48013#48025#0" expanded="true" />
+            <element signature="e#48219#48231#0" expanded="true" />
+            <element signature="e#48410#48422#0" expanded="true" />
+            <element signature="e#48601#48945#0" expanded="true" />
+            <element signature="e#49042#49071#0" expanded="true" />
+            <element signature="e#49102#49121#0" expanded="true" />
+            <element signature="e#49447#49466#0" expanded="true" />
+            <element signature="e#49696#49744#0" expanded="true" />
+            <element signature="e#49941#49953#0" expanded="true" />
+            <element signature="e#50114#50126#0" expanded="true" />
+            <element signature="e#50291#50391#0" expanded="true" />
+            <element signature="e#50467#50469#0" expanded="true" />
+            <element signature="e#50598#50700#0" expanded="true" />
+            <element signature="e#50717#50719#0" expanded="true" />
+            <element signature="e#50812#50814#0" expanded="true" />
+            <element signature="e#50922#50924#0" expanded="true" />
+            <element signature="e#51057#51161#0" expanded="true" />
+            <element signature="e#51179#51181#0" expanded="true" />
+            <element signature="e#51280#51282#0" expanded="true" />
+            <element signature="e#51495#51503#0" expanded="true" />
+            <element signature="e#51649#51657#0" expanded="true" />
+            <element signature="e#51849#51857#0" expanded="true" />
+            <element signature="e#52054#52056#0" expanded="true" />
+            <element signature="e#52133#52135#0" expanded="true" />
+            <element signature="e#52214#52216#0" expanded="true" />
+            <element signature="e#52305#52307#0" expanded="true" />
+            <element signature="e#52402#52404#0" expanded="true" />
+            <element signature="e#52501#52503#0" expanded="true" />
+            <element signature="e#52611#52613#0" expanded="true" />
+            <element signature="e#52689#52691#0" expanded="true" />
+            <element signature="e#52766#52768#0" expanded="true" />
+            <element signature="e#52857#52859#0" expanded="true" />
+            <element signature="e#52953#52955#0" expanded="true" />
+            <element signature="e#53049#53051#0" expanded="true" />
+            <element signature="e#53132#53134#0" expanded="true" />
+            <element signature="e#53219#53231#0" expanded="true" />
+            <element signature="e#53266#53278#0" expanded="true" />
+            <element signature="e#53413#53437#0" expanded="true" />
+            <element signature="e#53618#53759#0" expanded="true" />
+            <element signature="e#53795#53819#0" expanded="true" />
+            <element signature="e#54135#54616#0" expanded="true" />
+            <element signature="e#54879#55123#0" expanded="true" />
+            <element signature="e#55219#55556#0" expanded="true" />
+            <element signature="e#55699#56010#0" expanded="true" />
+            <element signature="e#56152#56947#0" expanded="true" />
+            <element signature="e#57089#57582#0" expanded="true" />
+            <element signature="e#57951#57963#0" expanded="true" />
+            <element signature="e#58212#58291#0" expanded="true" />
+            <element signature="e#58308#58324#0" expanded="true" />
+            <element signature="e#58490#58510#0" expanded="true" />
+            <element signature="e#58787#58799#0" expanded="true" />
+            <element signature="e#59018#59038#0" expanded="true" />
+            <element signature="e#59271#59287#0" expanded="true" />
+            <element signature="e#59352#59365#0" expanded="true" />
+            <element signature="e#59430#59443#0" expanded="true" />
+            <element signature="e#59604#59606#0" expanded="true" />
+            <element signature="e#59681#59683#0" expanded="true" />
+            <element signature="e#59759#59761#0" expanded="true" />
+            <element signature="e#59836#59838#0" expanded="true" />
+            <element signature="e#59913#59915#0" expanded="true" />
+            <element signature="e#59991#59993#0" expanded="true" />
+            <element signature="e#60123#60155#0" expanded="true" />
+            <element signature="e#60425#60441#0" expanded="true" />
+            <element signature="e#60688#60704#0" expanded="true" />
+            <element signature="e#60953#60969#0" expanded="true" />
+            <element signature="e#61366#61401#0" expanded="true" />
+            <element signature="e#61706#61725#0" expanded="true" />
+            <element signature="e#62002#62057#0" expanded="true" />
+            <element signature="e#62271#62327#0" expanded="true" />
+            <element signature="e#62501#62521#0" expanded="true" />
+            <element signature="e#62589#62989#0" expanded="true" />
+            <element signature="e#63694#63724#0" expanded="true" />
+            <element signature="e#64186#64198#0" expanded="true" />
+            <element signature="e#64438#64450#0" expanded="true" />
+            <element signature="e#64690#64702#0" expanded="true" />
+            <element signature="e#64942#64954#0" expanded="true" />
+            <element signature="e#65194#65206#0" expanded="true" />
+            <element signature="e#65445#65457#0" expanded="true" />
+            <element signature="e#65696#65708#0" expanded="true" />
+            <element signature="e#65948#65960#0" expanded="true" />
+            <element signature="e#66203#66218#0" expanded="true" />
+            <element signature="e#66640#66670#0" expanded="true" />
+            <element signature="e#66783#66795#0" expanded="true" />
+            <element signature="e#66912#66924#0" expanded="true" />
+            <element signature="e#67042#67054#0" expanded="true" />
+            <element signature="e#67171#67183#0" expanded="true" />
+            <element signature="e#67302#67332#0" expanded="true" />
+            <element signature="e#67443#67455#0" expanded="true" />
+            <element signature="e#67575#67587#0" expanded="true" />
+            <element signature="e#67708#67720#0" expanded="true" />
+            <element signature="e#67840#67852#0" expanded="true" />
+            <element signature="e#67974#67989#0" expanded="true" />
+            <element signature="e#68082#68097#0" expanded="true" />
+            <element signature="e#68353#68368#0" expanded="true" />
+            <element signature="e#68627#68642#0" expanded="true" />
+            <element signature="e#68790#68805#0" expanded="true" />
+            <element signature="e#68953#68968#0" expanded="true" />
+            <element signature="e#69119#69134#0" expanded="true" />
+            <element signature="e#69286#69301#0" expanded="true" />
+            <element signature="e#69538#69553#0" expanded="true" />
+            <element signature="e#69937#69949#0" expanded="true" />
+            <element signature="e#70073#70085#0" expanded="true" />
+            <element signature="e#70308#70328#0" expanded="true" />
+            <element signature="e#73670#73682#0" expanded="true" />
+            <element signature="e#74382#74399#0" expanded="true" />
+            <element signature="e#74863#74875#0" expanded="true" />
+            <element signature="e#75146#75158#0" expanded="true" />
+            <element signature="e#75837#75849#0" expanded="true" />
+            <element signature="e#75972#76000#0" expanded="true" />
+            <element signature="e#76367#76455#0" expanded="true" />
+            <element signature="e#76548#76785#0" expanded="true" />
+            <element signature="e#86188#86206#0" expanded="true" />
+            <element signature="e#87072#87089#0" expanded="true" />
+            <element signature="e#88595#88729#0" expanded="true" />
+            <element signature="e#88738#88758#0" expanded="true" />
+            <element signature="e#89367#89379#0" expanded="true" />
+            <element signature="e#89930#89942#0" expanded="true" />
+            <element signature="e#91357#91452#0" expanded="true" />
+            <element signature="e#91647#91742#0" expanded="true" />
+            <element signature="e#91826#91921#0" expanded="true" />
+            <element signature="e#92077#92172#0" expanded="true" />
+            <element signature="e#92278#92373#0" expanded="true" />
+            <element signature="e#92480#92575#0" expanded="true" />
+            <element signature="e#92682#92777#0" expanded="true" />
+            <element signature="e#92913#93008#0" expanded="true" />
+            <element signature="e#93144#93239#0" expanded="true" />
+            <element signature="e#93375#93470#0" expanded="true" />
+            <element signature="e#93606#93701#0" expanded="true" />
+            <element signature="e#93856#93951#0" expanded="true" />
+            <element signature="e#94100#94195#0" expanded="true" />
+            <element signature="e#94589#94591#0" expanded="true" />
+            <element signature="e#94783#94800#0" expanded="true" />
+            <element signature="e#95714#95731#0" expanded="true" />
+            <element signature="e#95816#95831#0" expanded="true" />
+            <element signature="e#95859#95874#0" expanded="true" />
+            <element signature="e#95902#95917#0" expanded="true" />
+            <element signature="e#96310#96401#0" expanded="true" />
+            <element signature="e#96418#96436#0" expanded="true" />
+            <element signature="e#96533#96565#0" expanded="true" />
+            <element signature="e#96582#96594#0" expanded="true" />
+            <element signature="e#96827#96842#0" expanded="true" />
+            <element signature="e#97526#97541#0" expanded="true" />
+            <element signature="e#98225#98240#0" expanded="true" />
+            <element signature="e#98626#98638#0" expanded="true" />
+            <element signature="e#98770#98782#0" expanded="true" />
+            <element signature="e#98914#98926#0" expanded="true" />
+            <element signature="e#99203#99225#0" expanded="true" />
+            <element signature="e#100308#100329#0" expanded="true" />
+            <element signature="e#100498#100510#0" expanded="true" />
+            <element signature="e#101210#101222#0" expanded="true" />
+            <element signature="e#103960#103972#0" expanded="true" />
+            <element signature="e#104396#104408#0" expanded="true" />
+            <element signature="e#105038#105050#0" expanded="true" />
+            <element signature="e#105795#105807#0" expanded="true" />
+            <element signature="e#106274#106357#0" expanded="true" />
+            <element signature="e#106459#106542#0" expanded="true" />
+            <element signature="e#106640#106723#0" expanded="true" />
+            <element signature="e#106929#106941#0" expanded="true" />
+            <element signature="e#107689#107701#0" expanded="true" />
+            <element signature="e#107836#107848#0" expanded="true" />
+            <element signature="e#107990#108002#0" expanded="true" />
+            <element signature="e#108131#108143#0" expanded="true" />
+            <element signature="e#108272#108284#0" expanded="true" />
+            <element signature="e#108524#108558#0" expanded="true" />
+            <element signature="e#109366#109400#0" expanded="true" />
+            <element signature="e#112358#112371#0" expanded="true" />
+            <element signature="e#112498#112557#0" expanded="true" />
+            <element signature="e#113216#113233#0" expanded="true" />
+            <element signature="e#113615#113645#0" expanded="true" />
+            <element signature="e#113773#113785#0" expanded="true" />
+            <element signature="e#114084#114096#0" expanded="true" />
+            <element signature="e#114398#114410#0" expanded="true" />
+            <element signature="e#114738#114750#0" expanded="true" />
+            <element signature="e#115040#115052#0" expanded="true" />
+            <element signature="e#115197#115209#0" expanded="true" />
+            <element signature="e#115361#115373#0" expanded="true" />
+            <element signature="e#115671#115683#0" expanded="true" />
+            <element signature="e#115748#115776#0" expanded="true" />
+            <element signature="e#115949#115965#0" expanded="true" />
+            <element signature="e#116392#116408#0" expanded="true" />
+            <element signature="e#116679#116691#0" expanded="true" />
+            <element signature="e#116715#116743#0" expanded="true" />
+            <element signature="e#116931#116943#0" expanded="true" />
+            <element signature="e#117072#117100#0" expanded="true" />
+            <element signature="e#117280#117320#0" expanded="true" />
+            <element signature="e#117600#117612#0" expanded="true" />
+            <element signature="e#118981#118993#0" expanded="true" />
+            <element signature="e#119646#119658#0" expanded="true" />
+            <element signature="e#119839#119871#0" expanded="true" />
+            <element signature="e#119992#120016#0" expanded="true" />
+            <element signature="e#120714#120746#0" expanded="true" />
+            <element signature="e#121000#121012#0" expanded="true" />
+            <element signature="e#122312#122324#0" expanded="true" />
+            <element signature="e#122511#122550#0" expanded="true" />
+            <element signature="e#122821#122841#0" expanded="true" />
+            <element signature="e#123289#123609#0" expanded="true" />
+            <element signature="e#123625#123652#0" expanded="true" />
+            <element signature="e#123809#123881#0" expanded="true" />
+            <element signature="e#124095#124134#0" expanded="true" />
+            <element signature="e#124348#124360#0" expanded="true" />
+            <element signature="e#125196#125208#0" expanded="true" />
+            <element signature="e#126633#126650#0" expanded="true" />
+            <element signature="e#128362#128378#0" expanded="true" />
+            <element signature="e#128871#128889#0" expanded="true" />
+            <element signature="e#129501#129513#0" expanded="true" />
+            <element signature="e#129737#129749#0" expanded="true" />
+            <element signature="e#129947#129959#0" expanded="true" />
+            <element signature="e#130728#130740#0" expanded="true" />
+            <element signature="e#131011#131023#0" expanded="true" />
+            <element signature="e#131504#131521#0" expanded="true" />
+            <element signature="e#131576#131649#0" expanded="true" />
+            <element signature="e#133007#133035#0" expanded="true" />
+            <element signature="e#133257#138729#0" expanded="true" />
+            <element signature="e#138968#139041#0" expanded="true" />
+            <element signature="e#139095#139168#0" expanded="true" />
+            <element signature="e#139788#139805#0" expanded="true" />
+            <element signature="e#140972#141000#0" expanded="true" />
+            <element signature="e#142125#142137#0" expanded="true" />
+            <element signature="e#142830#142858#0" expanded="true" />
+            <element signature="e#142960#142977#0" expanded="true" />
+            <element signature="e#146824#146836#0" expanded="true" />
+            <element signature="e#148090#148107#0" expanded="true" />
+            <element signature="e#148590#148602#0" expanded="true" />
+            <element signature="e#153980#154000#0" expanded="true" />
+            <element signature="e#154391#154410#0" expanded="true" />
+            <element signature="e#156326#156345#0" expanded="true" />
+            <element signature="e#156407#156440#0" expanded="true" />
+            <element signature="e#161507#161515#0" expanded="true" />
+            <element signature="e#163152#163164#0" expanded="true" />
+            <element signature="e#163616#163628#0" expanded="true" />
+            <element signature="e#164611#164708#0" expanded="true" />
+            <element signature="e#165566#165752#0" expanded="true" />
+            <element signature="e#167526#167546#0" expanded="true" />
+            <element signature="e#168311#168323#0" expanded="true" />
+            <element signature="e#168971#168983#0" expanded="true" />
+            <element signature="e#172196#172275#0" expanded="true" />
+            <element signature="e#172362#172379#0" expanded="true" />
+            <element signature="e#175870#175886#0" expanded="true" />
+            <element signature="e#177985#178043#0" expanded="true" />
+            <element signature="e#178446#178502#0" expanded="true" />
+            <element signature="e#178534#178692#0" expanded="true" />
+            <element signature="e#178819#178861#0" expanded="true" />
+            <element signature="e#179030#179517#0" expanded="true" />
+            <element signature="e#179634#179956#0" expanded="true" />
+            <element signature="e#180335#180402#0" expanded="true" />
+            <element signature="e#186171#186225#0" expanded="true" />
+            <element signature="e#191407#191543#0" expanded="true" />
+            <element signature="e#191648#191830#0" expanded="true" />
+            <element signature="e#192299#192381#0" expanded="true" />
+            <element signature="e#192502#192570#0" expanded="true" />
+            <element signature="e#192982#193000#0" expanded="true" />
+            <element signature="e#193108#193160#0" expanded="true" />
+            <element signature="e#200233#200250#0" expanded="true" />
+            <element signature="e#200445#200475#0" expanded="true" />
+            <element signature="e#200634#200646#0" expanded="true" />
+            <element signature="e#200733#200786#0" expanded="true" />
+            <element signature="e#200900#200950#0" expanded="true" />
+            <element signature="e#202024#202035#0" expanded="true" />
+            <element signature="e#204053#204065#0" expanded="true" />
+            <element signature="e#204812#204814#0" expanded="true" />
+            <element signature="e#204918#204937#0" expanded="true" />
+            <element signature="e#205002#205014#0" expanded="true" />
+            <element signature="e#205195#205207#0" expanded="true" />
+            <element signature="e#207034#207046#0" expanded="true" />
+            <element signature="e#208163#208400#0" expanded="true" />
+            <element signature="e#209127#209139#0" expanded="true" />
+            <element signature="e#209361#209373#0" expanded="true" />
+            <element signature="e#209999#210020#0" expanded="true" />
+            <element signature="e#210167#210197#0" expanded="true" />
+            <element signature="e#210310#210312#0" expanded="true" />
+            <element signature="e#210350#210380#0" expanded="true" />
+            <element signature="e#210539#210569#0" expanded="true" />
+            <element signature="e#210831#210843#0" expanded="true" />
+            <element signature="e#211220#211232#0" expanded="true" />
+            <element signature="e#212203#212222#0" expanded="true" />
+            <element signature="e#212288#212300#0" expanded="true" />
+            <element signature="e#212360#212372#0" expanded="true" />
+            <element signature="e#212478#212497#0" expanded="true" />
+            <element signature="e#212801#212813#0" expanded="true" />
+            <element signature="e#212946#212964#0" expanded="true" />
+            <element signature="e#213858#213876#0" expanded="true" />
+            <element signature="e#214225#214243#0" expanded="true" />
+            <element signature="e#215928#215990#0" expanded="true" />
+            <element signature="e#216122#216140#0" expanded="true" />
+            <element signature="e#216344#216362#0" expanded="true" />
+            <element signature="e#216455#216467#0" expanded="true" />
+            <element signature="e#218991#219100#0" expanded="true" />
+            <element signature="e#220118#220130#0" expanded="true" />
+            <element signature="e#220282#220294#0" expanded="true" />
+            <element signature="e#220381#220393#0" expanded="true" />
+            <element signature="e#223498#223517#0" expanded="true" />
+            <element signature="e#223526#223538#0" expanded="true" />
+            <element signature="e#224261#224289#0" expanded="true" />
+            <element signature="e#224398#224530#0" expanded="true" />
+            <element signature="e#224692#224710#0" expanded="true" />
+            <element signature="e#231192#231210#0" expanded="true" />
+            <element signature="e#231936#231979#0" expanded="true" />
+            <element signature="e#235039#235135#0" expanded="true" />
+            <element signature="e#235823#235865#0" expanded="true" />
+            <element signature="e#236020#238503#0" expanded="true" />
+            <element signature="e#240033#240055#0" expanded="true" />
+            <element signature="e#240145#240150#0" expanded="true" />
+            <element signature="e#240684#240810#0" expanded="true" />
+            <element signature="e#241420#241452#0" expanded="true" />
+            <element signature="e#242859#242972#0" expanded="true" />
+            <element signature="e#243241#244864#0" expanded="true" />
+            <element signature="e#244902#244920#0" expanded="true" />
+            <element signature="e#245997#246389#0" expanded="true" />
+            <element signature="e#247041#247248#0" expanded="true" />
+            <element signature="e#247596#247613#0" expanded="true" />
+            <element signature="e#248099#248132#0" expanded="true" />
+            <element signature="e#248555#248735#0" expanded="true" />
+            <element signature="e#249860#250213#0" expanded="true" />
+            <element signature="e#250771#252678#0" expanded="true" />
+            <element signature="e#254728#254786#0" expanded="true" />
+            <element signature="e#254986#255006#0" expanded="true" />
+            <element signature="e#255189#255206#0" expanded="true" />
+            <element signature="e#261391#261801#0" expanded="true" />
+            <element signature="e#262568#262585#0" expanded="true" />
+            <element signature="e#267758#267770#0" expanded="true" />
+            <element signature="e#267881#267934#0" expanded="true" />
+            <element signature="e#267997#268015#0" expanded="true" />
+            <element signature="e#268202#268214#0" expanded="true" />
+            <element signature="e#268243#268245#0" expanded="true" />
+            <element signature="e#268445#268447#0" expanded="true" />
+            <element signature="e#268650#268662#0" expanded="true" />
+            <element signature="e#268735#268748#0" expanded="true" />
+            <element signature="e#270174#270321#0" expanded="true" />
+            <element signature="e#270725#270753#0" expanded="true" />
+            <element signature="e#275813#275831#0" expanded="true" />
+            <element signature="e#278935#278952#0" expanded="true" />
+            <element signature="e#280266#281349#0" expanded="true" />
+            <element signature="e#281463#281480#0" expanded="true" />
+            <element signature="e#281598#281766#0" expanded="true" />
+            <element signature="e#282848#284506#0" expanded="true" />
+            <element signature="e#284604#284669#0" expanded="true" />
+            <element signature="e#284918#285056#0" expanded="true" />
+            <element signature="e#285581#285598#0" expanded="true" />
+            <element signature="e#288656#288673#0" expanded="true" />
+            <element signature="e#289186#289290#0" expanded="true" />
+            <element signature="e#293545#293563#0" expanded="true" />
+            <element signature="e#303792#303880#0" expanded="true" />
+            <element signature="e#309570#309633#0" expanded="true" />
+            <element signature="e#309703#309719#0" expanded="true" />
+            <element signature="e#310949#310967#0" expanded="true" />
+            <element signature="e#315988#316498#0" expanded="true" />
+            <element signature="e#319484#319501#0" expanded="true" />
+            <element signature="e#319694#319740#0" expanded="true" />
+            <element signature="e#323724#323744#0" expanded="true" />
+            <element signature="e#325879#325975#0" expanded="true" />
+            <element signature="e#325984#326002#0" expanded="true" />
+            <element signature="e#328777#328809#0" expanded="true" />
+            <element signature="e#331023#331040#0" expanded="true" />
+            <element signature="e#338741#338761#0" expanded="true" />
+            <element signature="e#338863#338959#0" expanded="true" />
+            <element signature="e#344709#344741#0" expanded="true" />
+            <element signature="e#345659#345679#0" expanded="true" />
+            <element signature="e#351262#351419#0" expanded="true" />
+            <element signature="e#351514#351560#0" expanded="true" />
+            <element signature="e#351569#351585#0" expanded="true" />
+            <element signature="e#352447#352459#0" expanded="true" />
+            <element signature="e#353410#353541#0" expanded="true" />
+            <element signature="e#354172#354312#0" expanded="true" />
+            <element signature="e#357072#357104#0" expanded="true" />
+            <element signature="e#358524#358562#0" expanded="true" />
+            <element signature="e#366908#366926#0" expanded="true" />
+            <element signature="e#367662#367698#0" expanded="true" />
+            <element signature="e#368565#368660#0" expanded="true" />
+            <element signature="e#376276#376293#0" expanded="true" />
+            <element signature="e#376335#376521#0" expanded="true" />
+            <element signature="e#383333#383345#0" expanded="true" />
+            <element signature="e#393761#393781#0" expanded="true" />
+            <element signature="e#393858#393876#0" expanded="true" />
+            <element signature="e#394262#394315#0" expanded="true" />
+            <element signature="e#394478#394534#0" expanded="true" />
+            <element signature="e#405423#405609#0" expanded="true" />
+            <element signature="e#412284#412304#0" expanded="true" />
+            <element signature="e#412408#412436#0" expanded="true" />
+            <element signature="e#412652#412767#0" expanded="true" />
+            <element signature="e#412919#413230#0" expanded="true" />
+            <element signature="e#413561#420534#0" expanded="true" />
+            <element signature="e#425331#425890#0" expanded="true" />
+            <element signature="e#426187#426310#0" expanded="true" />
+            <element signature="e#427189#435323#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplay.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 relative-caret-position="150">
+          <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/Detector.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="5" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="3" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
+        </state>
+      </provider>
+    </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="75">
+          <caret line="5" column="3" selection-start-line="5" selection-start-column="3" selection-end-line="5" selection-end-column="3" />
         </state>
       </provider>
     </entry>
@@ -713,37 +1227,58 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h">
+    <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="255">
-          <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
+        <state relative-caret-position="285">
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file:///tmp/mozilla_johannes0/TCPServerTest.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="735">
+          <caret line="49" column="33" selection-start-line="49" selection-start-column="33" selection-end-line="50" selection-end-column="30" />
         </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="270">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
+        <state relative-caret-position="15">
+          <caret line="1" column="23" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplay.cpp">
+    <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="150">
-          <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
+        <state relative-caret-position="435">
+          <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
+          <folding>
+            <element signature="e#130#161#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp">
+    <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="537">
-          <caret line="15003" lean-forward="true" selection-start-line="15003" selection-end-line="15003" />
+        <state>
+          <caret selection-end-line="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <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/utility/networking/input/SocketConnect.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
         </state>
       </provider>
     </entry>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 932cdfd..2d4bcc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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/src/utility/networking/input/TcpServer.cpp FlippR-Driver/src/utility/networking/input/TcpServer.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 FlippR-Driver/src/utility/networking/input/SocketConnection.cpp FlippR-Driver/src/utility/networking/input/SocketConnection.h)
diff --git a/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp b/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp
index e8cd851..406ba6d 100644
--- a/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp
+++ b/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp
@@ -1,5 +1,11 @@
-//
-// Created by rhetenor on 3/6/19.
-//
+/*
+ * SocketConnection.cpp
+ *
+ *  Created on: Jun 13, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
+ */
 
 #include "SocketConnection.h"
+
+
+using Poco::Net::StreamSocket;
\ No newline at end of file
diff --git a/FlippR-Driver/src/utility/networking/input/SocketConnection.h b/FlippR-Driver/src/utility/networking/input/SocketConnection.h
index f9fa4a3..1540c65 100644
--- a/FlippR-Driver/src/utility/networking/input/SocketConnection.h
+++ b/FlippR-Driver/src/utility/networking/input/SocketConnection.h
@@ -1,12 +1,18 @@
-//
-// Created by rhetenor on 3/6/19.
-//
+/*
+ * SocketConnection.h
+ *
+ *  Created on: Jun 13, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
+ */
 
 #ifndef FLIPPR_CODE_INPUTSOCKETCONNECTION_H
 #define FLIPPR_CODE_INPUTSOCKETCONNECTION_H
 
 
 #include <Poco/Net/TCPServerConnection.h>
+
+#include "Event.h"
+
 namespace flippR_driver
 {
 namespace utility
@@ -17,8 +23,11 @@ namespace input
 {
 class SocketConnection : public Poco::Net::TCPServerConnection
 {
+public:
+  SocketConnection(Poco::Net::StreamSocket streamSocket);
 
-
+  void run();
+  void sendEvent(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
index e3ffc39..18d9ae4 100644
--- a/FlippR-Driver/src/utility/networking/input/TcpServer.cpp
+++ b/FlippR-Driver/src/utility/networking/input/TcpServer.cpp
@@ -1,5 +1,8 @@
-//
-// Created by johannes on 25.04.19.
-//
+/*
+ * Detector.h
+ *
+ *  Created on: Jun 13, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
+ */
 
 #include "TcpServer.h"
diff --git a/FlippR-Driver/src/utility/networking/input/TcpServer.h b/FlippR-Driver/src/utility/networking/input/TcpServer.h
index df34ee3..473ab1e 100644
--- a/FlippR-Driver/src/utility/networking/input/TcpServer.h
+++ b/FlippR-Driver/src/utility/networking/input/TcpServer.h
@@ -1,6 +1,9 @@
-//
-// Created by johannes on 25.04.19.
-//
+/*
+ * Detector.h
+ *
+ *  Created on: Jun 13, 2018
+ *      Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
+ */
 
 #ifndef FLIPPR_CODE_TCPSERVER_H
 #define FLIPPR_CODE_TCPSERVER_H
diff --git a/cmake-build-debug/CMakeFiles/Makefile2 b/cmake-build-debug/CMakeFiles/Makefile2
index 4b8a2d8..289a284 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,80 "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,81 "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 80
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles 81
 	$(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 eb90881..f501aac 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/DependInfo.cmake
@@ -89,7 +89,8 @@ set(CMAKE_DEPENDS_CHECK_CXX
   "/home/johannes/git/flippr-code/FlippR-Driver/src/output/items/detail/Sound.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o"
   "/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/SocketConnect.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o"
+  "/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" "/home/johannes/git/flippr-code/cmake-build-debug/CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.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"
diff --git a/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make b/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
index ba9f3ef..af6ed7f 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/build.make
@@ -798,18 +798,18 @@ CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.s: c
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.s"
 	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/output/OutputPinController.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.s
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o: ../FlippR-Driver/src/utility/networking/input/InputSocketHandler.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_58) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o"
-	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o: ../FlippR-Driver/src/utility/networking/input/SocketHandler.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_58) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.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/InputSocketHandler.cpp.i"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.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/SocketHandler.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.i
 
-CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.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/InputSocketHandler.cpp.s"
-	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.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/SocketHandler.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.s
 
 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o: CMakeFiles/flippr_code.dir/flags.make
 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o: ../FlippR-Driver/src/utility/LoggerFactory.cpp
@@ -1084,6 +1084,19 @@ CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.
 	@$(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
 
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o: CMakeFiles/flippr_code.dir/flags.make
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o: ../FlippR-Driver/src/utility/networking/input/SocketConnect.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_80) "Building CXX object CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o"
+	/usr/bin/c++  $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o -c /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp
+
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.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/SocketConnect.cpp.i"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp > CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.i
+
+CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.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/SocketConnect.cpp.s"
+	/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp -o CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.s
+
 # Object files for target flippr_code
 flippr_code_OBJECTS = \
 "CMakeFiles/flippr_code.dir/FlippR-Driver/cli/main.cpp.o" \
@@ -1143,7 +1156,7 @@ flippr_code_OBJECTS = \
 "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/networking/input/SocketHandler.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" \
@@ -1164,7 +1177,8 @@ flippr_code_OBJECTS = \
 "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"
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o" \
+"CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o"
 
 # External object files for target flippr_code
 flippr_code_EXTERNAL_OBJECTS =
@@ -1226,7 +1240,7 @@ flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/So
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/items/detail/Sound.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputDriverFactory.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/output/OutputPinController.cpp.o
-flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
+flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/LoggerFactory.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp.o
 flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.o
@@ -1248,9 +1262,10 @@ flippr_code: CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/out
 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/FlippR-Driver/src/utility/networking/input/SocketConnect.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_80) "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_81) "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 6df5040..a3b495c 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/cmake_clean.cmake
@@ -56,7 +56,7 @@ file(REMOVE_RECURSE
   "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/networking/input/SocketHandler.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"
@@ -78,6 +78,7 @@ file(REMOVE_RECURSE
   "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"
+  "CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.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 3a329f8..2586193 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 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/TcpServer.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/SocketHandler.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 CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.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 f2e6a46..9fe5218 100644
--- a/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make
+++ b/cmake-build-debug/CMakeFiles/flippr_code.dir/progress.make
@@ -78,4 +78,5 @@ CMAKE_PROGRESS_77 = 77
 CMAKE_PROGRESS_78 = 78
 CMAKE_PROGRESS_79 = 79
 CMAKE_PROGRESS_80 = 80
+CMAKE_PROGRESS_81 = 81
 
diff --git a/cmake-build-debug/CMakeFiles/progress.marks b/cmake-build-debug/CMakeFiles/progress.marks
index d15a2cc..d88e313 100644
--- a/cmake-build-debug/CMakeFiles/progress.marks
+++ b/cmake-build-debug/CMakeFiles/progress.marks
@@ -1 +1 @@
-80
+81
diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile
index ce21ec8..e75596a 100644
--- a/cmake-build-debug/Makefile
+++ b/cmake-build-debug/Makefile
@@ -1770,32 +1770,59 @@ FlippR-Driver/src/utility/SocketHandler.cpp.s:
 	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/SocketHandler.cpp.s
 .PHONY : FlippR-Driver/src/utility/SocketHandler.cpp.s
 
-FlippR-Driver/src/utility/networking/input/InputSocketHandler.o: FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
+FlippR-Driver/src/utility/networking/input/SocketConnect.o: FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o
 
-.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.o
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketConnect.o
 
 # target to build an object file
-FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
-.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.o
+FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.o
 
-FlippR-Driver/src/utility/networking/input/InputSocketHandler.i: FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
+FlippR-Driver/src/utility/networking/input/SocketConnect.i: FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.i
 
-.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.i
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketConnect.i
 
 # target to preprocess a source file
-FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i:
-	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
-.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.i
+FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.i
 
-FlippR-Driver/src/utility/networking/input/InputSocketHandler.s: FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp.s
+FlippR-Driver/src/utility/networking/input/SocketConnect.s: FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.s
 
-.PHONY : FlippR-Driver/src/utility/networking/input/InputSocketHandler.s
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketConnect.s
 
 # target to generate assembly for a file
-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/SocketConnect.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketConnect.cpp.s
+
+FlippR-Driver/src/utility/networking/input/SocketHandler.o: FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o
+
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketHandler.o
+
+# target to build an object file
+FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.o
+
+FlippR-Driver/src/utility/networking/input/SocketHandler.i: FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.i
+
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketHandler.i
+
+# target to preprocess a source file
+FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.i:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.i
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.i
+
+FlippR-Driver/src/utility/networking/input/SocketHandler.s: FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.s
+
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketHandler.s
+
+# target to generate assembly for a file
+FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.s:
+	$(MAKE) -f CMakeFiles/flippr_code.dir/build.make CMakeFiles/flippr_code.dir/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.s
+.PHONY : FlippR-Driver/src/utility/networking/input/SocketHandler.cpp.s
 
 FlippR-Driver/src/utility/networking/input/TcpServer.o: FlippR-Driver/src/utility/networking/input/TcpServer.cpp.o
 
@@ -2448,9 +2475,12 @@ help:
 	@echo "... FlippR-Driver/src/utility/SocketHandler.o"
 	@echo "... FlippR-Driver/src/utility/SocketHandler.i"
 	@echo "... FlippR-Driver/src/utility/SocketHandler.s"
-	@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/SocketConnect.o"
+	@echo "... FlippR-Driver/src/utility/networking/input/SocketConnect.i"
+	@echo "... FlippR-Driver/src/utility/networking/input/SocketConnect.s"
+	@echo "... FlippR-Driver/src/utility/networking/input/SocketHandler.o"
+	@echo "... FlippR-Driver/src/utility/networking/input/SocketHandler.i"
+	@echo "... FlippR-Driver/src/utility/networking/input/SocketHandler.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"
diff --git a/cmake-build-debug/flippr_code.cbp b/cmake-build-debug/flippr_code.cbp
index 9f4d988..d33cfa1 100644
--- a/cmake-build-debug/flippr_code.cbp
+++ b/cmake-build-debug/flippr_code.cbp
@@ -593,10 +593,16 @@
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/config.h">
 			<Option target="flippr_code"/>
 		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp">
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp">
 			<Option target="flippr_code"/>
 		</Unit>
-		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h">
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketConnect.h">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
+			<Option target="flippr_code"/>
+		</Unit>
+		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/SocketHandler.h">
 			<Option target="flippr_code"/>
 		</Unit>
 		<Unit filename="/home/johannes/git/flippr-code/FlippR-Driver/src/utility/networking/input/TcpServer.cpp">