Munch some of Jon's comments, convert to TODOs