Working snapshot of #101.