broken, needs lots more work
Merge branch 'dev' of github.com:nroza/grey-duck into dev