More work in progress on new crypto...