make services generic to oauth 1 or 2, rather than service