Re-organized TODOs