Locations

I think that this looks good to merge.