Revised with the plotting code

Substantial cut and paste to put the plotting code together. Models
remain as before