diff --git a/TODO.org b/TODO.org
new file mode 100644
index 00000000..79d5fd0c
--- /dev/null
+++ b/TODO.org
@@ -0,0 +1,5 @@
+* TODO fix pid parser, //run/foo.pid -> /var/run///run/foo.pid
+* TODO test framework refactor 'texec sh -c ...' -> 'run ...'
+* TODO Clean up tests a bit
+* TODO Drop tenv or common and rename tenv-root
+