First shot at addressing issue #109

Plan to propose to the community, but it may evolve.