Refactored GlobalState

Team selection is now independent of the peer type.