Finished card refactoring
Merge pull request #2 from mark-greene/refactor-card

Finished card refactoring