Start working on Locator, add a test for the code