Major overhaul to all entities.