Readd conversion of tax scale from marginal to average.
Start working on structural reform