No, won’t ever happen, too expensive and once the entire US population learns to repair and upgrade/new ebike shops open, these bikes will be around for decades which will cause a noticeable drop in their revenues. A factory in Mexico might work but still would cost an entire year of earnings...