Huge re-work of delta e, conversions and tests for both.