Some work for Issue #29 [see issue comments]