dgreatwood

> Ping. This PR is rather large, implements a requested feature, but has merge conflicts and lacks unit tests. I'd happily merge it if it has unit tests and were...

Looks fixed now - thanks!