Feat/infowindow marker - to discuss!