Completed merging the two cipher into one script for submission