Starting to get 2 teams working
Merge branch 'teams'