Updated authentication to be a lot simpler