Squashing commits,

Squashing commits

Transition to Oqaque Keys

Bug fixes

Fixing regenerate_user