Starting to test and fix validation code...