Starting to flush out the cryptoki stuff, although I'm not sure I like i...

...t yet.