Is there a separate card/issue for this TODO? I think I remember you creating one, but I just want to make sure.