Progress towards issue #14