[WIP] Adding handling for cryptography

Sounds good to me, although I don't think it's a priority