Feature/cardcomp