@dmitchell or @cpennington is this a TODO we should worry about right now?