Making more progress on tax calculations