Beginning to address recryption properly