Validation stuff almost finishied