Major revision for model, quickstart.

Still in the middle of changes.