Plotter rewritten to class