add even more headers

Energy should be it's own type.