Getting through the TODOs