diff --git a/TODO b/TODO
index 9149018134..16cfd215f0 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,8 @@ Features:
 
 * unset container= in PID1?
 
+* automatically escape unit names passed on the service (i.e. think "systemctl start serial-getty.service@serial/by-path/jshdfjsdfhkjh" being automatically escaped as necessary.
+
 * if we can not get user quota for tmpfs, mount a separate tmpfs instance
   for every user in /run/user/$USER with a configured maximum size