Stream Locator draft, added features