Integrating Amin's Changes!

New models, etc