hook avatax into a couple more places