Added marginal and effective _tax_rate functionality