Rewrite clause 7/* based on review notes.
Working on concepts.