diff --git a/TODO.rst b/TODO.rst
index c39d4976f9b1abdc681e711620998f6198f5e89b..fa21b16f30f9e0b9727d8d46d4ec57683a5c9d88 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -2,22 +2,25 @@
 List of things for to be done
 =============================
 
+Gateways
+--------
+* Rewrite the NetAtmo (they trashed the old API)
+
+* Switch to async API for Yeelight (this should be a good example)
+
+* Fix button sending wrong notification (aqara, edisio)
 
 Apps
 ----
-
+* Fix rest/dashbard/fakeinput sharing the same template global. This stuff break xaal-pkgrun
   
 
 Lib
 ---
-  
-* Add a default command line parser:
-  The idea is to provide a way to override default config
-
-* Look at device management
-  
-* fix message.dump()
+* Switch Message.action to Message.method (method isn't a keyword). Changes in xaal.lib (+tests)
+  scripts (btn_*), tools, loggers (warp10/influxdb) and HA handler
 
-* delay nc.connect() ..
+* Fix xaal.monitor refresh_rate 
 
-* add groupID ..
+* Add a default command line parser:
+  The idea is to provide a way to override default config