More Energy Rate work

Signed-off-by: ShadowChild <shadychild12@gmail.com>