Feature/validates