did a semi non dry hack to make the validations work until i find a better solution