I forgot to make this MR earlier.
I already know that it does NOT appear to pass a lot of CI checks. It's the middle of the night right now though, so I don't have time to fix it...