work on Authentication - may be good
Merge branch 'dev-local'