diff --git a/vault/logical_system.go b/vault/logical_system.go
index e8001f8538..66bbafa89d 100644
--- a/vault/logical_system.go
+++ b/vault/logical_system.go
@@ -187,6 +187,11 @@ func (b *SystemBackend) handleMount(
 }
 
 // handleUnmount is used to unmount a path
+//
+// TODO: Run a rollback operation
+// TODO: Return an error if things go bad.
+// TODO: Think through error scenario: umount should clean up everything
+//   and should fail if it can't. Perhaps add a "force" flag to YOLO it.
 func (b *SystemBackend) handleUnmount(
 	req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 	suffix := strings.TrimPrefix(req.Path, "mounts/")