Working on new charts feature
Finished new charts feature
Merge branch 'feature-newcharts' into development