finished changes to the Indexer. it compiles now too