still pulling from teams branch
working on teams, getting some functionality