Missed some Match_Type stuff.
Merge branch 'tournament-testing' into dev