Squashing commits

Transition to Oqaque Keys

Bug fixes