Auth work
Merge branch 'beta'