Updated with validations
awesome
active record
Fixed merge conflict