Prepare transition to new API
Add some very basic play tests
Move to new API
Remove the old locator
Remove old settings