Refactored, added RSA and Signing