Ianoc/scalding 210

Brings @jcoveney and my old stuff up to date
I like it, but unless you object a follow up PR? just to get this in and make that one seem clearer