Work on issue #16

Incomplete implementation