adding Map view stuff still need debugging