Add a few more ciphers. Refactor commonalities.