diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino
index aaa2641..c99ebc0 100644
--- a/CommandStation-EX.ino
+++ b/CommandStation-EX.ino
@@ -92,7 +92,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 f9e36e7..c7b7941 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = samd21, mega2560, mega328
+default_envs = samd21, mega2560, mega328, unowifiR2
 src_dir = .
 
 [env]
@@ -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