validations working well, clean up tomorrow to make sure