Refactoring 2d plots, working on saving
Merging