diff --git a/platformio.ini b/platformio.ini
index c0d3531..cb6211a 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,6 +3,8 @@
 ;lib_compat_mode=off
 lib_ldf_mode=chain
 
+lib_deps =
+      fakeit=https://github.com/FabioBatSilva/ArduinoFake.git
 #upload_protocol=custom
 #upload_flags =
 #    -Pusb
@@ -29,62 +31,38 @@ upload_command = avrdude -vv -pm328p -c avrisp -P/dev/ttyS0 $UPLOAD_FLAGS -U fla
 #   '-b115200'
 
 [env:native]
-  lib_deps =  
+  lib_deps =
     ${env.lib_deps}
-    fakeit=https://github.com/FabioBatSilva/ArduinoFake.git
-  platform=native
-  build_type = release
-  test_ignore = cross/*
-  build_flags = -DNATIVE
-  debug_test = noarch/test_gun
-  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
-
-[env:native_debug]
-  lib_deps =  ${env.lib_deps}
-    fakeit=https://github.com/FabioBatSilva/ArduinoFake.git
   platform=native
   build_type = debug
-  debug_build_flags = -Og -ggdb3 -g3 -DNATIVE -UAVR
   test_ignore = cross/*
-  debug_test = noarch/test_gun
+  build_flags = 
+    -DNATIVE
+    -std=gnu++17
+    -Og -ggdb3
+  debug_test = native/test_Target
   build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
 
+# [env:native_debug]
+#   lib_deps =
+#     ${env.lib_deps}
+#   platform=native
+#   build_type = debug
+#   debug_build_flags = -Og -ggdb3 -g3 -DNATIVE -UAVR
+#   test_ignore = cross/*
+#   debug_test = noarch/test_gun
+#   build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
+
 [env:cross]
-  lib_deps =  ${env.lib_deps} 
+  lib_deps =
+    ${env.lib_deps}
   test_framework = unity
   platform = atmelavr
   framework = arduino
   board = ATmega328P
   build_type = release
   test_ignore = native/*
-  build_flags = -O0
-  build_src_filter = ${env.src_filter} -<ConsoleTargets.cpp>
-
-  [env:target]
-  lib_deps =  
-    ${env.lib_deps}
-    SerialCommands
-  framework = arduino
-  platform = atmelavr
-  board = ATmega328P
-  board_build.mcu = atmega328p
-  board_build.f_cpu = 16000000L
-  build_type = release
-  build_flags = -DAVR
-  test_ignore =
-    native/*
-  build_src_filter = ${env.src_filter} -<GunApp.cpp> -<ConsoleTargets.cpp>
-
-  [env:gun]
-  lib_deps =
-  framework = arduino
-  platform = atmelavr
-  board = ATmega328P
-  board_build.mcu = atmega328p
-  board_build.f_cpu = 16000000L
-  build_type = release
-  build_flags = -DAVR
-  test_ignore = 
-    native/*
-    noarch/*
-  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<ConsoleTargets.cpp>
\ No newline at end of file
+  build_flags = 
+    -Os
+    -std=gnu++17
+  build_src_filter = ${env.src_filter} -<ConsoleTargets.cpp>
\ No newline at end of file