Issue #7 development