diff --git a/plone/app/discussion/TODO.txt b/plone/app/discussion/TODO.txt
index 2588159..8b2fb6e 100644
--- a/plone/app/discussion/TODO.txt
+++ b/plone/app/discussion/TODO.txt
@@ -2,11 +2,16 @@
 plone.app.discussion to-do
 ==========================
 
+ [ ] Add event handlers to ensure we don't get stale comments in the catalog
+     when parent objects are removed/moved/cloned:
+    
+    - Create the conversation when an object is created
+    - Dispatch object added/removed/moved/cloned events to conversations
+    - Dispatch conversation added/removed/moved/cloned events to comments
+
  [ ] Thread building in conversation.getThreads()
  [ ] Batching in conversation.getComments()
 
- [ ] ++comments++ namespace traversal adapter
-
  [ ] Implement plone.indexer indexers for comments, filling standard metadata
     
     - Note discrepancy between Python datetime and indexing expecting a Zope 2