All that is left to do on the talk is hereditary substitution.
Merge branch 'clc'