Cherrypicked | Locations

Groundwork