Some initial work on team settings