Some work for Issue #4 [see issue comments]