Yes Hydrogen Fuel Cells! Toshiba was claiming in 2006 that they were coming for laptop batteries. I still think the future of energy is solar cells, using water+electrolysis to get hydrogen for storage, and a fuel cell for conversion back to electricity.