updating newcardmaker to take more generic cards