Turned Entity into a interface. Next stop: Shape.