diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a0c540a..8be530f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,13 +12,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
-      <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/include/input/Event.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/input/Event.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/input/Event.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/input/Event.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/FlippR-Driver/contrib/pre-commit" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,11 +26,11 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <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="105">
-              <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
+            <state relative-caret-position="420">
+              <caret line="52" column="15" selection-start-line="52" selection-start-column="15" selection-end-line="52" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -48,7 +44,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/Event.cpp">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="373">
@@ -63,8 +59,8 @@
       <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="225">
-              <caret line="15" column="32" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
+            <state relative-caret-position="239">
+              <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
             </state>
           </provider>
         </entry>
@@ -73,7 +69,7 @@
         <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/BlockingQueue.hpp">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="299">
-              <caret line="41" column="6" lean-forward="true" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
+              <caret line="41" column="6" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -151,10 +147,10 @@
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnect.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketConnection.h" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" />
         <option value="$PROJECT_DIR$/FlippR-Driver/include/input/Event.h" />
-        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" />
         <option value="$PROJECT_DIR$/FlippR-Driver/src/input/Event.cpp" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h" />
+        <option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp" />
       </list>
     </option>
   </component>
@@ -358,12 +354,12 @@
       <workItem from="1556134690177" duration="5123000" />
       <workItem from="1556187501636" duration="4257000" />
       <workItem from="1556211614557" duration="1716000" />
-      <workItem from="1556213821558" duration="6107000" />
+      <workItem from="1556213821558" duration="6519000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="58368000" />
+    <option name="totallyTimeSpent" value="58780000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -378,11 +374,11 @@
     <frame x="0" y="0" width="1920" height="1058" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26947704" />
+      <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" />
-      <window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32903227" />
+      <window_info anchor="bottom" id="Find" order="1" visible="true" weight="0.32903227" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -1175,17 +1171,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/IBlockingQueue.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/BlockingQueue.hpp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="299">
-          <caret line="41" column="6" lean-forward="true" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
+          <caret line="41" column="6" selection-start-line="41" selection-start-column="6" selection-end-line="41" selection-end-column="6" />
         </state>
       </provider>
     </entry>
@@ -1234,17 +1223,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="26" selection-start-line="7" selection-start-column="26" selection-end-line="7" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h">
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/IBlockingQueue.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
-          <caret line="15" column="32" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
+          <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
         </state>
       </provider>
     </entry>
@@ -1265,5 +1247,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="52" column="15" selection-start-line="52" selection-start-column="15" selection-end-line="52" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/FlippR-Driver/contrib/pre-commit b/FlippR-Driver/contrib/pre-commit
new file mode 100755
index 0000000..e2b0d22
--- /dev/null
+++ b/FlippR-Driver/contrib/pre-commit
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+echo "Making sure the code compiles!!!"
+
+if [ ! -d 'FlippR-Driver/build' ]; then
+    echo "Make sure you have the build folder!"
+    exit 1
+fi
+
+cd FlippR-Driver/build
+cmake ..
+make
+
+exit $rc
diff --git a/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp b/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
index 573db35..57594be 100644
--- a/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
+++ b/FlippR-Driver/src/utility/networking/input/SocketHandler.cpp
@@ -35,7 +35,7 @@ void SocketHandler::run()
 
   while(true)
   {
-    Event event = this->queue.pop();
+    Event event = this->queue->pop();
 
     if(event.name == "END")
     {
@@ -50,7 +50,7 @@ void SocketHandler::run()
 
 void SocketHandler::handle(Event &event)
 {
-  this->queue.push(event);
+  this->queue->push(event);
 }
 
 }
diff --git a/FlippR-Driver/src/utility/networking/input/SocketHandler.h b/FlippR-Driver/src/utility/networking/input/SocketHandler.h
index 663c442..7279768 100644
--- a/FlippR-Driver/src/utility/networking/input/SocketHandler.h
+++ b/FlippR-Driver/src/utility/networking/input/SocketHandler.h
@@ -11,10 +11,10 @@
 
 #include <Poco/Net/TCPServerConnection.h>
 
-#include "BlockingQueue.hpp"
-#include "InputDriver.h"
-#include "detail/EventHandler.h"
-#include "Event.h"
+#include "utility/IBlockingQueue.h"
+#include "input/InputDriver.h"
+#include "input/detail/EventHandler.h"
+#include "input/Event.h"
 
 namespace flippR_driver
 {
@@ -33,7 +33,7 @@ public:
   void handle(flippR_driver::input::Event &event) override;
 
 private:
-  flippR_driver::utility::BlockingQueue<flippR_driver::input::Event> queue;
+  flippR_driver::utility::IBlockingQueue<flippR_driver::input::Event>* queue;
 };
 
 }