Added in-progress work for #14.