Validation prep work - first phase