tournament class progress
Merge branch 'tournament-update'