Chuck/store locations in routing mode

Rebased version of #42