We're aiming to use this for testing immediately and better logging/tracing in future, but to make the changes manageable breaking them into a smaller series that don't directly achieve much.