diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt
index 93dfe66..52ca3c0 100644
--- a/FlippR-Driver/CMakeLists.txt
+++ b/FlippR-Driver/CMakeLists.txt
@@ -110,14 +110,17 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/${LIB_DIR})
 
 ##################### WIRING_PI ##########################
-find_library(WIRING_PI NAMES libwiringPi.so.2.44 HINTS ${CMAKE_SOURCE_DIR}/lib)
-
-if(NOT WIRING_PI)
+find_library(wiringPi_LIB wiringPi)
+if(NOT wiringPi_LIB)
   message(FATAL_ERROR "Could not find wiringPi library")
 endif()
+target_link_libraries(${PROJECT_NAME} PUBLIC ${wiringPi_LIB})
 
-target_link_libraries(${PROJECT_NAME} PUBLIC ${WIRING_PI})
-
+find_library(crypt_LIB crypt)
+if(NOT crypt_LIB)
+    message(FATAL_ERROR "Could not find crypt library")
+endif()
+target_link_libraries(${PROJECT_NAME} PUBLIC ${crypt_LIB})
 ## EASYLOGGING
 set(EASYLOGGING_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/${LIB_DIR}/easylogging)
 add_library(Easylogging STATIC ${EASYLOGGING_INCLUDE_DIR}/easylogging++.cc)
@@ -132,6 +135,9 @@ target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
 
 ## THREAD
 find_package(Threads REQUIRED)
+if(NOT CMAKE_THREAD_LIBS_INIT)
+    message(FATAL_ERROR, "Could not find libthread")
+endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE ${Threads_LIBRARIES})
 
 if(ENABLE_TESTING)
diff --git a/FlippR-Driver/lib/libwiringPi.so.2.44 b/FlippR-Driver/lib/libwiringPi.so.2.44
deleted file mode 100755
index 92f7d4d..0000000
Binary files a/FlippR-Driver/lib/libwiringPi.so.2.44 and /dev/null differ
diff --git a/FlippR-Driver/src/utilities/GPIOInterface.cpp b/FlippR-Driver/src/utilities/GPIOInterface.cpp
index 1239c3e..b055fe0 100644
--- a/FlippR-Driver/src/utilities/GPIOInterface.cpp
+++ b/FlippR-Driver/src/utilities/GPIOInterface.cpp
@@ -7,17 +7,17 @@
 
 #include "GPIOInterface.h"
 
-//#include "lib/wiringPi/wiringPi.h"
+#include "wiringPi/wiringPi.h"
 #include "json/json.hpp"
 
 
 void GPIOInterface::write_pin(char address, char data)
 {
-  //digitalWrite(address, data);
+  digitalWrite(address, data);
 }
 
 
 bool GPIOInterface::read_pin(char address)
 {
-  //return digitalRead(address);
+  return digitalRead(address);
 }