add the beginnings of teaming support