More work on branch
Still more work on branch.  Pretend this was major.