More crypto work in progress...