Revert to b8b0aeb012844f03d3bffb27d1829b8661be0db5, currently bad merge of
working GUI and end game code with dev.