diff --git a/TODO b/TODO
index 4c59e74eec..a74ffc3e9a 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,7 @@ Fedora 19:
 * create /var/log/journal/
 
 Features:
+
 * re-enable "make check" for gtk-doc (broken for unknown reason)
 
 * logind: make PrepareForSuspend(false) an official api for notification of resumes
@@ -32,9 +33,13 @@ Features:
 
 * add "loginctl unlock-sessions" as counterpart for "loginctl lock-sessions"
 
-* extend cgroup attr dbus calls to optionally make changes persistent, and retrieve current kernel values
-
-* support high-level cgroup setting syntax in systemctl. Example: "systemctl set-cgroup-attr MemoryLimit 5K"
+* cgroup attrs:
+  - make persistent
+  - don't filter out duplicate settings
+  - support high-level cgroup setting syntax in systemctl. Example: "systemctl set-cgroup-attr MemoryLimit 5K"
+  - support writte string mapping even for non-high-level settings
+  - add man page for systemctl commands
+  - make sure we work fine with multi-line strings
 
 * print a nicer explanation if people use variable/specifier expansion in ExecStart= for the first word