Now working on trying to adapt the block indexer