diff --git a/FlippR-Driver/CMakeLists.txt b/FlippR-Driver/CMakeLists.txt
index e502014..a024a06 100644
--- a/FlippR-Driver/CMakeLists.txt
+++ b/FlippR-Driver/CMakeLists.txt
@@ -8,7 +8,7 @@ set(OUTPUT_PATH bin)
 set(LIB_DIR lib)
 set(DEFAULT_BUILD_TYPE DEBUG)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 # Boost configuration
 set(BOOST_COMPONENTS program_options thread timer chrono)
@@ -22,26 +22,27 @@ IF(NOT RPI_ROOT)
 ENDIF()
 
 IF(CROSS_COMPILE)
+    SET(CMAKE_CROSSCOMPILING TRUE)
     #SET(CMAKE_TOOLCHAIN_FILE ${RPI_ROOT}/Toolchain-RaspberryPi.cmake)
     SET(CMAKE_SYSTEM_NAME Linux)
     SET(CMAKE_SYSTEM_VERSION 1)
 
     # Specify the cross compiler
-    SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc-7)
-    SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++-7)
+    SET(CMAKE_C_COMPILER /usr/bin/clang)
+    SET(CMAKE_CXX_COMPILER /usr/bin/clang)
 
-    SET(CMAKE_FIND_ROOT_PATH $ENV{HOME}/raspberrypi/rootfs)
+    # Where is the target environment
+    SET(CMAKE_FIND_ROOT_PATH ${RPI_ROOT}/rootfs)
+ #   SET(CMAKE_FIND_ROOT_PATH $ENV{HOME}/raspberrypi/rootfs)
     SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
     SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
     SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
     
 #     SET(Boost_NO_SYSTEM_PATHS TRUE) 
 #     SET(BOOST_ROOT "$ENV{HOME}/boost_1_64_0/")
-#     SET(BOOST_INCLUDEDIR "$ENV{HOME}/boost_1_64_0/")
+#    SET(BOOST_INCLUDEDIR "${RPI_ROOT}/rootfs/usr/include//boost_1_64_0/")
 #     SET(BOOST_LIBRARYDIR "$ENV{HOME}/boost_1_64_0/")
     
-    # Where is the target environment
-    #SET(CMAKE_FIND_ROOT_PATH ${RPI_ROOT}/rootfs)
     #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}")
     #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}")
     #SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}")
diff --git a/FlippR-Driver/cross-docker/Dockerfile b/FlippR-Driver/cross-docker/Dockerfile
deleted file mode 100644
index 070ce69..0000000
--- a/FlippR-Driver/cross-docker/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM ubuntu:latest
-
-RUN apt update \
-    && apt install -y git rsync cmake gcc-7-arm-linux-gnueabihf g++-7-arm-linux-gnueabihf 
-    
-RUN cd ~ \
-    && mkdir raspberrypi \
-    && cd raspberrypi \
-    && mkdir rootfs
-    
-COPY lib /root/raspberrypi/rootfs/
-COPY usr /root/raspberrypi/rootfs/
diff --git a/FlippR-Driver/cross-docker/build-docker.sh b/FlippR-Driver/cross-docker/build-docker.sh
deleted file mode 100644
index 567210a..0000000
--- a/FlippR-Driver/cross-docker/build-docker.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-docker build -t raspberrycross .
diff --git a/FlippR-Driver/cross-docker/docker-bash.sh b/FlippR-Driver/cross-docker/docker-bash.sh
deleted file mode 100644
index e6e9e4b..0000000
--- a/FlippR-Driver/cross-docker/docker-bash.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run -v $(pwd):/root/flippr -it raspberrycross:latest bash