Changes to team stuff

finally working