Added more checks and cards

I made some pretty drastic changes so I won't be offended if you reject them. I just though I'd put it out there.