added TODO to some comments that could otherwise be subject to soversight