I feel like we do this in a lot of places should we move that out into its own PR?