that's now merged but also now conflicts with this PR. I'm fixing it up manually