Refractored Entity.
More refractoring and organising.