Merged both branches.  Win state, UI changes.