expt with new encapsulation of scatter code
Make the scatterplot nicely encapsulated
merging in encapsulated scatter files
Merge branch 'scatter'