ok
merged
passing around card objects errywhere