WIP of des encrpytion support