none of this is relevant to this branch, but if you change the index mechanism it will break existing packs.  can we please just punt and keep the numbering clean?