Modified ion to use energy
Added statistics collections. While physics are unrealistic the computations are done in the correct order