Initial add of update and minor validation of fields
Initial add of update and minor validation of fields