Added ability to tally using the new inelastic and elastic formats.