Some changes to the auth process.
Updated the full list option.
Merge branch 'test' into dev