Encryption Addition

You probably will need to merge this with current build as I have made changes to an older version of few files.