Moved where Auth happens, Added some auth stuff

Did I mention auth works?