I like that idea, I have always felt the TODO is something I add while working on a function/feature so I don't forget the edge case. I have never cared for a TODO representing a work item. Same with a code base littered with comments about fixing bug ###. With out the bug and source control diff how do I know what was part of the fix and when or how it has changed over time via other bug fixes and feature updates.