Initial work on issue #14