Transition to Oqaque Keys

ok :) just saw the title of your PR and peeked in