Worked out logic part of  #13
Merge branch 'v2' of github.com:speculoos/bmabru into v2