Should we create an issue for this TODO? Or is it more an optional kind of thing?