WIP Indexer Take 2
WIP Indexer Take 2
Merged github/Andrew into master