starting on the validation - hopefully didnt break anything