Issue #79 - basic functionality

Basic functionality for issue #79