plumbing: Begin to work on issue #9.