Update to be more class based
Was getting the index wrong for sets with > 9 cards