Work towards non blocking auth