The best way to do this might be with #662
The best way to do this might be with #662