WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Moved, not added. Lets postpone dealing w/ this until after this PR.