June 16th test branch - localisation update

We have also updated the test branch with further work on localisation.

This is still in progress and is on course to be complete by the end of the month.