Crypto implemented
merge conflicts