Addresses #1467

This is a first draft - I would like the community to debate and test for me. Unit tests have not been written (yet), but they will come if the community wants this contribution