Merge pull request #683 from daliwali/rev1

Pass tests
pass card tests