adding validation - WIP