not clear what the TODO is for now. I think we're warning appropriately... drop the TODO?