saves work
Merge branch 'client-side-auth'