Indexer almost done