Yeah, I'm totally fine with tackling this in a later PR. Can you add a TODO in there just so we don't forget about it?