Finalized the location resolver and index strategies, working on comments and workflow