Hopefully this gets implemented down the line!