Added functional form validator and converted to jake