Adding and removing cards feature added, but still buggy