diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5f99440..7f5a2ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,37 +12,12 @@
   </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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" 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/src/input/detail/EventNotifier.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/input/detail/EventNotifier.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/SocketHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketConnection.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketConnection.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input_connection/InputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/InputSocketHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputHTTPServer.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputHTTPServer.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputRequestHandlerFactory.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandlerFactory.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output_connection/OutputSocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputSocketHandler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestDetector.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestDetector.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile.cmake" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/clion-log.txt" 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/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" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/main.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplayController.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplayController.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -55,31 +30,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp">
+        <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="680">
-              <caret line="147" column="30" selection-start-line="147" selection-start-column="30" selection-end-line="147" selection-end-column="30" />
-              <folding>
-                <element signature="e#252#282#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="34" column="53" selection-start-line="34" selection-start-column="53" selection-end-line="34" selection-end-column="53" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/Event.h">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="17" column="6" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
+            <state relative-caret-position="240">
+              <caret line="19" column="23" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -127,7 +81,6 @@
         <option value="$PROJECT_DIR$/FlippR-Driver/include/output/items/EightDigitDisplay.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.h" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/PinController.cpp" />
@@ -142,6 +95,12 @@
         <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventNotifier.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/tests/main.cpp" />
+        <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" />
       </list>
     </option>
   </component>
@@ -213,6 +172,30 @@
               <item name="input" type="462c0819:PsiDirectoryNode" />
               <item name="detail" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="output" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="output" type="462c0819:PsiDirectoryNode" />
+              <item name="items" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="output" type="462c0819:PsiDirectoryNode" />
+              <item name="items" type="462c0819:PsiDirectoryNode" />
+              <item name="detail" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
               <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
@@ -241,6 +224,13 @@
               <item name="tests" type="462c0819:PsiDirectoryNode" />
               <item name="input" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="flippr_code" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flippr-code" type="462c0819:PsiDirectoryNode" />
+              <item name="FlippR-Driver" type="462c0819:PsiDirectoryNode" />
+              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="output" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -315,12 +305,12 @@
       <workItem from="1556127692532" duration="710000" />
       <workItem from="1556129966500" duration="735000" />
       <workItem from="1556134046744" duration="615000" />
-      <workItem from="1556134690177" duration="3655000" />
+      <workItem from="1556134690177" duration="5123000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44820000" />
+    <option name="totallyTimeSpent" value="46288000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -383,40 +373,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Sound.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Solenoid.h">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/SevenDigitDisplay.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Lamp.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/EightDigitDisplay.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/items/Display.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayBoardPinController.cpp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="74">
@@ -495,16 +451,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" selection-start-line="10" selection-end-line="16" selection-end-column="45" />
-          <folding>
-            <element signature="e#211#228#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DriverBoardPinController.cpp">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -710,13 +656,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/include/boost/optional/optional.hpp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="300">
@@ -731,22 +670,80 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="34" column="53" selection-start-line="34" selection-start-column="53" selection-end-line="34" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestInputDriver.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="680">
-          <caret line="147" column="30" selection-start-line="147" selection-start-column="30" selection-end-line="147" selection-end-column="30" />
+        <state relative-caret-position="665">
+          <caret line="143" column="39" selection-start-line="143" selection-start-column="39" selection-end-line="143" selection-end-column="39" />
           <folding>
             <element signature="e#252#282#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="16" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/catch.hpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="630">
+          <caret line="5246" column="22" selection-start-line="5246" selection-start-column="22" selection-end-line="5246" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/main.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/include/input/InputDriver.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/DisplayController.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
+          <folding>
+            <element signature="e#211#228#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestDisplayController.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
+          <folding>
+            <element signature="e#134#151#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="19" column="23" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/FlippR-Driver/include/input/InputDriver.h b/FlippR-Driver/include/input/InputDriver.h
index 9d0a89e..1302c80 100644
--- a/FlippR-Driver/include/input/InputDriver.h
+++ b/FlippR-Driver/include/input/InputDriver.h
@@ -9,7 +9,8 @@
 #define SRC_INPUT_IINPUTDRIVER_H_
 
 #include <memory>
-#include <boost/optional.hpp>
+
+#include <boost/optional/optional_io.hpp>
 
 #include "input/EventHandler.h"
 
diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp
index 91aeef7..7b4700e 100644
--- a/FlippR-Driver/tests/input/TestInputDriver.cpp
+++ b/FlippR-Driver/tests/input/TestInputDriver.cpp
@@ -149,6 +149,4 @@ SCENARIO("An Input Driver is created normally", "")
       }
     }
   }
-}
-
-
+}
\ No newline at end of file
diff --git a/FlippR-Driver/tests/main.cpp b/FlippR-Driver/tests/main.cpp
index 519b7db..93a187a 100644
--- a/FlippR-Driver/tests/main.cpp
+++ b/FlippR-Driver/tests/main.cpp
@@ -6,4 +6,4 @@
  */
 
 #define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+//#include "catch.hpp"
diff --git a/FlippR-Driver/tests/output/TestDisplayController.cpp b/FlippR-Driver/tests/output/TestDisplayController.cpp
index 8c825e4..bdc6605 100644
--- a/FlippR-Driver/tests/output/TestDisplayController.cpp
+++ b/FlippR-Driver/tests/output/TestDisplayController.cpp
@@ -25,32 +25,31 @@
 using namespace flippR_driver::output;
 using namespace fakeit;
 using namespace flippR_driver::utility;
-using namespace fakeit;
 
 SCENARIO("A display controller gets created", "")
 {
   GIVEN("A set of displays and a pin controller")
   {
-    LoggerFactory::CreateInputTestLogger();
-
-    std::vector<std::shared_ptr<items::OutputDisplay>> output_diplays;
-    for(int i = 0; i < 3; i++)
-    {
-      Mock<items::OutputDisplay> display_mock;
-      Fake(Dtor(display_mock));
-      output_diplays.push_back(std::make_shared<items::OutputDisplay>(display_mock));
-    }
-
-    Mock<DisplayBoardPinController> display_board_pin_controller_mock;
-    Fake(Dtor(display_board_pin_controller_mock));
-
-    When(Method(display_board_pin_controller_mock, write_display)).AlwaysReturn();
-    When(Method(display_board_pin_controller_mock, activate_displays)).AlwaysReturn();
-    When(Method(display_board_pin_controller_mock, deactivate_displays)).AlwaysReturn();
+//    LoggerFactory::CreateInputTestLogger();
+//
+//    std::vector<std::shared_ptr<items::OutputDisplay>> output_diplays;
+//    for(int i = 0; i < 3; i++)
+//    {
+//      Mock<items::OutputDisplay> display_mock;
+//      Fake(Dtor(display_mock));
+//      output_diplays.push_back(std::make_shared<items::OutputDisplay>(display_mock));
+//    }
+//
+//    Mock<DisplayBoardPinController> display_board_pin_controller_mock;
+//    Fake(Dtor(display_board_pin_controller_mock));
+//
+//    When(Method(display_board_pin_controller_mock, write_display)).AlwaysReturn();
+//    When(Method(display_board_pin_controller_mock, activate_displays)).AlwaysReturn();
+//    When(Method(display_board_pin_controller_mock, deactivate_displays)).AlwaysReturn();
 
     WHEN("The DisplayController is created")
     {
-      detail::DisplayController controller(output_diplays, std::make_unique<DisplayBoardPinController>(display_board_pin_controller_mock));
+//      detail::DisplayController controller(output_diplays, std::make_unique<DisplayBoardPinController>(display_board_pin_controller_mock));
 
       THEN("All Displays should be activated")
       {
diff --git a/FlippR-Driver/tests/output/TestOutputItem.cpp b/FlippR-Driver/tests/output/TestOutputItem.cpp
index 6720e17..2e7f8c8 100644
--- a/FlippR-Driver/tests/output/TestOutputItem.cpp
+++ b/FlippR-Driver/tests/output/TestOutputItem.cpp
@@ -17,7 +17,7 @@
 // testing purposes
 #define private public
 
-#include "output/items/OutputItem.h"
+#include "output/items/Item.h"
 
 using namespace flippR_driver::output;
 using namespace fakeit;