Updates for the new API calls. consolidated some oauth code. Hopefully didn't break everything.