Working towards a solution that takes into account status changes and re-runs validation when required.