I didn't forget about #1055, is just that I haven't finished yet 😮‍💨