Either way, I'd probably put that off to another PR at a later point, if that's OK for you?