WIP revamp of auth and credentials
WIP revamp of auth and credentials