User Story 12 finished. Graphs and Table working