Some unfinished work on the new functionalities. Just need to
troubleshoot decrypt & verify.