diff --git a/CommandStation-DCC.ino b/CommandStation-EX.ino
similarity index 98%
rename from CommandStation-DCC.ino
rename to CommandStation-EX.ino
index 85702e2..1026fe4 100644
--- a/CommandStation-DCC.ino
+++ b/CommandStation-EX.ino
@@ -18,7 +18,7 @@
  */
 
 #include <Arduino.h>
-#include <CommandStation.h>
+#include <DCC-EX-Lib.h>
 #include <ArduinoTimers.h>
 
 #include "Config.h"
@@ -134,7 +134,7 @@ void setup() {
   CommManager::registerInterface(new SerialInterface(Serial));
   Wire.begin();       // Needed for EEPROM to work
   EEStore::init(&Serial);
-#elif defined(ARDUINO_ARCH_AVR)
+#elif defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR)
   CommManager::registerInterface(new SerialInterface(Serial));
   EEStore::init(&Serial);
 #endif
diff --git a/platformio.ini b/platformio.ini
index d628709..c7b7941 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,12 +9,12 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = samd21, mega2560, mega328
+default_envs = samd21, mega2560, mega328, unowifiR2
 src_dir = .
 
 [env]
 lib_deps = 
-    https://github.com/DCC-EX/CommandStation.git#issue18-LocoMgmt
+    https://github.com/DCC-EX/DCC-EX-Lib.git#master
     https://github.com/davidcutting42/ArduinoTimers.git#master
     
 [env:samd21]
@@ -40,4 +40,11 @@ board = uno
 framework = arduino
 lib_deps = 
     ${env.lib_deps}
-    DIO2
\ No newline at end of file
+    DIO2
+
+[env:unowifiR2]
+platform = atmelmegaavr
+board = uno_wifi_rev2
+framework = arduino
+lib_deps = 
+    ${env.lib_deps}
\ No newline at end of file