Transition to Oqaque Keys

No it's totally not right, I'm still working on adding the right thing.