Added Plotter wrapper and made global variables class-local again.