Added Validation (first time).
Fixing up rebase.