Absolutely. We have been pushing for this for a long time.
Let me add that we would like a definition of “affordable”, because affordable being slightly less than the market price is not truly affordable for many people. If we're going to do it properly, we have to do what your bill recommends, but we have to take it to a realistic level.