Integrating new crypto, work still in progress...