Card Refactoring

Here's the basic one-liner changes