Make match activity reuse all it's code from elsewhere. So much simpler now