Merge branch 'better-locate' into wip