Updated a lot.  Teams functionally display (with one minor bug).