Recent Progresses on the Development of High Energy Li Ion and Li Metal Batteries in PNNL