Changed gmap to async, just stashing changes here