Dev

Add in field validations