new tax calc - organizing functions