diff --git a/TODO.markdown b/TODO.markdown
new file mode 100644
index 0000000000..6f2c8f4653
--- /dev/null
+++ b/TODO.markdown
@@ -0,0 +1,7 @@
+# Random collection of tasks we'd like to get done
+
+- Determine if we can support legacy Linux-HA fencing agents at runtime using dlopen() 
+- Allow Clusters from Scratch to be built in two flavors - pcs and crm shell
+- Convert cts/CIB.py into a supported Python API for the CIB
+- Use crm_log_tag() in the PE to allow per-resource trace logging
+- Write a regression test for Stonith-NG