Updated Model

Finished Models & Validation rules