diff --git a/FlippR-Driver/contrib/json_example/output/Sound_Config.json b/FlippR-Driver/contrib/json_example/output/Sound_Config.json
index ebda109..6cd37bd 100644
--- a/FlippR-Driver/contrib/json_example/output/Sound_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Sound_Config.json
@@ -2,11 +2,17 @@
     "deactivation_time_milliseconds" : 10,
     "port_extenders" : 
     [
+<<<<<<< HEAD
         {
             "name" : "extender_0",
             "i2c_address" : 33,
             "pin_base" : 81
         }
+=======
+        "name" : "extender_0",
+        "i2c_address" : 33,
+        "pin_base" : 81
+>>>>>>> aa1d6409ea18cff1ad4b0ef06804fcf5a521dee9
     ],
     "fire_pin" : 
     {
diff --git a/FlippR-Driver/src/output/OutputDriverFactory.cpp b/FlippR-Driver/src/output/OutputDriverFactory.cpp
index d9cfd8a..89d4354 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.cpp
+++ b/FlippR-Driver/src/output/OutputDriverFactory.cpp
@@ -39,6 +39,7 @@ std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
   auto lamps = create_lamps(lamp_config, driver_board_pin_controller);
 
   uint8_t sound_fire_address = get_sound_fire_address(sound_config);
+
   std::shared_ptr<SoundBoardPinController> sound_board_pin_controller(new detail::SoundBoardPinController(output_pin_mutex, sound_fire_address));
   auto sounds = create_sounds(sound_config, sound_board_pin_controller);
 
diff --git a/FlippR-Driver/src/output/OutputDriverFactory.h b/FlippR-Driver/src/output/OutputDriverFactory.h
index 445a6a4..659bf06 100644
--- a/FlippR-Driver/src/output/OutputDriverFactory.h
+++ b/FlippR-Driver/src/output/OutputDriverFactory.h
@@ -24,9 +24,9 @@ namespace output
 namespace OutputDriverFactory
 {
 std::shared_ptr<OutputDriver> get_OutputDriver(std::istream& solenoid_config,
-                                               std::istream& lamp_config,
-                                               std::istream& sound_config,
-                                               std::istream& display_config);
+                                                  std::istream& lamp_config,
+                                                  std::istream& sound_config,
+                                                  std::istream& display_config);
 
 std::map<std::string, std::shared_ptr<items::Solenoid>> create_solenoids(std::istream& solenoid_config, std::shared_ptr<DriverBoardPinController> &driverBoardPinController);
 std::shared_ptr<items::detail::Solenoid> create_solenoid(nlohmann::json &solenoid_json, nlohmann::json &port_extenders, std::shared_ptr<DriverBoardPinController> &pin_controller, std::chrono::milliseconds deactivation_time);
diff --git a/FlippR-Driver/src/output/detail/DisplayBoardPinController.h b/FlippR-Driver/src/output/detail/DisplayBoardPinController.h
index 8b700c9..6bf60d6 100644
--- a/FlippR-Driver/src/output/detail/DisplayBoardPinController.h
+++ b/FlippR-Driver/src/output/detail/DisplayBoardPinController.h
@@ -5,10 +5,9 @@
 #ifndef FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H
 #define FLIPPR_DRIVER_OUTPUT_IMPL_DISPLAYPINCONTROLLER_H
 
-#include <map>
-
 #include "output/DisplayBoardPinController.h"
 
+#include <map>
 
 namespace flippR_driver
 {
diff --git a/FlippR-Driver/src/output/detail/DisplayController.cpp b/FlippR-Driver/src/output/detail/DisplayController.cpp
index 7faa049..e291aac 100644
--- a/FlippR-Driver/src/output/detail/DisplayController.cpp
+++ b/FlippR-Driver/src/output/detail/DisplayController.cpp
@@ -7,6 +7,8 @@
 
 #include "output/detail/DisplayController.h"
 
+#include "output/DisplayController.h"
+
 #include "utility/config.h"
 
 namespace flippR_driver
diff --git a/FlippR-Driver/src/output/detail/DisplayController.h b/FlippR-Driver/src/output/detail/DisplayController.h
index 12ed5d3..f41ed2f 100644
--- a/FlippR-Driver/src/output/detail/DisplayController.h
+++ b/FlippR-Driver/src/output/detail/DisplayController.h
@@ -12,7 +12,6 @@
 #include <thread>
 
 #include "output/DisplayController.h"
-
 #include "output/items/OutputDisplay.h"
 #include "output/DisplayBoardPinController.h"
 
diff --git a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
index 8a9ab7f..4b09443 100644
--- a/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
+++ b/FlippR-Driver/src/output/detail/SoundBoardPinController.cpp
@@ -14,8 +14,7 @@ namespace detail
 {
 
 SoundBoardPinController::SoundBoardPinController(std::shared_ptr<std::mutex> output_item_mutex,
-                                                 const uint8_t &fire_address
-) :
+                                                 const uint8_t &fire_address) :
   output_item_mutex(std::move(output_item_mutex)),
   fire_address(fire_address)
 {
@@ -62,6 +61,9 @@ void SoundBoardPinController::fire_sound() const
 void SoundBoardPinController::write_pin(const uint8_t &pin, const bool &value) const
 {
   //  PinController::write_pin(pins_sound.at("pin_base") + pin, value);
+  //  PinController::write_pin(pins_sound.at("fire"), true);
+  //
+  //  PinController::write_pin(pins_sound.at("fire"), false);
 }
 
 }