Lots of changes for adding teams through UI; currently broken