Linking several charts

Updating data structure and flow