Consolidated models, expanded Card functionality
Merge pull request #1 from sjb9774/models_card_1

Consolidated models, expanded Card functionality