Adding wrappers for location and distance, part 3.