finish up the teams implementation for the moment