lots of updates, working on the bar charts