Fixed up this to actually validate properly.