everything minus auth
Merge branch 'swork' into cwork