Merge with Hardford code. Indexer ported to seperate thread