Keyvalues added, OAuthFunctions::authenticate() needs re-writing.