Add team class.
Some further progress.