More work on a couple of branches. Eric was removing files, doing some clean-up, and code changes while I was doing emails and other to do list stuff. We merged in one of the branches and got the other branch going in the right direction. It had a few extra files that weren't needed.