More work making card plays generic