Model update

fleshed out some more of the model
added hardcoded default setup (yes, I did that, it was quicker)