Merge pull request #872 from bradymiller/encounter-gui-work_1