Started adding validation routine.