In progress: adding roles.
Merge branch 'development' of https://github.com/broql/zap into development