Fix broken things
Add tokens via init method
Add auth stuff from Authorization branch