Got an early version of the validator working