Did some more work on Places/location tool