Adding plotter
Fixing merge conflicts