Started work on locators
Iterating
More iterations
Getting builds working
Making progress with the locator
stablising
Making some progress
Converting some of the rest of the pieces
Renamed the child getter
Adding deeper children
Merge branch 'locators'

* locators:
  Adding deeper children
  Renamed the child getter
  Converting some of the rest of the pieces
  Making some progress
  stablising
  Making progress with the locator
  Getting builds working
  More iterations
  Iterating
  Started work on locators