Initial work on indexer