Wrangle code enough to get oauth and user-creation working!