WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Yes, fixed.