Some more work on cards, use cards for team