Work on validators, deleted some immature code.