Final changes to get validation working.  All tests pass