workin on the models
merge commits