work on new entity query system