2.3 Progress Pt. 2

- Arch/Grand Duchy upgrade decisions removed, this should happen
dynamically and automatically now