Adding MatchMaking template, and a fixup