Between rust batteries or similar longer term/cheaper/slower discharge and likely whatever the going EV rapid charge and discharge battery, the energy storage problem should mostly be solved this decade. That means dirt cheap electric is on the horizon, likely so cheap other tech cannot compete with solar/wind.