try to wire up charts
merge
new file structure