Most recent version of the Indexer

First version submitted. Incomplete (Indexer non functional)