I would remove this TODO. If you don't want, could you be more specific here?