Added initial steps toward implementing Issue #6