Fixed that bug with the cards finally!

Time to freaking refactor….