Started on splitting out validation logic