No rush, I imagine there will be plenty of bikeshedding to come on this PR :)