diff --git a/TODO b/TODO
index 533f9d87bd..4c4de2a1c8 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,12 @@ Janitorial Clean-ups:
 
 Features:
 
+* rework mount.c and swap.c to follow proper state enumeration/deserialization
+  semantics, like we do for device.c now
+
+* When reloading configuration PID 1 should reset all its properties to the
+  original defaults before calling parse_config()
+
 * Add OnTimezoneChange= and OnTimeChange= stanzas to .timer units in order to
   schedule events based on time and timezone changes.