Thanks to a few examples and a few drinks
Merge branch 'dev-02-local'