Merge with classical crypto repo