Teams

Prepared to teams implementation.