Just to add to this, you might need a 3rd customer tax status to allow non-taxable customers to have the 3% surcharge applied.