Review changes making the ecs class more functionally.