Perhaps make this a Todo instead of XXX?