Bi-partisan energy affordability package being discussed in Richmond