Reindexing stuff (unfinished)