Integrating new crypto -- work in progress, wont build yet.