arm-wrestle esp2 into main oracc tree