Almost everything working. Missing the conditions with entity comparations