Seems to be working now, modifed removeCard.