Complete update of EntityItem. Rewrote everything.