More model changes

adding more things to the model