Match view works a lot better now. Add team references tomorrow.