Some work done on the team view