Move authentication to it's own call