This is largely all done. Still need validation from early adopters that this looks good. Christian?
Personally still want to look again at the split between "SQM function" and "SQL function" - how they relate, how we get one from the other.