Ianoc/scalding 210

Brings @jcoveney and my old stuff up to date
didn't even know we were using this.