make better card parser

[SteveDoyle2]

There should be one place where card parsing is handled, so it's easier to debug issues. There shouldn't be required updates in other files.