diff --git a/TODO-1.0 b/TODO-1.0
index 03ee5354..7c6a2d0e 100644
--- a/TODO-1.0
+++ b/TODO-1.0
@@ -61,3 +61,11 @@ x Cleanly define paths for object creation, especially recursive calls
    - package
 
 - Cleanup directories, cleanly document, what's possible
+
+- rename $__object_dir to $__object_base_dir
+- cd $__object_dir, before running manifest
+   && document it in doc/man/cdist-types.text
+- use $type/manifest instead of $type/init
+- document that $type/manifest is executed for every object/instance
+- find $object_id in recursive runner
+