Finished adding token authentication