semi-rewire the crypto-sandwich

First half. Self-reversible and apprently correct.