working on Entity, not ready