rebuilding map functionality to use api v2