Added Indexer and tests

Finished up Indexer class and unit tests