[bikinchris]

There is a battery technology in testing right now that has roughly double the capacity of current batteries and charges in roughly 10 minutes. It uses a solid instead of a liquid electrolyte and is based on sodium, not lithium. It is less likely to cause problems if damaged too.