Team Instances

Team instance work. And some clean-up.