Working with Alan on the sales tax round 5 branch. We are in the middle of updating and merging the files into the master branch. The old code branch had a number of merge conflicts, so we created a new branch (tax-v5-new) and are reverse merging in code to get rid of the merge conflicts. I was back merging code and Alan was working on custom black box code that was part of the project. Mostly a work session today.