Begin moving more entity functionality to individual entities