my first commit
new models
merge complete