Building a Better Battery