Working snapshot of #66.