Commented out the validations since they were causing problems...