Add back the barchart.
Add logic to display data.

 *Todo:
  -Update from master