diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index 9043a161..840156e5 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -1,9 +1,15 @@
 # High priority
 
+- why is the net so chatty now?
+- E22 bringup
+- encryption review findings writeup
+- turn on modem-sleep mode
+
 # Medium priority
 
 Items to complete before the first beta release.
 
+- turn on watchdog timer (because lib code seems buggy)
 - show battery level as % full
 - rx signal measurements -3 marginal, -9 bad, 10 great, -10 means almost unusable. So scale this into % signal strength. preferably as a graph, with an X indicating loss of comms.
 
diff --git a/platformio.ini b/platformio.ini
index c51e0954..791bfed2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -22,8 +22,6 @@ default_envs = tbeam ; Note: the github actions CI test build can't yet build NR
 ; HW_VERSION (default emptystring)
 
 [env]
-platform = espressif32
-framework = arduino
 
 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
@@ -79,6 +77,8 @@ lib_deps =
   
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
+platform = espressif32
+framework = arduino
 src_filter = 
   ${env.src_filter} -<nrf52/>
 upload_speed = 921600
@@ -86,6 +86,8 @@ debug_init_break = tbreak setup
 build_flags =
   ${env.build_flags} -Wall -Wextra -Isrc/esp32 
 lib_ignore = segger_rtt
+platform_packages =
+    framework-arduinoespressif32 @ https://github.com/meshtastic/arduino-esp32.git
 
 ; The 1.0 release of the TBEAM board
 [env:tbeam]