RFR - Create matchups show

Need to resolve this merge conflict (Although I think merging in master will fix this)