result of live coding during talk
Merge branch 'hack' [recursive:theirs]