Locators as collection

Fixes #6