basic map view PH
fixin merge conflicts