Relocated TODO so we don't forget it