Working model with decent output and demo script
Tidy up
Tidyup complete