Further work -- lots done on the energy section.  Will need to figure out how to split sections later.