Finally Finished

Added all validations