more model work
Merge pull request #2 from ArthurGibbs/ModelDevelopment

more model work