jed/9-my-locations

Getting latest work into master.