added matchup model
rounds scaffold
reconfigured model associations