Merge, got pins working on location map