added some TODO comments for teams