Put WR changes in a branch
Merge conflicts between master and will branches
Progress to-date