Make model

Lots of updates, see commit message.  Left to do is move the xml file and test in a full dev environment.