@dmitchell is this an active TODO? if not should we delete this line?