I like the idea of adding TODOs for this kind of thing. We only need to create them when they're needed.