Issue #79 - basic functionality