Is this TODO staying?