moving parts of teamdata around to make more sense between view and controller