diff --git a/TODO b/TODO
index 39f0d8c7..e06be2f4 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,12 @@
 * Documentation
 
+* Rethink commit objects
+  - Drop the a{sv} per https://bugzilla.gnome.org/show_bug.cgi?id=673012
+  - Do we need freeform subject/body?  Or should it just be a generic
+    key-value store?
+  - Optional non-object metadata; e.g., "detached" GPG signatures which
+    are in the same file (to avoid double HTTP requests)
+
 * Hybrid SSL pull (fetch refs over SSL, content via plain HTTP)
 
 * ostree-commit: multithreaded/async (basically compute sha256 in parallel)