before first join with master
Merge branch 'develop'
some tryings
not yet working as i want