It's worth noting though that the estimates for the Gigafactory have been massively revised (although no one seems to pay any attention to it) and will now be producing 100+ GWh of batteries yearly and Musk had stated that they're announcing 2-4 more this year.