More entity-work...