Partial work on Issue #83