New feature: Teams

From #2731

## Work in progress