Add beginnings of validation