WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
This was just moved in this PR, not added. Let's leave it for now, and clean up these tests separately.