Added auth stuff and whatnot