quotations + tax refactor, part 2