Trying to make it work with oauth