Should this be a TODO? Or should there be an issue for it?