diff --git a/TODO.md b/TODO.md
new file mode 100644
index 00000000..17d1cb0c
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,4 @@
+Failover
+========
+- When determining who should become master, include the minor version of PostgreSQL in the decision
+- Create a way to disable governance of a cluster, something like the existence of a "nogover" or "admin" file in PGDATA will stop governor from changing the cluster state