1st refactor of indexer...