Flesh out the classes a bit; primitive validator