Indexer factored out of Repository - wip