Adding Team Selection functionality