Added the 'intermediate data structure' which was surprisingly easy and started writing the plotting class