Combining the chart and map (in progress)