Localist stuff redo.
Merge branch 'feature/localist_stuff'