Locator app almost done