Added oauth stuff back in