Change this all to be within the MapHubs call itself.