Revert changes to main resolve loop... trying something different
Add RESOLVE mode to the indexer