wip converting Locator constructors to key api