Markers now include infowindows