maybe this should be a separate PR so you give people a heads up on what you're considering here?