Update energy_grants_calculator further progress