refactored, cleaned up interrupted case
Further TicTax work