diff --git a/TODO.md b/TODO.md
index e80aa35a8c..81eb4441d4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,18 +1,28 @@
 TODO items for ansible commander
 ================================
 
-* finish shift to DJANGO REST FRAMEWORK from tastypie, rework client lib code
-* write custom rbac & validation classes
-* determine how to auto-add hrefs to serializers (including sub-resources)
-* CLI client
-* business logic 
-* celery integration / job status API
-* UI layer
-* clean up initial migrations
-* inventory plugin
-* reporting plugin
+(merge code)
 
 NEXT STEPS
 
-* Michael -- REST resources, REST auth, CLI/client lib
-* Chris -- celery infra, use db queue if possible?
+* Michael -- flesh out REST model & tests for everything, complete tests for PUT to subresources, possible continued permission code cleanup
+* Chris ---- document celery devs stuff.  
+* Chris ---- inventory script is done, integrate with celery system, make celery REST triggerable, callback plugin
+* Michael -- enhance callback plugin to provide runner and playbook context
+
+LATER
+
+* UI layer
+* CLI client
+* clean up initial migrations
+* init scripts, Apache proxying, etc
+* does inventory script need any caching
+* credentials subsystem -- let app hold on to keys for user
+
+ASSORTED QUESTIONS
+
+* uniqueness checks for playbook paths?
+* allow multiple playbook execution types per project, different tag choices (Projects/Runnables?)
+* permissions infrastructure about who can kick off what kind of jobs
+
+