Issue #41: Teams, part 2