Locations

@grkvlt I think I've merged your commits on #5 and my local changes here

Please have a look and merge if ok.