WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
I'm not sure what proper coding style is here, but there are 3 conditionals that all result in `return block_ref`.