WIP because I've got to wait for !1125 (merged) to get either closed or merged so I know if I can work on implementing it here too