Fixed up card parsing
Moved the parser to a new function