Actually I'll just do this in a separate PR, nevermind.