Setting up validation to solve #1