I think the team events (minigames, spirit, etc) and the normal individual events are enough at this point. It's probably better to flesh out exactly how the minigames/spirit team events are going to be presented and run.