This depends on the extended options PR, but I thought I'd get this started so we can discuss before merging the other one

This was an interesting problem....