Initial implementation of teams