-hopefully fixed associations for new locations/location instances