Card Update 4.0

Pretty much back to where we were an hour ago, but managed to restore
back to that point so yeah