moving in stuff to make oauth work