Marked some of devin's comments with TODO so they turn up in a grep.