All functions working. Validation next