diff --git a/hardware/libraries/Firmata/Firmata.cpp b/hardware/libraries/Firmata/Firmata.cpp
index f2688b9b3..4e59d2723 100644
--- a/hardware/libraries/Firmata/Firmata.cpp
+++ b/hardware/libraries/Firmata/Firmata.cpp
@@ -10,14 +10,6 @@
   See file LICENSE.txt for further informations on licensing terms.
 */
 
-/*
- * TODO generalized SysEx support
- * TODO firmware name/version reporting (i.e. some firmwares will use the Firmata
- *       protocol, but will only support specific devices, like ultrasound 
- *       rangefinders or servos)
- * TODO implement v2 protocol using digital ports
- */
-
 //******************************************************************************
 //* Includes
 //******************************************************************************
diff --git a/hardware/libraries/Firmata/TODO.txt b/hardware/libraries/Firmata/TODO.txt
new file mode 100644
index 000000000..86c985801
--- /dev/null
+++ b/hardware/libraries/Firmata/TODO.txt
@@ -0,0 +1,14 @@
+
+- make Firmata a subclass of HardwareSerial
+
+- per-pin digital callback, since the per-port callback is a bit complicated
+  for beginners (maybe Firmata is not for beginners...)
+
+- simplify SimpleDigitalFirmata, take out the code that checks to see if the
+  data has changed, since it is a bit complicated for this example.  Ideally
+  this example would be based on a call
+
+- turn current SimpleDigitalFirmata into DigitalPortFirmata for a more complex
+  example using the code which checks for changes before doing anything
+
+- test integration with Wiring