continued dev of entity engine