WIP charting
Adding in assets and charts.r
More chart work