Now just validation based on Yes/No remaining