Added in-progress work for #11.