add location switcher & test
Merge branch 'dev-bryan'