diff --git a/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json b/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
index 11d2216..00ed848 100644
--- a/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
+++ b/FlippR-Driver/contrib/json_example/input/Input_Matrix_Config.json
@@ -3,188 +3,218 @@
     "input_matrix" :
     [
         {
-            "name" : "Out hole",
+            "name" : "Tilt 2",
+            "address" : 2,
+            "priority" : 2
+        },
+        {
+            "name" : "Coin Switch 1",
+            "address" : 4,
+            "priority" : 2
+        },
+        {
+            "name" : "Coin Switch 2",
+            "address" : 5,
+            "priority" : 2
+        },
+        {
+            "name" : "Coin Switch 3",
+            "address" : 6,
+            "priority" : 2
+        },
+        {
+            "name" : "Credit",
+            "address" : 9,
+            "priority" : 2
+        },
+        {
+            "name" : "Tilt",
+            "address" : 10,
+            "priority" : 2
+        },
+        {
+            "name" : "Outhole",
             "address" : 16,
             "priority" : 99,
             "bounce_time" : 10
         },
         {
-            "name" : "Left outer exit canal",
+            "name" : "Left Outlane",
             "address" : 17,
             "priority" : 2
         },
         {
-            "name" : "Inner left canal",
+            "name" : "Left Inlane",
             "address" : 18,
             "priority" : 2
         },
         {
-            "name" : "Left flap contacts",
+            "name" : "Left Slingshot",
             "address" : 19,
             "priority" : 2
         },
         {
-            "name" : "Right flap contacts",
+            "name" : "Right Slingshot",
             "address" : 20,
             "priority" : 2
         },
         {
-            "name" : "Right inner canal",
+            "name" : "Right Inlane",
             "address" : 21,
             "priority" : 2
         },
         {
-            "name" : "Right central exit canal",
+            "name" : "Right Outlane",
             "address" : 22,
             "priority" : 2
         },
         {
-            "name" : "Right kicker contact",
+            "name" : "Right Outlane Kicker",
             "address" : 23,
             "priority" : 2
         },
         {
-            "name" : "Contacts",
+            "name" : "Rebound Contact",
             "address" : 24,
             "priority" : 2
         },
         {
-            "name" : "1st moving target bottom left bank",
+            "name" : "Left Bank Left",
             "address" : 25,
             "priority" : 2
         },
         {
-            "name" : "2nd moving target bottom left bank",
+            "name" : "Left Bank Middle Left",
             "address" : 26,
             "priority" : 2
         },
         {
-            "name" : "3rd moving target bottom left bank",
+            "name" : "Left Bank Middle Right",
             "address" : 27,
             "priority" : 2
         },
         {
-            "name" : "4th moving target bottom left bank",
+            "name" : "Left Bank Right",
             "address" : 28,
             "priority" : 2
         },
         {
-            "name" : "Fixed special red target",
+            "name" : "Special Red",
             "address" : 29,
             "priority" : 2
         },
         {
-            "name" : "Fixed special orange target",
+            "name" : "Special Orange",
             "address" : 30,
             "priority" : 2
         },
         {
-            "name" : "1st moving target bottom right bank",
+            "name" : "Right Bank Left",
             "address" : 31,
             "priority" : 2
         },
         {
-            "name" : "2nd moving target bottom right bank",
+            "name" : "Right Bank Middle",
             "address" : 32,
             "priority" : 2
         },
         {
-            "name" : "3rd moving target bottom right bank",
+            "name" : "Right Bank Right",
             "address" : 33,
             "priority" : 2
         },
         {
-            "name" : "Spinning target",
+            "name" : "Spinner",
             "address" : 34,
             "priority" : 2
         },
         {
-            "name" : "1st Button",
+            "name" : "Canal Button Top",
             "address" : 35,
             "priority" : 2
         },
         {
-            "name" : "2nd button",
+            "name" : "Canal Button Middle Top",
             "address" : 36,
             "priority" : 2
         },
         {
-            "name" : "3rd button",
+            "name" : "Canal Button Middle",
             "address" : 37,
             "priority" : 2
         },
         {
-            "name" : "4th button",
+            "name" : "Canal Button Middle Bottom",
             "address" : 38,
             "priority" : 2
         },
         {
-            "name" : "5th button",
+            "name" : "Canal Button Bottom",
             "address" : 39,
             "priority" : 2
         },
         {
-            "name" : "1st moving target top central bank",
+            "name" : "Top Bank Left",
             "address" : 40,
             "priority" : 2
         },
         {
-            "name" : "2nd moving target top central bank",
+            "name" : "Top Bank Middle Left",
             "address" : 41,
             "priority" : 2
         },
         {
-            "name" : "3rd moving target top central bank",
+            "name" : "Top Bank Middle",
             "address" : 42,
             "priority" : 2
         },
         {
-            "name" : "4th moving target top central bank",
+            "name" : "Top Bank Middle Right",
             "address" : 43,
             "priority" : 2
         },
         {
-            "name" : "5th moving target top central bank",
+            "name" : "Top Bank Right",
             "address" : 44,
             "priority" : 2
         },
         {
-            "name" : "1st fixed target",
+            "name" : "Fixed Target 1",
             "address" : 45,
             "priority" : 2
         },
         {
-            "name" : "2nd fixed target",
+            "name" : "Fixed Target 2",
             "address" : 46,
             "priority" : 2
         },
         {
-            "name" : "Top left pop contact",
+            "name" : "Left Pop",
             "address" : 47,
             "priority" : 2
         },
         {
-            "name" : "Bottom right pop contact",
+            "name" : "Right Pop",
             "address" : 48,
             "priority" : 2
         },
         {
-            "name" : "5th fixed target",
+            "name" : "Fixed Target 5",
             "address" : 49,
             "priority" : 2
         },
         {
-            "name" : "4th fixed target",
+            "name" : "Fixed Target 4",
             "address" : 50,
             "priority" : 2
         },
         {
-            "name" : "3rd fixed target",
+            "name" : "Fixed Target 3",
             "address" : 51,
             "priority" : 2
         },
         {
-            "name" : "Rising ball contact",
+            "name" : "Rising ball",
             "address" : 52,
             "priority" : 2
         }
diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index 6f3880d..ddc6c1c 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -118,13 +118,13 @@ void FlippRServer::initialize(Application &self)
   //make this one application and subsystems ServerApplications
 
   this->initialize_output_driver();
-  //this->initialize_input_driver();
+  this->initialize_input_driver();
 
   this->output_server = std::unique_ptr<Poco::Net::HTTPServer>(this->build_output_server());
   this->output_server->start();
 
   this->input_server = std::unique_ptr<TCPServer>(this->build_input_server());
-  //this->input_server->start();
+  this->input_server->start();
   logger().warning(FRED("Input server not started!"));
 
   ServerApplication::initialize(self);