Now it is getting an OAuth token.

We will need to remove and reset the ap IDs
Fixed the botched merge