diff --git a/doc/todo/direct_mode_guard.mdwn b/doc/todo/direct_mode_guard.mdwn
new file mode 100644
index 0000000000..a380a9abc8
--- /dev/null
+++ b/doc/todo/direct_mode_guard.mdwn
@@ -0,0 +1,15 @@
+Currently [[/direct_mode]] allows the user to point many normally safe
+git commands at his foot and pull the trigger. At LCA2013, a git-annex
+user suggested modifying direct mode to make this impossible.
+
+One way to do it would be to move the .git directory. Instead, make there
+be a .git-annex directory in direct mode repositories. git-annex would know
+how to use it, and would be extended to support all known safe git
+commands, passing parameters through, and in some cases verifying them.
+
+So, for example, `git annex commit` would run `git commit --git-dir=.git-annex`
+
+However, `git annex commit -a` would refuse to run, or even do something
+intelligent that does not involve staging every direct mode file.
+
+--[[Joey]]