attempt to clean up and focus just on oauth