Almost there - just need working energy calibration