I was planning on doing that in the separate branch.  I already had to change it in a few places