Draft for issue #45.